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

version for PBE SHA1 DES oid

Browse Source
This commit is contained in:
Jacob Barthelmeh
2018-05-16 08:38:50 -06:00
parent 1ca62ee0a1
commit 566bb4cefe
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
wolfcrypt/src/asn.c
View File

@@ -2394,10 +2394,6 @@ static int CheckAlgo(int first, int second, int* id, int* version)
return 0; return 0;
#endif #endif
#ifndef NO_DES3 #ifndef NO_DES3
case PBE_SHA1_DES:
*id = PBE_SHA1_DES;
*version = PKCS12v1;
return 0;
case PBE_SHA1_DES3: case PBE_SHA1_DES3:
*id = PBE_SHA1_DES3; *id = PBE_SHA1_DES3;
*version = PKCS12v1; *version = PKCS12v1;

7
wolfcrypt/src/pkcs12.c
View File

@@ -1150,7 +1150,7 @@ static int wc_PKCS12_shroud_key(WC_PKCS12* pkcs12, WC_RNG* rng,
{ {
void* heap; void* heap;
word32 tmpIdx = 0; word32 tmpIdx = 0;
int vPKCS = 1; /* PKCS#12 is always set to 1 */ int vPKCS = 1; /* PKCS#12 default set to 1 */
word32 sz; word32 sz;
word32 totalSz = 0; word32 totalSz = 0;
int ret; int ret;
@@ -1190,6 +1190,11 @@ static int wc_PKCS12_shroud_key(WC_PKCS12* pkcs12, WC_RNG* rng,
else { else {
WOLFSSL_MSG("creating PKCS12 Shrouded Key Bag"); WOLFSSL_MSG("creating PKCS12 Shrouded Key Bag");
if (vAlgo == PBE_SHA1_DES) {
vPKCS = PKCS5;
vAlgo = 10;
}
ret = UnTraditionalEnc(key, keySz, out + tmpIdx, &sz, pass, passSz, ret = UnTraditionalEnc(key, keySz, out + tmpIdx, &sz, pass, passSz,
vPKCS, vAlgo, NULL, 0, itt, rng, heap); vPKCS, vAlgo, NULL, 0, itt, rng, heap);
} }