james/yubikey.rs
Public Access
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

change IS_XXKEY macros to be YKPIV_IS_XX

Browse Source
This commit is contained in:
Klas Lindfors
2015-06-30 07:33:39 +02:00
parent f43c5781b9
commit 80e6fe525a
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/ykpiv.c
+3 -3
View File
@@ -562,7 +562,7 @@ static ykpiv_rc _general_authenticate(ykpiv_state *state,
dataptr += set_length(dataptr, in_len + bytes + 3);
*dataptr++ = 0x82;
*dataptr++ = 0x00;
*dataptr++ = IS_ECKEY(algorithm) && decipher ? 0x85 : 0x81;
*dataptr++ = YKPIV_IS_EC(algorithm) && decipher ? 0x85 : 0x81;
dataptr += set_length(dataptr, in_len);
memcpy(dataptr, sign_in, (size_t)in_len);
dataptr += in_len;
@@ -615,13 +615,13 @@ ykpiv_rc ykpiv_sign_data(ykpiv_state *state,
unsigned char sign_in[256];
size_t key_len = 0;
if(IS_RSAKEY(algorithm)) {
if(YKPIV_IS_RSA(algorithm)) {
key_len = 128;
if(algorithm == YKPIV_ALGO_RSA2048) {
key_len = 256;
}
}
if(IS_RSAKEY(algorithm) && key_len != in_len) {
if(YKPIV_IS_RSA(algorithm) && key_len != in_len) {
if(in_len + RSA_PKCS1_PADDING_SIZE > key_len) {
return YKPIV_SIZE_ERROR;
}
lib/ykpiv.h
+2 -2
View File
@@ -158,8 +158,8 @@ extern "C"
#define YKPIV_TOUCHPOLICY_NEVER 1
#define YKPIV_TOUCHPOLICY_ALWAYS 2
#define IS_ECKEY(a) ((a == YKPIV_ALGO_ECCP256 || a == YKPIV_ALGO_ECCP384))
#define IS_RSAKEY(a) ((a == YKPIV_ALGO_RSA1024 || a == YKPIV_ALGO_RSA2048))
#define YKPIV_IS_EC(a) ((a == YKPIV_ALGO_ECCP256 || a == YKPIV_ALGO_ECCP384))
#define YKPIV_IS_RSA(a) ((a == YKPIV_ALGO_RSA1024 || a == YKPIV_ALGO_RSA2048))
#ifdef __cplusplus
}