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

add single-shot API for generating CMS Signed FirmwarePkgData

Browse Source
This commit is contained in:
Chris Conlon
2018-10-09 10:23:47 -06:00
committed by David Garske
parent 2cc89936e3
commit cc05c46318
2 changed files with 26 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
wolfcrypt/src/pkcs7.c
View File

@ -1873,6 +1873,21 @@ int wc_PKCS7_EncodeSignedData(PKCS7* pkcs7, byte* output, word32 outputSz)
} }
/* build PKCS#7 signedData content type with inner type set to FirmwarePkgData,
return size of generated bundle on success, negative upon error */
int wc_PKCS7_EncodeSignedFirmwarePkgData(PKCS7* pkcs7, byte* output,
word32 outputSz)
{
if (pkcs7 == NULL || output == NULL || outputSz == 0)
return BAD_FUNC_ARG;
/* force content type to FirmwarePkgData */
pkcs7->contentOID = FIRMWARE_PKG_DATA;
return wc_PKCS7_EncodeSignedData(pkcs7, output, outputSz);
}
#ifndef NO_RSA #ifndef NO_RSA
/* returns size of signature put into out, negative on error */ /* returns size of signature put into out, negative on error */

17
wolfssl/wolfcrypt/pkcs7.h
View File

@ -263,16 +263,21 @@ WOLFSSL_API int wc_PKCS7_EncodeData(PKCS7* pkcs7, byte* output,
/* CMS/PKCS#7 SignedData */ /* CMS/PKCS#7 SignedData */
WOLFSSL_API int wc_PKCS7_EncodeSignedData(PKCS7* pkcs7, WOLFSSL_API int wc_PKCS7_EncodeSignedData(PKCS7* pkcs7,
byte* output, word32 outputSz); byte* output, word32 outputSz);
WOLFSSL_API int wc_PKCS7_EncodeSignedData_ex(PKCS7* pkcs7, const byte* hashBuf, WOLFSSL_API int wc_PKCS7_EncodeSignedData_ex(PKCS7* pkcs7, const byte* hashBuf,
word32 hashSz, byte* outputHead, word32* outputHeadSz, byte* outputFoot, word32 hashSz, byte* outputHead,
word32* outputFootSz); word32* outputHeadSz,
byte* outputFoot,
word32* outputFootSz);
WOLFSSL_API int wc_PKCS7_EncodeSignedFirmwarePkgData(PKCS7* pkcs7,
byte* output, word32 outputSz);
WOLFSSL_API void wc_PKCS7_AllowDegenerate(PKCS7* pkcs7, word16 flag); WOLFSSL_API void wc_PKCS7_AllowDegenerate(PKCS7* pkcs7, word16 flag);
WOLFSSL_API int wc_PKCS7_VerifySignedData(PKCS7* pkcs7, WOLFSSL_API int wc_PKCS7_VerifySignedData(PKCS7* pkcs7,
byte* pkiMsg, word32 pkiMsgSz); byte* pkiMsg, word32 pkiMsgSz);
WOLFSSL_API int wc_PKCS7_VerifySignedData_ex(PKCS7* pkcs7, const byte* hashBuf, WOLFSSL_API int wc_PKCS7_VerifySignedData_ex(PKCS7* pkcs7, const byte* hashBuf,
word32 hashSz, byte* pkiMsgHead, word32 pkiMsgHeadSz, byte* pkiMsgFoot, word32 hashSz, byte* pkiMsgHead,
word32 pkiMsgFootSz); word32 pkiMsgHeadSz, byte* pkiMsgFoot,
word32 pkiMsgFootSz);
/* EnvelopedData and AuthEnvelopedData RecipientInfo functions */ /* EnvelopedData and AuthEnvelopedData RecipientInfo functions */
WOLFSSL_API int wc_PKCS7_AddRecipient_KTRI(PKCS7* pkcs7, const byte* cert, WOLFSSL_API int wc_PKCS7_AddRecipient_KTRI(PKCS7* pkcs7, const byte* cert,