feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

wolfcrypt/src/asn.c and wolfssl/wolfcrypt/asn.h: in SetDNSEntry(), defer XFREE(dnsEntry, ...) until end (fixes double free); add PBE_NONE to enum PBESTypes; in EncryptContent(), initialize id to PBE_NONE to fix a -Wmaybe-uninitialized (CheckAlgo() can leave it unchanged even when returning success).

Browse Source
This commit is contained in:
Daniel Pouzzner
2024-08-04 15:41:52 -05:00
parent 9aa0742baa
commit d65be7af21
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
wolfcrypt/src/asn.c
View File

@ -9177,7 +9177,7 @@ int EncryptContent(byte* input, word32 inputSz, byte* out, word32* outSz,
word32 seqSz;
word32 innerSz;
int ret;
int version, id, blockSz = 0;
int version, id = PBE_NONE, blockSz = 0;
#ifdef WOLFSSL_SMALL_STACK
byte* saltTmp = NULL;
byte* cbcIv = NULL;
@ -13550,7 +13550,6 @@ static int SetDNSEntry(DecodedCert* cert, const char* str, int strLen,
dnsEntry->name = (char*)XMALLOC((size_t)strLen + 1, cert->heap,
DYNAMIC_TYPE_ALTNAME);
if (dnsEntry->name == NULL) {
XFREE(dnsEntry, cert->heap, DYNAMIC_TYPE_ALTNAME);
ret = MEMORY_E;
}
}

4
wolfssl/wolfcrypt/asn.h
View File

@ -2760,7 +2760,9 @@ enum PBESTypes {
PBES2 = 13, /* algo ID */
PBES1_MD5_DES = 3,
PBES1_SHA1_DES = 10
PBES1_SHA1_DES = 10,
PBE_NONE = 999
};
enum PKCSTypes {