wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-08-02 12:14:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2068 from dgarske/pkcs7_verify_degenerate

Browse Source 
Fixes to handle degenerate PKCS 7 with BER encoding
This commit is contained in:
toddouska
2019-02-07 15:00:21 -08:00
committed by GitHub
parent f61d99526b 8666b7de9a
commit 4f4d16d9e5
5 changed files with 247 additions and 207 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
certs/include.am
View File

@@ -41,6 +41,7 @@ EXTRA_DIST += \
certs/server-revoked-key.pem \ certs/server-revoked-key.pem \
certs/wolfssl-website-ca.pem \ certs/wolfssl-website-ca.pem \
certs/test-degenerate.p7b \ certs/test-degenerate.p7b \
certs/test-ber-exp02-05-2022.p7b \
certs/test-servercert.p12 \ certs/test-servercert.p12 \
certs/ecc-rsa-server.p12 \ certs/ecc-rsa-server.p12 \
certs/dsaparams.pem \ certs/dsaparams.pem \

BIN
certs/test-ber-exp02-05-2022.p7b Normal file
View File

Binary file not shown.

34
tests/api.c
View File

@@ -15886,7 +15886,7 @@ static void test_wc_PKCS7_EncodeDecodeEnvelopedData (void)
AES256_WRAP, dhSinglePass_stdDH_sha256kdf_scheme, eccCert, AES256_WRAP, dhSinglePass_stdDH_sha256kdf_scheme, eccCert,
eccCertSz, eccPrivKey, eccPrivKeySz}, eccCertSz, eccPrivKey, eccPrivKeySz},
#endif #endif
#if !defined(WOLFSSL_SHA512) && !defined(NO_AES_256) #if defined(WOLFSSL_SHA512) && !defined(NO_AES_256)
{(byte*)input, (word32)(sizeof(input)/sizeof(char)), DATA, AES256CBCb, {(byte*)input, (word32)(sizeof(input)/sizeof(char)), DATA, AES256CBCb,
AES256_WRAP, dhSinglePass_stdDH_sha512kdf_scheme, eccCert, AES256_WRAP, dhSinglePass_stdDH_sha512kdf_scheme, eccCert,
eccCertSz, eccPrivKey, eccPrivKeySz}, eccCertSz, eccPrivKey, eccPrivKeySz},
@@ -16215,6 +16215,37 @@ static void test_wc_PKCS7_Degenerate(void)
#endif #endif
} /* END test_wc_PKCS7_Degenerate() */ } /* END test_wc_PKCS7_Degenerate() */
/*
* Testing wc_PKCS7_BER()
*/
static void test_wc_PKCS7_BER(void)
{
#if defined(HAVE_PKCS7) && !defined(NO_FILESYSTEM) && \
defined(ASN_BER_TO_DER)
PKCS7* pkcs7;
char fName[] = "./certs/test-ber-exp02-05-2022.p7b";
XFILE f;
byte der[4096];
word32 derSz;
int ret;
printf(testingFmt, "wc_PKCS7_BER()");
AssertNotNull(f = XFOPEN(fName, "rb"));
AssertIntGT((ret = (int)fread(der, 1, sizeof(der), f)), 0);
derSz = (word32)ret;
XFCLOSE(f);
AssertNotNull(pkcs7 = wc_PKCS7_New(HEAP_HINT, devId));
AssertIntEQ(wc_PKCS7_Init(pkcs7, HEAP_HINT, INVALID_DEVID), 0);
AssertIntEQ(wc_PKCS7_InitWithCert(pkcs7, NULL, 0), 0);
AssertIntEQ(wc_PKCS7_VerifySignedData(pkcs7, der, derSz), 0);
wc_PKCS7_Free(pkcs7);
printf(resultFmt, passed);
#endif
} /* END test_wc_PKCS7_BER() */
/* Testing wc_SignatureGetSize() for signature type ECC */ /* Testing wc_SignatureGetSize() for signature type ECC */
static int test_wc_SignatureGetSize_ecc(void) static int test_wc_SignatureGetSize_ecc(void)
@@ -23600,6 +23631,7 @@ void ApiTest(void)
test_wc_PKCS7_EncodeDecodeEnvelopedData(); test_wc_PKCS7_EncodeDecodeEnvelopedData();
test_wc_PKCS7_EncodeEncryptedData(); test_wc_PKCS7_EncodeEncryptedData();
test_wc_PKCS7_Degenerate(); test_wc_PKCS7_Degenerate();
test_wc_PKCS7_BER();
test_wolfSSL_CTX_LoadCRL(); test_wolfSSL_CTX_LoadCRL();

174
wolfcrypt/src/pkcs7.c
View File

