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

fix redefinition of PKCS12 version and PKCS12 struct when building w/ STUNNEL

Browse Source
This commit is contained in:
kaleb-himes
2017-04-14 10:20:35 -06:00
parent f2ac410f1e
commit 3f067bccf0
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
wolfcrypt/src/asn.c
View File

@ -2144,11 +2144,11 @@ static int CheckAlgo(int first, int second, int* id, int* version)
switch (second) {
case 1:
*id = PBE_SHA1_RC4_128;
*version = PKCS12;
*version = PKCS12v1_1;
return 0;
case 3:
*id = PBE_SHA1_DES3;
*version = PKCS12;
*version = PKCS12v1_1;
return 0;
default:
return ALGO_ID_E;
@ -2256,7 +2256,7 @@ static int DecryptKey(const char* password, int passwordSz, byte* salt,
ret = wc_PBKDF1(key, (byte*)password, passwordSz,
salt, saltSz, iterations, derivedLen, typeH);
#endif
else if (version == PKCS12) {
else if (version == PKCS12v1_1) {
int i, idx = 0;
byte unicodePasswd[MAX_UNICODE_SZ];
@ -2302,7 +2302,7 @@ static int DecryptKey(const char* password, int passwordSz, byte* salt,
Des dec;
byte* desIv = key + 8;
if (version == PKCS5v2 || version == PKCS12)
if (version == PKCS5v2 || version == PKCS12v1_1)
desIv = cbcIv;
ret = wc_Des_SetKey(&dec, key, desIv, DES_DECRYPTION);
@ -2322,7 +2322,7 @@ static int DecryptKey(const char* password, int passwordSz, byte* salt,
Des3 dec;
byte* desIv = key + 24;
if (version == PKCS5v2 || version == PKCS12)
if (version == PKCS5v2 || version == PKCS12v1_1)
desIv = cbcIv;
ret = wc_Des3_SetKey(&dec, key, desIv, DES_DECRYPTION);
if (ret != 0) {

2
wolfssl/wolfcrypt/asn.h
View File

@ -130,7 +130,7 @@ enum Misc_ASN {
PKCS5 = 5, /* PKCS oid tag */
PKCS5v2 = 6, /* PKCS #5 v2.0 */
PKCS8v0 = 0, /* default PKCS#8 version */
PKCS12 = 12, /* PKCS #12 */
PKCS12v1_1 = 12, /* PKCS #12 */
MAX_UNICODE_SZ = 256,
ASN_BOOL_SIZE = 2, /* including type */
ASN_ECC_HEADER_SZ = 2, /* String type + 1 byte len */