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

Merge pull request #1881 from SparkiDev/pkcs7_no_si

Browse Source 
Return error when attempting to verify signed data without signers
This commit is contained in:
toddouska
2018-10-22 15:00:55 -07:00
committed by GitHub
parent 878b5925fc 67bb558025
commit 22aa01a547
3 changed files with 84 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
wolfcrypt/src/error.c
View File

@@ -497,6 +497,9 @@ const char* wc_GetErrorString(int error)
case ZLIB_DECOMPRESS_ERROR: case ZLIB_DECOMPRESS_ERROR:
return "zlib decompress error"; return "zlib decompress error";
case PKCS7_NO_SIGNER_E:
return "No signer in PKCS#7 signed data";
default: default:
return "unknown error number"; return "unknown error number";

5
wolfcrypt/src/pkcs7.c
View File

@@ -2223,7 +2223,9 @@ static int PKCS7_VerifySignedData(PKCS7* pkcs7, const byte* hashBuf,
if (GetSet(pkiMsg2, &idx, &length, pkiMsg2Sz) < 0) if (GetSet(pkiMsg2, &idx, &length, pkiMsg2Sz) < 0)
return ASN_PARSE_E; return ASN_PARSE_E;
if (length > 0) { if (length == 0)
return PKCS7_NO_SIGNER_E;
/* Get the sequence of the first signerInfo */ /* Get the sequence of the first signerInfo */
if (GetSequence(pkiMsg2, &idx, &length, pkiMsg2Sz) < 0) if (GetSequence(pkiMsg2, &idx, &length, pkiMsg2Sz) < 0)
return ASN_PARSE_E; return ASN_PARSE_E;
@@ -2303,7 +2305,6 @@ static int PKCS7_VerifySignedData(PKCS7* pkcs7, const byte* hashBuf,
hashBuf, hashSz); hashBuf, hashSz);
if (ret < 0) if (ret < 0)
return ret; return ret;
}
return 0; return 0;
} }

4
wolfssl/wolfcrypt/error-crypt.h
View File

@@ -220,7 +220,9 @@ enum {
ZLIB_COMPRESS_ERROR = -267, /* zlib compression error */ ZLIB_COMPRESS_ERROR = -267, /* zlib compression error */
ZLIB_DECOMPRESS_ERROR = -268, /* zlib decompression error */ ZLIB_DECOMPRESS_ERROR = -268, /* zlib decompression error */
WC_LAST_E = -268, /* Update this to indicate last error */ PKCS7_NO_SIGNER_E = -269, /* No signer in PKCS#7 signed data msg */
WC_LAST_E = -269, /* Update this to indicate last error */
MIN_CODE_E = -300 /* errors -101 - -299 */ MIN_CODE_E = -300 /* errors -101 - -299 */
/* add new companion error id strings for any new error codes /* add new companion error id strings for any new error codes