@@ -265,6 +265,11 @@ static int wc_PKCS7_AddDataToStream(PKCS7* pkcs7, byte* in, word32 inSz,
if (inSz - rdSz > 0 && pkcs7->stream->length < expected) { if (inSz - rdSz > 0 && pkcs7->stream->length < expected) {
int len = min(inSz - rdSz, expected - pkcs7->stream->length); int len = min(inSz - rdSz, expected - pkcs7->stream->length);
/* sanity check that the input buffer is not internal buffer */
if (in == pkcs7->stream->buffer) {
return WC_PKCS7_WANT_READ_E;
}
/* check if internal buffer size needs to be increased */ /* check if internal buffer size needs to be increased */
if (len + pkcs7->stream->length > pkcs7->stream->bufferSz) { if (len + pkcs7->stream->length > pkcs7->stream->bufferSz) {
int ret = wc_PKCS7_GrowStream(pkcs7, expected); int ret = wc_PKCS7_GrowStream(pkcs7, expected);
@@ -3366,7 +3371,7 @@ static int PKCS7_VerifySignedData(PKCS7* pkcs7, const byte* hashBuf,
byte* in2, word32 in2Sz) byte* in2, word32 in2Sz)
{ {
word32 idx, outerContentType, hashOID = 0, sigOID, contentTypeSz = 0, totalSz = 0; word32 idx, outerContentType, hashOID = 0, sigOID, contentTypeSz = 0, totalSz = 0;
int length, version, ret = 0; int length = 0, version, ret = 0;
byte* content = NULL; byte* content = NULL;
byte* contentDynamic = NULL; byte* contentDynamic = NULL;
byte* sig = NULL; byte* sig = NULL;
@@ -3387,6 +3392,7 @@ static int PKCS7_VerifySignedData(PKCS7* pkcs7, const byte* hashBuf,
word32 pkiMsgSz = inSz; word32 pkiMsgSz = inSz;
#ifndef NO_PKCS7_STREAM #ifndef NO_PKCS7_STREAM
word32 stateIdx = 0; word32 stateIdx = 0;
long rc;
#endif #endif
byte* pkiMsg2 = in2; byte* pkiMsg2 = in2;
@@ -3411,6 +3417,12 @@ static int PKCS7_VerifySignedData(PKCS7* pkcs7, const byte* hashBuf,
} }
idx = 0; idx = 0;
#ifdef ASN_BER_TO_DER
if (pkcs7->derSz > 0 && pkcs7->der) {
pkiMsg = in = pkcs7->der;
}
#endif
#ifndef NO_PKCS7_STREAM #ifndef NO_PKCS7_STREAM
if (pkcs7->stream == NULL) { if (pkcs7->stream == NULL) {
if ((ret = wc_PKCS7_CreateStream(pkcs7)) != 0) { if ((ret = wc_PKCS7_CreateStream(pkcs7)) != 0) {
@@ -3429,14 +3441,11 @@ static int PKCS7_VerifySignedData(PKCS7* pkcs7, const byte* hashBuf,
break; break;
} }
{
long rc;
rc = wc_PKCS7_GetMaxStream(pkcs7, PKCS7_SEQ_PEEK, in, inSz); rc = wc_PKCS7_GetMaxStream(pkcs7, PKCS7_SEQ_PEEK, in, inSz);
if (rc < 0) { if (rc < 0) {
ret = (int)rc; ret = (int)rc;
break; break;
} }
}
pkiMsgSz = (pkcs7->stream->length > 0)? pkcs7->stream->length :inSz; pkiMsgSz = (pkcs7->stream->length > 0)? pkcs7->stream->length :inSz;
#endif #endif
@@ -3465,12 +3474,21 @@ static int PKCS7_VerifySignedData(PKCS7* pkcs7, const byte* hashBuf,
if (ret < 0) if (ret < 0)
return ret; return ret;
pkiMsg = pkcs7->der; pkiMsg = in = pkcs7->der;
pkiMsgSz = len; pkiMsgSz = pkcs7->derSz = len;
idx = 0; idx = 0;
if (GetSequence_ex(pkiMsg, &idx, &length, pkiMsgSz, if (GetSequence_ex(pkiMsg, &idx, &length, pkiMsgSz,
NO_USER_CHECK) < 0) NO_USER_CHECK) < 0)
return ASN_PARSE_E; return ASN_PARSE_E;
#ifndef NO_PKCS7_STREAM
rc = wc_PKCS7_GetMaxStream(pkcs7, PKCS7_SEQ_PEEK,
pkiMsg, pkiMsgSz);
if (rc < 0) {
ret = (int)rc;
break;
}
#endif
#else #else
ret = BER_INDEF_E; ret = BER_INDEF_E;
#endif #endif
@@ -3546,7 +3564,15 @@ static int PKCS7_VerifySignedData(PKCS7* pkcs7, const byte* hashBuf,
} }
wc_PKCS7_StreamGetVar(pkcs7, &totalSz, 0, 0); wc_PKCS7_StreamGetVar(pkcs7, &totalSz, 0, 0);
pkiMsgSz = (pkcs7->stream->length > 0)? pkcs7->stream->length :inSz; if (pkcs7->stream->length > 0)
pkiMsgSz = pkcs7->stream->length;
#ifdef ASN_BER_TO_DER
else if (pkcs7->der)
pkiMsgSz = pkcs7->derSz;
#endif
else
pkiMsgSz = inSz;
#endif #endif
/* Get the inner ContentInfo sequence */ /* Get the inner ContentInfo sequence */
if (GetSequence_ex(pkiMsg, &idx, &length, pkiMsgSz, if (GetSequence_ex(pkiMsg, &idx, &length, pkiMsgSz,
@@ -3689,15 +3715,18 @@ static int PKCS7_VerifySignedData(PKCS7* pkcs7, const byte* hashBuf,
break; break;
} }
{ rc = wc_PKCS7_GetMaxStream(pkcs7, PKCS7_DEFAULT_PEEK,
long rc = wc_PKCS7_GetMaxStream(pkcs7, PKCS7_DEFAULT_PEEK, pkiMsg, pkiMsgSz);
in, inSz);
if (rc < 0) { if (rc < 0) {
ret = (int)rc; ret = (int)rc;
break; break;
} }
#ifdef ASN_BER_TO_DER
if (pkcs7->derSz != 0)
pkiMsgSz = pkcs7->derSz;
else
#endif
pkiMsgSz = (word32)rc; pkiMsgSz = (word32)rc;
}
wc_PKCS7_StreamGetVar(pkcs7, &pkiMsg2Sz, (int*)&localIdx, &length); wc_PKCS7_StreamGetVar(pkcs7, &pkiMsg2Sz, (int*)&localIdx, &length);
if (pkcs7->stream->length > 0) { if (pkcs7->stream->length > 0) {
@@ -3709,7 +3738,7 @@ static int PKCS7_VerifySignedData(PKCS7* pkcs7, const byte* hashBuf,
/* Break out before content because it can be optional in degenerate /* Break out before content because it can be optional in degenerate
* cases. */ * cases. */
if (ret != 0 && !detached) if (ret != 0 && !degenerate)
break; break;
/* get parts of content */ /* get parts of content */
@@ -4041,7 +4070,7 @@ static int PKCS7_VerifySignedData(PKCS7* pkcs7, const byte* hashBuf,
case WC_PKCS7_VERIFY_STAGE5: case WC_PKCS7_VERIFY_STAGE5:
#ifndef NO_PKCS7_STREAM #ifndef NO_PKCS7_STREAM
if ((ret = wc_PKCS7_AddDataToStream(pkcs7, in, inSz, if ((ret = wc_PKCS7_AddDataToStream(pkcs7, in, inSz + in2Sz,
pkcs7->stream->expected, &pkiMsg, &idx)) != 0) { pkcs7->stream->expected, &pkiMsg, &idx)) != 0) {
break; break;
} }
@@ -7149,6 +7178,7 @@ static int wc_PKCS7_DecryptKtri(PKCS7* pkcs7, byte* in, word32 inSz,
#ifndef NO_PKCS7_STREAM #ifndef NO_PKCS7_STREAM
word32 tmpIdx = *idx; word32 tmpIdx = *idx;
long rc;
#endif #endif
#ifdef WC_RSA_BLINDING #ifdef WC_RSA_BLINDING
WC_RNG rng; WC_RNG rng;
@@ -7172,15 +7202,13 @@ static int wc_PKCS7_DecryptKtri(PKCS7* pkcs7, byte* in, word32 inSz,
return ret; return ret;
} }
{ rc = wc_PKCS7_GetMaxStream(pkcs7, PKCS7_DEFAULT_PEEK,
long rc = wc_PKCS7_GetMaxStream(pkcs7, PKCS7_DEFAULT_PEEK,
in, inSz); in, inSz);
if (rc < 0) { if (rc < 0) {
ret = (int)rc; ret = (int)rc;
break; break;
} }
pkiMsgSz = (word32)rc; pkiMsgSz = (word32)rc;
}
#endif #endif
if (GetMyVersion(pkiMsg, idx, &version, pkiMsgSz) < 0) if (GetMyVersion(pkiMsg, idx, &version, pkiMsgSz) < 0)
@@ -7216,15 +7244,14 @@ static int wc_PKCS7_DecryptKtri(PKCS7* pkcs7, byte* in, word32 inSz,
return ret; return ret;
} }
{ rc = wc_PKCS7_GetMaxStream(pkcs7, PKCS7_DEFAULT_PEEK,
long rc = wc_PKCS7_GetMaxStream(pkcs7, PKCS7_DEFAULT_PEEK,
in, inSz); in, inSz);
if (rc < 0) { if (rc < 0) {
ret = (int)rc; ret = (int)rc;
break; break;
} }
pkiMsgSz = (word32)rc; pkiMsgSz = (word32)rc;
}
wc_PKCS7_StreamGetVar(pkcs7, NULL, &sidType, &version); wc_PKCS7_StreamGetVar(pkcs7, NULL, &sidType, &version);
/* @TODO get expected size for next part, does not account for /* @TODO get expected size for next part, does not account for
@@ -7253,7 +7280,7 @@ static int wc_PKCS7_DecryptKtri(PKCS7* pkcs7, byte* in, word32 inSz,
return WC_PKCS7_WANT_READ_E; return WC_PKCS7_WANT_READ_E;
} }
} }
#endif #endif /* !NO_PKCS7_STREAM */
if (sidType == CMS_ISSUER_AND_SERIAL_NUMBER) { if (sidType == CMS_ISSUER_AND_SERIAL_NUMBER) {
@@ -7850,6 +7877,7 @@ static int wc_PKCS7_DecryptOri(PKCS7* pkcs7, byte* in, word32 inSz,
word32 pkiMsgSz = inSz; word32 pkiMsgSz = inSz;
#ifndef NO_PKCS7_STREAM #ifndef NO_PKCS7_STREAM
word32 stateIdx = *idx; word32 stateIdx = *idx;
long rc;
#endif #endif
if (pkcs7->oriDecryptCb == NULL) { if (pkcs7->oriDecryptCb == NULL) {
@@ -7868,15 +7896,13 @@ static int wc_PKCS7_DecryptOri(PKCS7* pkcs7, byte* in, word32 inSz,
return ret; return ret;
} }
{ rc = wc_PKCS7_GetMaxStream(pkcs7, PKCS7_DEFAULT_PEEK, in,
long rc = wc_PKCS7_GetMaxStream(pkcs7, PKCS7_DEFAULT_PEEK, in,
inSz); inSz);
if (rc < 0) { if (rc < 0) {
ret = (int)rc; ret = (int)rc;
break; break;
} }
pkiMsgSz = (word32)rc; pkiMsgSz = (word32)rc;
}
#endif #endif
/* get OtherRecipientInfo sequence length */ /* get OtherRecipientInfo sequence length */
if (GetLength(pkiMsg, idx, &seqSz, pkiMsgSz) < 0) if (GetLength(pkiMsg, idx, &seqSz, pkiMsgSz) < 0)
@@ -7949,6 +7975,7 @@ static int wc_PKCS7_DecryptPwri(PKCS7* pkcs7, byte* in, word32 inSz,
word32 pkiMsgSz = inSz; word32 pkiMsgSz = inSz;
#ifndef NO_PKCS7_STREAM #ifndef NO_PKCS7_STREAM
word32 tmpIdx = *idx; word32 tmpIdx = *idx;
long rc;
#endif #endif
switch (pkcs7->state) { switch (pkcs7->state) {
@@ -7961,15 +7988,13 @@ static int wc_PKCS7_DecryptPwri(PKCS7* pkcs7, byte* in, word32 inSz,
return ret; return ret;
} }
{ rc = wc_PKCS7_GetMaxStream(pkcs7, PKCS7_DEFAULT_PEEK, in,
long rc = wc_PKCS7_GetMaxStream(pkcs7, PKCS7_DEFAULT_PEEK, in,
inSz); inSz);
if (rc < 0) { if (rc < 0) {
ret = (int)rc; ret = (int)rc;
break; break;
} }
pkiMsgSz = (word32)rc; pkiMsgSz = (word32)rc;
}
#endif #endif
/* remove KeyDerivationAlgorithmIdentifier */ /* remove KeyDerivationAlgorithmIdentifier */
if (pkiMsg[(*idx)++] != (ASN_CONSTRUCTED | ASN_CONTEXT_SPECIFIC | 0)) if (pkiMsg[(*idx)++] != (ASN_CONSTRUCTED | ASN_CONTEXT_SPECIFIC | 0))
@@ -8164,6 +8189,7 @@ static int wc_PKCS7_DecryptKekri(PKCS7* pkcs7, byte* in, word32 inSz,
word32 pkiMsgSz = inSz; word32 pkiMsgSz = inSz;
#ifndef NO_PKCS7_STREAM #ifndef NO_PKCS7_STREAM
word32 tmpIdx = *idx; word32 tmpIdx = *idx;
long rc;
#endif #endif
switch (pkcs7->state) { switch (pkcs7->state) {
@@ -8176,15 +8202,13 @@ static int wc_PKCS7_DecryptKekri(PKCS7* pkcs7, byte* in, word32 inSz,
return ret; return ret;
} }
{ rc = wc_PKCS7_GetMaxStream(pkcs7, PKCS7_DEFAULT_PEEK, in,
long rc = wc_PKCS7_GetMaxStream(pkcs7, PKCS7_DEFAULT_PEEK, in,
inSz); inSz);
if (rc < 0) { if (rc < 0) {
ret = (int)rc; ret = (int)rc;
break; break;
} }
pkiMsgSz = (word32)rc; pkiMsgSz = (word32)rc;
}
#endif #endif
/* remove KEKIdentifier */ /* remove KEKIdentifier */
if (GetSequence(pkiMsg, idx, &length, pkiMsgSz) < 0) if (GetSequence(pkiMsg, idx, &length, pkiMsgSz) < 0)
@@ -8294,6 +8318,7 @@ static int wc_PKCS7_DecryptKari(PKCS7* pkcs7, byte* in, word32 inSz,
word32 pkiMsgSz = inSz; word32 pkiMsgSz = inSz;
#ifndef NO_PKCS7_STREAM #ifndef NO_PKCS7_STREAM
word32 tmpIdx = (idx) ? *idx : 0; word32 tmpIdx = (idx) ? *idx : 0;
long rc;
#endif #endif
if (pkcs7 == NULL || pkcs7->singleCert == NULL || if (pkcs7 == NULL || pkcs7->singleCert == NULL ||
@@ -8312,15 +8337,13 @@ static int wc_PKCS7_DecryptKari(PKCS7* pkcs7, byte* in, word32 inSz,
return ret; return ret;
} }
{ rc = wc_PKCS7_GetMaxStream(pkcs7, PKCS7_DEFAULT_PEEK, in,
long rc = wc_PKCS7_GetMaxStream(pkcs7, PKCS7_DEFAULT_PEEK, in,
inSz); inSz);
if (rc < 0) { if (rc < 0) {
ret = (int)rc; ret = (int)rc;
break; break;
} }
pkiMsgSz = (word32)rc; pkiMsgSz = (word32)rc;
}
#endif #endif
WC_PKCS7_KARI* kari; WC_PKCS7_KARI* kari;
@@ -8492,6 +8515,7 @@ static int wc_PKCS7_DecryptRecipientInfos(PKCS7* pkcs7, byte* in,
word32 pkiMsgSz = inSz; word32 pkiMsgSz = inSz;
#ifndef NO_PKCS7_STREAM #ifndef NO_PKCS7_STREAM
word32 tmpIdx = *idx; word32 tmpIdx = *idx;
long rc;
#endif #endif
if (pkcs7 == NULL || pkiMsg == NULL || idx == NULL || if (pkcs7 == NULL || pkiMsg == NULL || idx == NULL ||
@@ -8548,14 +8572,13 @@ static int wc_PKCS7_DecryptRecipientInfos(PKCS7* pkcs7, byte* in,
savedIdx = *idx; savedIdx = *idx;
#ifndef NO_PKCS7_STREAM #ifndef NO_PKCS7_STREAM
{ rc = wc_PKCS7_GetMaxStream(pkcs7, PKCS7_DEFAULT_PEEK, in, inSz);
long rc = wc_PKCS7_GetMaxStream(pkcs7, PKCS7_DEFAULT_PEEK, in, inSz);
if (rc < 0) { if (rc < 0) {
return (int)rc; return (int)rc;
} }
pkiMsgSz = (word32)rc; pkiMsgSz = (word32)rc;
} if (pkcs7->stream->length > 0)
if (pkcs7->stream->length > 0) pkiMsg = pkcs7->stream->buffer; pkiMsg = pkcs7->stream->buffer;
#endif #endif
/* when looking for next recipient, use first sequence and version to /* when looking for next recipient, use first sequence and version to
@@ -8722,6 +8745,7 @@ static int wc_PKCS7_ParseToRecipientInfoSet(PKCS7* pkcs7, byte* in,
word32 pkiMsgSz = inSz; word32 pkiMsgSz = inSz;
#ifndef NO_PKCS7_STREAM #ifndef NO_PKCS7_STREAM
word32 tmpIdx = 0; word32 tmpIdx = 0;
long rc;
#endif #endif
if (pkcs7 == NULL || pkiMsg == NULL || pkiMsgSz == 0 || idx == NULL) if (pkcs7 == NULL || pkiMsg == NULL || pkiMsgSz == 0 || idx == NULL)
@@ -8759,15 +8783,12 @@ static int wc_PKCS7_ParseToRecipientInfoSet(PKCS7* pkcs7, byte* in,
return ret; return ret;
} }
{
long rc;
rc = wc_PKCS7_GetMaxStream(pkcs7, PKCS7_SEQ_PEEK, in, inSz); rc = wc_PKCS7_GetMaxStream(pkcs7, PKCS7_SEQ_PEEK, in, inSz);
if (rc < 0) { if (rc < 0) {
ret = (int)rc; ret = (int)rc;
break; break;
} }
pkiMsgSz = (word32)rc; pkiMsgSz = (word32)rc;
}
#endif #endif
/* read past ContentInfo, verify type is envelopedData */ /* read past ContentInfo, verify type is envelopedData */
if (ret == 0 && GetSequence(pkiMsg, idx, &length, pkiMsgSz) < 0) if (ret == 0 && GetSequence(pkiMsg, idx, &length, pkiMsgSz) < 0)
@@ -8791,15 +8812,13 @@ static int wc_PKCS7_ParseToRecipientInfoSet(PKCS7* pkcs7, byte* in,
return ret; return ret;
} }
{ rc = wc_PKCS7_GetMaxStream(pkcs7, PKCS7_DEFAULT_PEEK,
long rc = wc_PKCS7_GetMaxStream(pkcs7, PKCS7_DEFAULT_PEEK,
in, inSz); in, inSz);
if (rc < 0) { if (rc < 0) {
ret = (int)rc; ret = (int)rc;
break; break;
} }
pkiMsgSz = (word32)rc; pkiMsgSz = (word32)rc;
}
#endif #endif
len = 0; len = 0;
@@ -8880,15 +8899,13 @@ static int wc_PKCS7_ParseToRecipientInfoSet(PKCS7* pkcs7, byte* in,
return ret; return ret;
} }
{ rc = wc_PKCS7_GetMaxStream(pkcs7, PKCS7_DEFAULT_PEEK, in,
long rc = wc_PKCS7_GetMaxStream(pkcs7, PKCS7_DEFAULT_PEEK, in,
inSz); inSz);
if (rc < 0) { if (rc < 0) {
ret = (int)rc; ret = (int)rc;
break; break;
} }
pkiMsgSz = (word32)rc; pkiMsgSz = (word32)rc;
}
#endif #endif
/* remove EnvelopedData and version */ /* remove EnvelopedData and version */
if (ret == 0 && GetSequence(pkiMsg, idx, &length, pkiMsgSz) < 0) if (ret == 0 && GetSequence(pkiMsg, idx, &length, pkiMsgSz) < 0)
@@ -8917,15 +8934,13 @@ static int wc_PKCS7_ParseToRecipientInfoSet(PKCS7* pkcs7, byte* in,
return ret; return ret;
} }
{ rc = wc_PKCS7_GetMaxStream(pkcs7, PKCS7_DEFAULT_PEEK, in,
long rc = wc_PKCS7_GetMaxStream(pkcs7, PKCS7_DEFAULT_PEEK, in,
inSz); inSz);
if (rc < 0) { if (rc < 0) {
ret = (int)rc; ret = (int)rc;
break; break;
} }
pkiMsgSz = (word32)rc; pkiMsgSz = (word32)rc;
}
version = pkcs7->stream->varOne; version = pkcs7->stream->varOne;
#endif #endif
@@ -9003,6 +9018,7 @@ WOLFSSL_API int wc_PKCS7_DecodeEnvelopedData(PKCS7* pkcs7, byte* in,
word32 idx = 0; word32 idx = 0;
#ifndef NO_PKCS7_STREAM #ifndef NO_PKCS7_STREAM
word32 tmpIdx = 0; word32 tmpIdx = 0;
long rc;
#endif #endif
word32 contentType, encOID = 0; word32 contentType, encOID = 0;
word32 decryptedKeySz = MAX_ENCRYPTED_KEY_SZ; word32 decryptedKeySz = MAX_ENCRYPTED_KEY_SZ;
@@ -9108,15 +9124,15 @@ WOLFSSL_API int wc_PKCS7_DecodeEnvelopedData(PKCS7* pkcs7, byte* in,
return ret; return ret;
} }
{ rc = wc_PKCS7_GetMaxStream(pkcs7, PKCS7_DEFAULT_PEEK, in,
long rc = wc_PKCS7_GetMaxStream(pkcs7, PKCS7_DEFAULT_PEEK, in,
inSz); inSz);
if (rc < 0) { if (rc < 0) {
ret = (int)rc; ret = (int)rc;
break; break;
} }
pkiMsgSz = (word32)rc; pkiMsgSz = (word32)rc;
} #else
ret = 0;
#endif #endif
/* remove EncryptedContentInfo */ /* remove EncryptedContentInfo */
@@ -9180,15 +9196,14 @@ WOLFSSL_API int wc_PKCS7_DecodeEnvelopedData(PKCS7* pkcs7, byte* in,
return ret; return ret;
} }
{ rc = wc_PKCS7_GetMaxStream(pkcs7, PKCS7_DEFAULT_PEEK, in,
long rc = wc_PKCS7_GetMaxStream(pkcs7, PKCS7_DEFAULT_PEEK, in,
inSz); inSz);
if (rc < 0) { if (rc < 0) {
ret = (int)rc; ret = (int)rc;
break; break;
} }
pkiMsgSz = (word32)rc; pkiMsgSz = (word32)rc;
}
wc_PKCS7_StreamGetVar(pkcs7, 0, 0, &length); wc_PKCS7_StreamGetVar(pkcs7, 0, 0, &length);
tmpIv = pkcs7->stream->tmpIv; tmpIv = pkcs7->stream->tmpIv;
if (tmpIv == NULL) { if (tmpIv == NULL) {
@@ -9196,6 +9211,8 @@ WOLFSSL_API int wc_PKCS7_DecodeEnvelopedData(PKCS7* pkcs7, byte* in,
ret = MEMORY_E; ret = MEMORY_E;
break; break;
} }
#else
ret = 0;
#endif #endif
XMEMCPY(tmpIv, &pkiMsg[idx], length); XMEMCPY(tmpIv, &pkiMsg[idx], length);
@@ -9260,6 +9277,8 @@ WOLFSSL_API int wc_PKCS7_DecodeEnvelopedData(PKCS7* pkcs7, byte* in,
decryptedKey = pkcs7->stream->aad; decryptedKey = pkcs7->stream->aad;
decryptedKeySz = pkcs7->stream->aadSz; decryptedKeySz = pkcs7->stream->aadSz;
blockKeySz = pkcs7->stream->contentSz; blockKeySz = pkcs7->stream->contentSz;
#else
ret = 0;
#endif #endif
encryptedContent = (byte*)XMALLOC(encryptedContentSz, pkcs7->heap, encryptedContent = (byte*)XMALLOC(encryptedContentSz, pkcs7->heap,
DYNAMIC_TYPE_PKCS7); DYNAMIC_TYPE_PKCS7);
@@ -9837,6 +9856,7 @@ WOLFSSL_API int wc_PKCS7_DecodeAuthEnvelopedData(PKCS7* pkcs7, byte* in,
word32 idx = 0; word32 idx = 0;
#ifndef NO_PKCS7_STREAM #ifndef NO_PKCS7_STREAM
word32 tmpIdx = 0; word32 tmpIdx = 0;
long rc;
#endif #endif
word32 contentType, encOID = 0; word32 contentType, encOID = 0;
word32 decryptedKeySz = 0; word32 decryptedKeySz = 0;
@@ -9956,15 +9976,13 @@ WOLFSSL_API int wc_PKCS7_DecodeAuthEnvelopedData(PKCS7* pkcs7, byte* in,
break; break;
} }
{ rc = wc_PKCS7_GetMaxStream(pkcs7, PKCS7_DEFAULT_PEEK,
long rc = wc_PKCS7_GetMaxStream(pkcs7, PKCS7_DEFAULT_PEEK,
in, inSz); in, inSz);
if (rc < 0) { if (rc < 0) {
ret = (int)rc; ret = (int)rc;
break; break;
} }
pkiMsgSz = (word32)rc; pkiMsgSz = (word32)rc;
}
#endif #endif
/* remove EncryptedContentInfo */ /* remove EncryptedContentInfo */
@@ -10018,15 +10036,13 @@ WOLFSSL_API int wc_PKCS7_DecodeAuthEnvelopedData(PKCS7* pkcs7, byte* in,
break; break;
} }
{ rc = wc_PKCS7_GetMaxStream(pkcs7, PKCS7_DEFAULT_PEEK, in,
long rc = wc_PKCS7_GetMaxStream(pkcs7, PKCS7_DEFAULT_PEEK, in,
inSz); inSz);
if (rc < 0) { if (rc < 0) {
ret = (int)rc; ret = (int)rc;
break; break;
} }
pkiMsgSz = (word32)rc; pkiMsgSz = (word32)rc;
}
#endif #endif
if (ret == 0 && GetLength(pkiMsg, &idx, &nonceSz, pkiMsgSz) < 0) { if (ret == 0 && GetLength(pkiMsg, &idx, &nonceSz, pkiMsgSz) < 0) {
ret = ASN_PARSE_E; ret = ASN_PARSE_E;
@@ -10113,15 +10129,14 @@ WOLFSSL_API int wc_PKCS7_DecodeAuthEnvelopedData(PKCS7* pkcs7, byte* in,
break; break;
} }
{ rc = wc_PKCS7_GetMaxStream(pkcs7, PKCS7_DEFAULT_PEEK, in,
long rc = wc_PKCS7_GetMaxStream(pkcs7, PKCS7_DEFAULT_PEEK, in,
inSz); inSz);
if (rc < 0) { if (rc < 0) {
ret = (int)rc; ret = (int)rc;
break; break;
} }
pkiMsgSz = (word32)rc; pkiMsgSz = (word32)rc;
}
encryptedContentSz = pkcs7->stream->expected; encryptedContentSz = pkcs7->stream->expected;
#endif #endif
@@ -10196,6 +10211,8 @@ WOLFSSL_API int wc_PKCS7_DecodeAuthEnvelopedData(PKCS7* pkcs7, byte* in,
length = pkcs7->stream->expected; length = pkcs7->stream->expected;
encodedAttribs = pkcs7->stream->aad; encodedAttribs = pkcs7->stream->aad;
#else
length = 0;
#endif #endif
/* save pointer and length */ /* save pointer and length */
@@ -10231,15 +10248,14 @@ authenv_atrbend:
return ret; return ret;
} }
{ rc = wc_PKCS7_GetMaxStream(pkcs7, PKCS7_DEFAULT_PEEK,
long rc = wc_PKCS7_GetMaxStream(pkcs7, PKCS7_DEFAULT_PEEK,
in, inSz); in, inSz);
if (rc < 0) { if (rc < 0) {
ret = (int)rc; ret = (int)rc;
break; break;
} }
pkiMsgSz = (word32)rc; pkiMsgSz = (word32)rc;
}
if (pkcs7->stream->aadSz > 0) { if (pkcs7->stream->aadSz > 0) {
encodedAttribSz = pkcs7->stream->aadSz; encodedAttribSz = pkcs7->stream->aadSz;
encodedAttribs = pkcs7->stream->aad; encodedAttribs = pkcs7->stream->aad;
@@ -10703,6 +10719,7 @@ int wc_PKCS7_DecodeEncryptedData(PKCS7* pkcs7, byte* in, word32 inSz,
#ifndef NO_PKCS7_STREAM #ifndef NO_PKCS7_STREAM
word32 tmpIdx = 0; word32 tmpIdx = 0;
long rc;
#endif #endif
word32 contentType, encOID; word32 contentType, encOID;
@@ -10742,15 +10759,12 @@ int wc_PKCS7_DecodeEncryptedData(PKCS7* pkcs7, byte* in, word32 inSz,
return ret; return ret;
} }
{
long rc;
rc = wc_PKCS7_GetMaxStream(pkcs7, PKCS7_SEQ_PEEK, in, inSz); rc = wc_PKCS7_GetMaxStream(pkcs7, PKCS7_SEQ_PEEK, in, inSz);
if (rc < 0) { if (rc < 0) {
ret = (int)rc; ret = (int)rc;
break; break;
} }
pkiMsgSz = (word32)rc; pkiMsgSz = (word32)rc;
}
#endif #endif
/* read past ContentInfo, verify type is encrypted-data */ /* read past ContentInfo, verify type is encrypted-data */
@@ -10784,15 +10798,13 @@ int wc_PKCS7_DecodeEncryptedData(PKCS7* pkcs7, byte* in, word32 inSz,
return ret; return ret;
} }
{ rc = wc_PKCS7_GetMaxStream(pkcs7, PKCS7_DEFAULT_PEEK, in,
long rc = wc_PKCS7_GetMaxStream(pkcs7, PKCS7_DEFAULT_PEEK, in,
inSz); inSz);
if (rc < 0) { if (rc < 0) {
ret = (int)rc; ret = (int)rc;
break; break;
} }
pkiMsgSz = (word32)rc; pkiMsgSz = (word32)rc;
}
#endif #endif
if (ret == 0 && pkiMsg[idx++] != (ASN_CONSTRUCTED | if (ret == 0 && pkiMsg[idx++] != (ASN_CONSTRUCTED |
ASN_CONTEXT_SPECIFIC | 0)) ASN_CONTEXT_SPECIFIC | 0))
@@ -10823,15 +10835,13 @@ int wc_PKCS7_DecodeEncryptedData(PKCS7* pkcs7, byte* in, word32 inSz,
return ret; return ret;
} }
{ rc = wc_PKCS7_GetMaxStream(pkcs7, PKCS7_DEFAULT_PEEK, in,
long rc = wc_PKCS7_GetMaxStream(pkcs7, PKCS7_DEFAULT_PEEK, in,
inSz); inSz);
if (rc < 0) { if (rc < 0) {
ret = (int)rc; ret = (int)rc;
break; break;
} }
pkiMsgSz = (word32)rc; pkiMsgSz = (word32)rc;
}
#endif #endif
/* get version, check later */ /* get version, check later */
haveAttribs = 0; haveAttribs = 0;
@@ -10877,15 +10887,13 @@ int wc_PKCS7_DecodeEncryptedData(PKCS7* pkcs7, byte* in, word32 inSz,
return ret; return ret;
} }
{ rc = wc_PKCS7_GetMaxStream(pkcs7, PKCS7_DEFAULT_PEEK, in,
long rc = wc_PKCS7_GetMaxStream(pkcs7, PKCS7_DEFAULT_PEEK, in,
inSz); inSz);
if (rc < 0) { if (rc < 0) {
ret = (int)rc; ret = (int)rc;
break; break;
} }
pkiMsgSz = (word32)rc; pkiMsgSz = (word32)rc;
}
/* restore saved variables */ /* restore saved variables */
expBlockSz = pkcs7->stream->varOne; expBlockSz = pkcs7->stream->varOne;
@@ -10922,15 +10930,13 @@ int wc_PKCS7_DecodeEncryptedData(PKCS7* pkcs7, byte* in, word32 inSz,
return ret; return ret;
} }
{ rc = wc_PKCS7_GetMaxStream(pkcs7, PKCS7_DEFAULT_PEEK, in,
long rc = wc_PKCS7_GetMaxStream(pkcs7, PKCS7_DEFAULT_PEEK, in,
inSz); inSz);
if (rc < 0) { if (rc < 0) {
ret = (int)rc; ret = (int)rc;
break; break;
} }
pkiMsgSz = (word32)rc; pkiMsgSz = (word32)rc;
}
/* use IV buffer from stream structure */ /* use IV buffer from stream structure */
tmpIv = pkcs7->stream->tmpIv; tmpIv = pkcs7->stream->tmpIv;
@@ -10974,15 +10980,13 @@ int wc_PKCS7_DecodeEncryptedData(PKCS7* pkcs7, byte* in, word32 inSz,
return ret; return ret;
} }
{ rc = wc_PKCS7_GetMaxStream(pkcs7, PKCS7_DEFAULT_PEEK, in,
long rc = wc_PKCS7_GetMaxStream(pkcs7, PKCS7_DEFAULT_PEEK, in,
inSz); inSz);
if (rc < 0) { if (rc < 0) {
ret = (int)rc; ret = (int)rc;
break; break;
} }
pkiMsgSz = (word32)rc; pkiMsgSz = (word32)rc;
}
/* restore saved variables */ /* restore saved variables */
expBlockSz = pkcs7->stream->varOne; expBlockSz = pkcs7->stream->varOne;
@@ -10990,6 +10994,8 @@ int wc_PKCS7_DecodeEncryptedData(PKCS7* pkcs7, byte* in, word32 inSz,
encryptedContentSz = pkcs7->stream->varThree; encryptedContentSz = pkcs7->stream->varThree;
version = pkcs7->stream->vers; version = pkcs7->stream->vers;
tmpIv = pkcs7->stream->tmpIv; tmpIv = pkcs7->stream->tmpIv;
#else
encOID = 0;
#endif #endif
if (ret == 0 && (encryptedContent = (byte*)XMALLOC( if (ret == 0 && (encryptedContent = (byte*)XMALLOC(
encryptedContentSz, pkcs7->heap, DYNAMIC_TYPE_PKCS7)) == NULL) encryptedContentSz, pkcs7->heap, DYNAMIC_TYPE_PKCS7)) == NULL)

1
wolfssl/wolfcrypt/pkcs7.h
View File

@@ -214,6 +214,7 @@ struct PKCS7 {
void* heap; /* heap hint for dynamic memory */ void* heap; /* heap hint for dynamic memory */
#ifdef ASN_BER_TO_DER #ifdef ASN_BER_TO_DER
byte* der; /* DER encoded version of message */ byte* der; /* DER encoded version of message */
word32 derSz;
#endif #endif
byte* cert[MAX_PKCS7_CERTS]; byte* cert[MAX_PKCS7_CERTS];