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

Merge pull request #1337 from dgarske/pkcs7_pad

Browse Source 
Expose the PKCS 7 pad functionality `wc_PKCS7_PadData`
This commit is contained in:
Chris Conlon
2018-01-26 10:01:07 -08:00
committed by GitHub
parent 776e222143 058c2a7a25
commit d179e442b4
3 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
wolfcrypt/src/pkcs7.c
View File

@@ -2991,7 +2991,7 @@ static int wc_PKCS7_GenerateIV(PKCS7* pkcs7, WC_RNG* rng, byte* iv, word32 ivSz)
/* return size of padded data, padded to blockSz chunks, or negative on error */ /* return size of padded data, padded to blockSz chunks, or negative on error */
static int wc_PKCS7_GetPadSize(word32 inputSz, word32 blockSz) int wc_PKCS7_GetPadSize(word32 inputSz, word32 blockSz)
{ {
int padSz; int padSz;
@@ -3005,9 +3005,9 @@ static int wc_PKCS7_GetPadSize(word32 inputSz, word32 blockSz)
/* pad input data to blockSz chunk, place in outSz. out must be big enough /* pad input data to blockSz chunk, place in outSz. out must be big enough
* for input + pad bytes. See wc_PKCS7_GetPadLength() helper. */ * for input + pad bytes. See wc_PKCS7_GetPadSize() helper. */
static int wc_PKCS7_PadData(byte* in, word32 inSz, byte* out, word32 outSz, int wc_PKCS7_PadData(byte* in, word32 inSz, byte* out, word32 outSz,
word32 blockSz) word32 blockSz)
{ {
int i, padSz; int i, padSz;
@@ -3015,7 +3015,7 @@ static int wc_PKCS7_PadData(byte* in, word32 inSz, byte* out, word32 outSz,
out == NULL || outSz == 0) out == NULL || outSz == 0)
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
padSz = blockSz - (inSz % blockSz); padSz = wc_PKCS7_GetPadSize(inSz, blockSz);
if (outSz < (inSz + padSz)) if (outSz < (inSz + padSz))
return BAD_FUNC_ARG; return BAD_FUNC_ARG;

6
wolfcrypt/test/test.c
View File

@@ -16429,6 +16429,12 @@ static int pkcs7signed_run_vectors(byte* rsaCert, word32 rsaCertSz,
if (out == NULL) if (out == NULL)
return -7700; return -7700;
ret = wc_PKCS7_PadData((byte*)data, sizeof(data), out, outSz, 16);
if (ret < 0) {
XFREE(out, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER);
return -7710;
}
#ifndef HAVE_FIPS #ifndef HAVE_FIPS
ret = wc_InitRng_ex(&rng, HEAP_HINT, devId); ret = wc_InitRng_ex(&rng, HEAP_HINT, devId);
#else #else

4
wolfssl/wolfcrypt/pkcs7.h
View File

@@ -146,6 +146,10 @@ WOLFSSL_API int wc_PKCS7_DecodeEnvelopedData(PKCS7* pkcs7, byte* pkiMsg,
word32 pkiMsgSz, byte* output, word32 pkiMsgSz, byte* output,
word32 outputSz); word32 outputSz);
WOLFSSL_API int wc_PKCS7_GetPadSize(word32 inputSz, word32 blockSz);
WOLFSSL_API int wc_PKCS7_PadData(byte* in, word32 inSz, byte* out, word32 outSz,
word32 blockSz);
#ifndef NO_PKCS7_ENCRYPTED_DATA #ifndef NO_PKCS7_ENCRYPTED_DATA
WOLFSSL_API int wc_PKCS7_EncodeEncryptedData(PKCS7* pkcs7, WOLFSSL_API int wc_PKCS7_EncodeEncryptedData(PKCS7* pkcs7,
byte* output, word32 outputSz); byte* output, word32 outputSz);