wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-30 10:47:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2800 from tmael/trim-padding

Browse Source 
Trim trailing padding bytes from a key
This commit is contained in:
John Safranek
2020-02-14 16:05:44 -08:00
committed by GitHub
parent 30936e7ad4 aaaa191937
commit defa54f40d
1 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
wolfcrypt/src/asn.c
View File

@ -10234,6 +10234,9 @@ int PemToDer(const unsigned char* buff, long longSz, int type,
DerBuffer* der; DerBuffer* der;
#if defined(HAVE_PKCS8) || defined(WOLFSSL_ENCRYPTED_KEYS) #if defined(HAVE_PKCS8) || defined(WOLFSSL_ENCRYPTED_KEYS)
word32 algId = 0; word32 algId = 0;
#if defined(WOLFSSL_ENCRYPTED_KEYS) && !defined(NO_DES3) && !defined(NO_WOLFSSL_SKIP_TRAILING_PAD)
int padVal = 0;
#endif
#endif #endif
WOLFSSL_ENTER("PemToDer"); WOLFSSL_ENTER("PemToDer");
@ -10428,6 +10431,18 @@ int PemToDer(const unsigned char* buff, long longSz, int type,
else { else {
ret = wc_BufferKeyDecrypt(info, der->buffer, der->length, ret = wc_BufferKeyDecrypt(info, der->buffer, der->length,
(byte*)password, passwordSz, WC_MD5); (byte*)password, passwordSz, WC_MD5);
#ifndef NO_WOLFSSL_SKIP_TRAILING_PAD
#ifndef NO_DES3
if (info->cipherType == WC_CIPHER_DES3) {
padVal = der->buffer[der->length-1];
if (padVal <= DES_BLOCK_SIZE) {
der->length -= padVal;
}
}
#endif /* !NO_DES3 */
#endif /* !NO_WOLFSSL_SKIP_TRAILING_PAD */
} }
ForceZero(password, passwordSz); ForceZero(password, passwordSz);
} }