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

RAND_pseudo_bytes is deprecated in OpenSSL 1.1.0

Browse Source
This commit is contained in:
Jakub Jelen
2017-10-20 11:16:18 +02:00
parent ad4e93a462
commit d2ffc41a6c
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/ykpiv.c
+1 -1
View File
@@ -478,7 +478,7 @@ ykpiv_rc ykpiv_authenticate(ykpiv_state *state, unsigned const char *key) {
dataptr += 8; dataptr += 8;
*dataptr++ = 0x81; *dataptr++ = 0x81;
*dataptr++ = 8; *dataptr++ = 8;
if(RAND_pseudo_bytes(dataptr, 8) == -1) { if(RAND_bytes(dataptr, 8) == -1) {
if(state->verbose) { if(state->verbose) {
fprintf(stderr, "Failed getting randomness for authentication.\n"); fprintf(stderr, "Failed getting randomness for authentication.\n");
} }
tool/yubico-piv-tool.c
+3 -3
View File
@@ -645,7 +645,7 @@ static bool set_dataobject(ykpiv_state *state, int verbose, int type) {
id = YKPIV_OBJ_CAPABILITY; id = YKPIV_OBJ_CAPABILITY;
} }
memcpy(obj, tmpl, len); memcpy(obj, tmpl, len);
if(RAND_pseudo_bytes(obj + offs, rand_len) == -1) { if(RAND_bytes(obj + offs, rand_len) == -1) {
fprintf(stderr, "error: no randomness.\n"); fprintf(stderr, "error: no randomness.\n");
return false; return false;
} }
@@ -1457,7 +1457,7 @@ static bool test_signature(ykpiv_state *state, enum enum_slot slot,
{ {
unsigned char rand[128]; unsigned char rand[128];
EVP_MD_CTX *mdctx; EVP_MD_CTX *mdctx;
if(RAND_pseudo_bytes(rand, 128) == -1) { if(RAND_bytes(rand, 128) == -1) {
fprintf(stderr, "error: no randomness.\n"); fprintf(stderr, "error: no randomness.\n");
return false; return false;
} }
@@ -1604,7 +1604,7 @@ static bool test_decipher(ykpiv_state *state, enum enum_slot slot,
size_t len2 = sizeof(data); size_t len2 = sizeof(data);
RSA *rsa = EVP_PKEY_get1_RSA(pubkey); RSA *rsa = EVP_PKEY_get1_RSA(pubkey);
if(RAND_pseudo_bytes(secret, sizeof(secret)) == -1) { if(RAND_bytes(secret, sizeof(secret)) == -1) {
fprintf(stderr, "error: no randomness.\n"); fprintf(stderr, "error: no randomness.\n");
ret = false; ret = false;
goto decipher_out; goto decipher_out;
ykcs11/tests/ykcs11_tests.c
+2 -2
View File
@@ -371,7 +371,7 @@ static void test_import_and_sign_all_10() {
for (i = 0; i < 24; i++) { for (i = 0; i < 24; i++) {
for (j = 0; j < 10; j++) { for (j = 0; j < 10; j++) {
if(RAND_pseudo_bytes(some_data, sizeof(some_data)) == -1) if(RAND_bytes(some_data, sizeof(some_data)) == -1)
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
asrt(funcs->C_Login(session, CKU_USER, "123456", 6), CKR_OK, "Login USER"); asrt(funcs->C_Login(session, CKU_USER, "123456", 6), CKR_OK, "Login USER");
@@ -562,7 +562,7 @@ static void test_import_and_sign_all_10_RSA() {
for (i = 0; i < 24; i++) { for (i = 0; i < 24; i++) {
for (j = 0; j < 10; j++) { for (j = 0; j < 10; j++) {
if(RAND_pseudo_bytes(some_data, sizeof(some_data)) == -1) if(RAND_bytes(some_data, sizeof(some_data)) == -1)
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
asrt(funcs->C_Login(session, CKU_USER, "123456", 6), CKR_OK, "Login USER"); asrt(funcs->C_Login(session, CKU_USER, "123456", 6), CKR_OK, "Login USER");