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

Merge pull request #4911 from SparkiDev/enc_pem_cbc_padding

Browse Source 
ASN PemToDer: remove padding when AES_CBC encrypted
This commit is contained in:
David Garske
2022-03-02 14:32:45 -08:00
committed by GitHub
parent 59970d94f5 8b24be04e8
commit 5d0614c630
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
wolfcrypt/src/asn.c
View File

@ -19709,7 +19709,9 @@ int PemToDer(const unsigned char* buff, long longSz, int type,
word32 algId = 0; word32 algId = 0;
word32 idx; word32 idx;
#if defined(WOLFSSL_ENCRYPTED_KEYS) #if defined(WOLFSSL_ENCRYPTED_KEYS)
#if defined(WOLFSSL_ENCRYPTED_KEYS) && !defined(NO_DES3) && \ #if ((defined(WOLFSSL_ENCRYPTED_KEYS) && !defined(NO_DES3)) || \
(!defined(NO_AES) && defined(HAVE_AES_CBC) && \
defined(HAVE_AES_DECRYPT))) && \
!defined(NO_WOLFSSL_SKIP_TRAILING_PAD) !defined(NO_WOLFSSL_SKIP_TRAILING_PAD)
int padVal = 0; int padVal = 0;
#endif #endif
@ -20051,6 +20053,17 @@ int PemToDer(const unsigned char* buff, long longSz, int type,
} }
} }
#endif /* !NO_DES3 */ #endif /* !NO_DES3 */
#if !defined(NO_AES) && defined(HAVE_AES_CBC) && \
defined(HAVE_AES_DECRYPT)
if (info->cipherType == WC_CIPHER_AES_CBC) {
if (der->length > AES_BLOCK_SIZE) {
padVal = der->buffer[der->length-1];
if (padVal <= AES_BLOCK_SIZE) {
der->length -= padVal;
}
}
}
#endif
#endif /* !NO_WOLFSSL_SKIP_TRAILING_PAD */ #endif /* !NO_WOLFSSL_SKIP_TRAILING_PAD */
} }
} }