wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-31 19:24:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1504 from SparkiDev/nginx-pemenc

Browse Source 
Key derivation for encrypted PEM uses salt length of 8 in OpenSSL
This commit is contained in:
David Garske
2018-04-19 11:23:39 -07:00
committed by GitHub
parent f7cb5c5c15 6689ee965a
commit 9e4bb3fee1
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
wolfcrypt/src/wc_encrypt.c
View File

@@ -262,6 +262,8 @@ int wc_BufferKeyDecrypt(EncryptedInfo* info, byte* der, word32 derSz,
if (Base16_Decode(info->iv, info->ivSz, info->iv, &info->ivSz) != 0) { if (Base16_Decode(info->iv, info->ivSz, info->iv, &info->ivSz) != 0) {
return BUFFER_E; return BUFFER_E;
} }
if (info->ivSz < PKCS5_SALT_SZ)
return BUFFER_E;
#ifdef WOLFSSL_SMALL_STACK #ifdef WOLFSSL_SMALL_STACK
key = (byte*)XMALLOC(WC_MAX_SYM_KEY_SIZE, NULL, DYNAMIC_TYPE_SYMETRIC_KEY); key = (byte*)XMALLOC(WC_MAX_SYM_KEY_SIZE, NULL, DYNAMIC_TYPE_SYMETRIC_KEY);
@@ -271,7 +273,7 @@ int wc_BufferKeyDecrypt(EncryptedInfo* info, byte* der, word32 derSz,
#endif #endif
#ifndef NO_PWDBASED #ifndef NO_PWDBASED
if ((ret = wc_PBKDF1(key, password, passwordSz, info->iv, info->ivSz, 1, if ((ret = wc_PBKDF1(key, password, passwordSz, info->iv, PKCS5_SALT_SZ, 1,
info->keySz, hashType)) != 0) { info->keySz, hashType)) != 0) {
#ifdef WOLFSSL_SMALL_STACK #ifdef WOLFSSL_SMALL_STACK
XFREE(key, NULL, DYNAMIC_TYPE_SYMETRIC_KEY); XFREE(key, NULL, DYNAMIC_TYPE_SYMETRIC_KEY);
@@ -314,7 +316,7 @@ int wc_BufferKeyEncrypt(EncryptedInfo* info, byte* der, word32 derSz,
(void)hashType; (void)hashType;
if (der == NULL || password == NULL || info == NULL || info->keySz == 0 || if (der == NULL || password == NULL || info == NULL || info->keySz == 0 ||
info->ivSz == 0) { info->ivSz < PKCS5_SALT_SZ) {
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
} }
@@ -326,7 +328,7 @@ int wc_BufferKeyEncrypt(EncryptedInfo* info, byte* der, word32 derSz,
#endif /* WOLFSSL_SMALL_STACK */ #endif /* WOLFSSL_SMALL_STACK */
#ifndef NO_PWDBASED #ifndef NO_PWDBASED
if ((ret = wc_PBKDF1(key, password, passwordSz, info->iv, info->ivSz, 1, if ((ret = wc_PBKDF1(key, password, passwordSz, info->iv, PKCS5_SALT_SZ, 1,
info->keySz, hashType)) != 0) { info->keySz, hashType)) != 0) {
#ifdef WOLFSSL_SMALL_STACK #ifdef WOLFSSL_SMALL_STACK
XFREE(key, NULL, DYNAMIC_TYPE_SYMETRIC_KEY); XFREE(key, NULL, DYNAMIC_TYPE_SYMETRIC_KEY);

2
wolfssl/wolfcrypt/asn.h
View File

@@ -215,6 +215,8 @@ enum Misc_ASN {
MAX_TIME_STRING_SZ = 25, /* Max length of formatted time string */ MAX_TIME_STRING_SZ = 25, /* Max length of formatted time string */
#endif #endif
PKCS5_SALT_SZ = 8,
PEM_LINE_LEN = 80, /* PEM line max + fudge */ PEM_LINE_LEN = 80, /* PEM line max + fudge */
}; };