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

fix sequence with pkcs12 shrouded keybag creation

Browse Source
This commit is contained in:
Jacob Barthelmeh
2018-05-16 10:16:15 -06:00
parent 566bb4cefe
commit d373844a18
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
wolfcrypt/src/asn.c
View File

@ -2591,9 +2591,6 @@ int UnTraditionalEnc(byte* key, word32 keySz, byte* out, word32* outSz,
MAX_LENGTH_SZ + MAX_SHORT_SZ + 1) MAX_LENGTH_SZ + MAX_SHORT_SZ + 1)
return BUFFER_E; return BUFFER_E;
sz = SetAlgoID(id, out + inOutIdx, oidPBEType, 0);
totalSz += sz; inOutIdx += sz;
if (version == PKCS5v2) { if (version == PKCS5v2) {
WOLFSSL_MSG("PKCS5v2 Not supported yet\n"); WOLFSSL_MSG("PKCS5v2 Not supported yet\n");
return ASN_VERSION_E; return ASN_VERSION_E;
@ -2621,6 +2618,7 @@ int UnTraditionalEnc(byte* key, word32 keySz, byte* out, word32* outSz,
/* leave room for a sequence (contains salt and iterations int) */ /* leave room for a sequence (contains salt and iterations int) */
inOutIdx += MAX_SEQ_SZ; sz = 0; inOutIdx += MAX_SEQ_SZ; sz = 0;
inOutIdx += MAX_ALGO_SZ;
/* place salt in buffer */ /* place salt in buffer */
out[inOutIdx++] = ASN_OCTET_STRING; sz++; out[inOutIdx++] = ASN_OCTET_STRING; sz++;
@ -2642,7 +2640,13 @@ int UnTraditionalEnc(byte* key, word32 keySz, byte* out, word32* outSz,
inOutIdx -= (sz + MAX_SEQ_SZ); inOutIdx -= (sz + MAX_SEQ_SZ);
tmpSz = SetSequence(sz, out + inOutIdx); tmpSz = SetSequence(sz, out + inOutIdx);
XMEMMOVE(out + inOutIdx + tmpSz, out + inOutIdx + MAX_SEQ_SZ, sz); XMEMMOVE(out + inOutIdx + tmpSz, out + inOutIdx + MAX_SEQ_SZ, sz);
inOutIdx += tmpSz + sz; totalSz += tmpSz + sz; totalSz += tmpSz + sz; sz += tmpSz;
/* add in algo ID */
inOutIdx -= MAX_ALGO_SZ;
tmpSz = SetAlgoID(id, out + inOutIdx, oidPBEType, sz);
XMEMMOVE(out + inOutIdx + tmpSz, out + inOutIdx + MAX_ALGO_SZ, sz);
totalSz += tmpSz; inOutIdx += tmpSz + sz;
/* octet string containing encrypted key */ /* octet string containing encrypted key */
out[inOutIdx++] = ASN_OCTET_STRING; totalSz++; out[inOutIdx++] = ASN_OCTET_STRING; totalSz++;