wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-08-02 04:04:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1945 from victork1996/bugfix/openssl-evp-bytes-to-key-compatibility

Browse Source 
Fixed OpenSSL compatibility issues in wolfSSL_EVP_BytesToKey
This commit is contained in:
toddouska
2019-01-16 10:18:08 -08:00
committed by GitHub
parent b37c94a15c a8e21d1c09
commit b683a5a6bb
1 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/ssl.c
View File

@@ -12298,20 +12298,30 @@ int wolfSSL_set_compression(WOLFSSL* ssl)
#endif #endif
XMEMSET(info, 0, sizeof(EncryptedInfo)); XMEMSET(info, 0, sizeof(EncryptedInfo));
info->ivSz = EVP_SALT_SIZE;
ret = wc_EncryptedInfoGet(info, type);
if (ret < 0)
goto end;
if (data == NULL) {
ret = info->keySz;
goto end;
}
ret = wolfSSL_EVP_get_hashinfo(md, &hashType, NULL); ret = wolfSSL_EVP_get_hashinfo(md, &hashType, NULL);
if (ret == WOLFSSL_FAILURE)
goto end;
ret = wc_PBKDF1_ex(key, info->keySz, iv, info->ivSz, data, sz, salt,
EVP_SALT_SIZE, count, hashType, NULL);
if (ret == 0) if (ret == 0)
ret = wc_EncryptedInfoGet(info, type); ret = info->keySz;
if (ret == 0)
ret = wc_PBKDF1_ex(key, info->keySz, iv, info->ivSz, data, sz, salt,
EVP_SALT_SIZE, count, hashType, NULL);
end:
#ifdef WOLFSSL_SMALL_STACK #ifdef WOLFSSL_SMALL_STACK
XFREE(info, NULL, DYNAMIC_TYPE_ENCRYPTEDINFO); XFREE(info, NULL, DYNAMIC_TYPE_ENCRYPTEDINFO);
#endif #endif
if (ret < 0)
if (ret <= 0)
return 0; /* failure - for compatibility */ return 0; /* failure - for compatibility */
return ret; return ret;