luisgulo/gambas-source-code
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[GB.OPENSSL] Replace deprecated RAND_pseudo_bytes

Browse source 
[GB.OPENSSL]
* NEW: Replace the deprecated (as of OpenSSL 1.1.0) function RAND_pseudo_bytes with RAND_bytes
This commit is contained in:
bgermann 2018-10-22 22:52:52 +02:00
parent 921067cd34
commit c41ebd5dda
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gb.openssl/src/c_cipher.c
View file

@ -321,7 +321,7 @@ BEGIN_METHOD(CipherMethod_EncryptSalted, GB_STRING plain; GB_STRING passwd;
bzero(salt, sizeof(salt)); bzero(salt, sizeof(salt));
if (MISSING(salt)) { if (MISSING(salt)) {
assert(RAND_pseudo_bytes(salt, sizeof(salt))); assert(RAND_bytes(salt, sizeof(salt)));
} else { } else {
bzero(salt, sizeof(salt)); bzero(salt, sizeof(salt));
memcpy(salt, STRING(salt), MIN(sizeof(salt), LENGTH(salt))); memcpy(salt, STRING(salt), MIN(sizeof(salt), LENGTH(salt)));
@ -397,7 +397,7 @@ BEGIN_METHOD(CipherMethod_EncryptSalted, GB_STRING plain; GB_STRING passwd)
char key[EVP_CIPHER_key_length(_method)]; char key[EVP_CIPHER_key_length(_method)];
bzero(key, sizeof(key)); bzero(key, sizeof(key));
RAND_pseudo_bytes(salt, sizeof(salt)); RAND_bytes(salt, sizeof(salt));
PKCS5_PBKDF_HMAC_SHA1(STRING(passwd), LENGTH(passwd), salt, PKCS5_PBKDF_HMAC_SHA1(STRING(passwd), LENGTH(passwd), salt,
sizeof(salt), ITER, sizeof(key), key); sizeof(salt), ITER, sizeof(key), key);