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

Merge pull request #394 from cconlon/sigalgo

Browse Source 
Omit NULL parameter in AlgorithmIdentifier encoding for ECDSA OIDs
This commit is contained in:
toddouska
2016-04-22 11:37:17 -07:00
parent 70aa4a99a0 27814ca1df
commit 1e821dbd59
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
wolfcrypt/src/asn.c
View File

@@ -3372,6 +3372,17 @@ static int SetCurve(ecc_key* key, byte* output)
#endif /* HAVE_ECC && WOLFSSL_CERT_GEN */ #endif /* HAVE_ECC && WOLFSSL_CERT_GEN */
static INLINE int IsSigAlgoECDSA(int algoOID)
{
/* ECDSA sigAlgo must not have ASN1 NULL parameters */
if (algoOID == CTC_SHAwECDSA || algoOID == CTC_SHA256wECDSA ||
algoOID == CTC_SHA384wECDSA || algoOID == CTC_SHA512wECDSA) {
return 1;
}
return 0;
}
WOLFSSL_LOCAL word32 SetAlgoID(int algoOID, byte* output, int type, int curveSz) WOLFSSL_LOCAL word32 SetAlgoID(int algoOID, byte* output, int type, int curveSz)
{ {
word32 tagSz, idSz, seqSz, algoSz = 0; word32 tagSz, idSz, seqSz, algoSz = 0;
@@ -3379,7 +3390,8 @@ WOLFSSL_LOCAL word32 SetAlgoID(int algoOID, byte* output, int type, int curveSz)
byte ID_Length[MAX_LENGTH_SZ]; byte ID_Length[MAX_LENGTH_SZ];
byte seqArray[MAX_SEQ_SZ + 1]; /* add object_id to end */ byte seqArray[MAX_SEQ_SZ + 1]; /* add object_id to end */
tagSz = (type == oidHashType || type == oidSigType || tagSz = (type == oidHashType ||
(type == oidSigType && !IsSigAlgoECDSA(algoOID)) ||
(type == oidKeyType && algoOID == RSAk)) ? 2 : 0; (type == oidKeyType && algoOID == RSAk)) ? 2 : 0;
algoName = OidFromId(algoOID, type, &algoSz); algoName = OidFromId(algoOID, type, &algoSz);