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

add macros for IS_ECKEY and IS_RSAKEY, also fix tag on ECCP384

Browse Source
This commit is contained in:
Klas Lindfors
2015-06-24 13:03:14 +02:00
parent d06852959c
commit 1541362866
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/ykpiv.c
+1 -1
View File
@@ -563,7 +563,7 @@ static ykpiv_rc _general_authenticate(ykpiv_state *state,
dataptr += set_length(dataptr, in_len + bytes + 3); dataptr += set_length(dataptr, in_len + bytes + 3);
*dataptr++ = 0x82; *dataptr++ = 0x82;
*dataptr++ = 0x00; *dataptr++ = 0x00;
*dataptr++ = algorithm == YKPIV_ALGO_ECCP256 && decipher ? 0x85 : 0x81; *dataptr++ = IS_ECKEY(algorithm) && decipher ? 0x85 : 0x81;
dataptr += set_length(dataptr, in_len); dataptr += set_length(dataptr, in_len);
memcpy(dataptr, sign_in, (size_t)in_len); memcpy(dataptr, sign_in, (size_t)in_len);
dataptr += in_len; dataptr += in_len;
lib/ykpiv.h
+3
View File
@@ -126,6 +126,9 @@ extern "C"
#define YKPIV_INS_RESET 0xfb #define YKPIV_INS_RESET 0xfb
#define YKPIV_INS_SET_PIN_RETRIES 0xfa #define YKPIV_INS_SET_PIN_RETRIES 0xfa
#define IS_ECKEY(a) ((a == YKPIV_ALGO_ECCP256 || a == YKPIV_ALGO_ECCP384))
#define IS_RSAKEY(a) ((a == YKPIV_ALGO_RSA1024 || a == YKPIV_ALGO_RSA2048))
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif