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

Merge pull request #1365 from cconlon/p7karifix

Browse Source 
detect and set keyAgreeOID from CMS EnvelopedData if user has not set
This commit is contained in:
Kaleb Himes
2018-02-09 13:27:40 -07:00
committed by GitHub
parent e8a5af2651 fa676d96cf
commit 87179837e7
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
wolfcrypt/src/pkcs7.c
View File

@ -3907,6 +3907,10 @@ static int wc_PKCS7_DecodeKari(PKCS7* pkcs7, byte* pkiMsg, word32 pkiMsgSz,
return ret; return ret;
} }
/* if user has not explicitly set keyAgreeOID, set from one in bundle */
if (pkcs7->keyAgreeOID == 0)
pkcs7->keyAgreeOID = keyAgreeOID;
/* set direction based on key wrap algorithm */ /* set direction based on key wrap algorithm */
switch (keyWrapOID) { switch (keyWrapOID) {
#ifndef NO_AES #ifndef NO_AES