mirrors/wolfssl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4081 from strongX509/master

Browse Source 
SHA3-based RSA signatures require SHA-3 hash OIDs
This commit is contained in:
David Garske 2021-06-08 07:46:18 -07:00 committed by GitHub
commit 9497c74283
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 36 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
wolfcrypt/src/asn.c
View File

@ -1464,6 +1464,18 @@ static word32 SetBitString16Bit(word16 val, byte* output)
#ifdef WOLFSSL_SHA512
static const byte hashSha512hOid[] = {96, 134, 72, 1, 101, 3, 4, 2, 3};
#endif
#if defined(WOLFSSL_SHA3) && !defined(WOLFSSL_NOSHA3_224)
static const byte hashSha3_224hOid[] = {96, 134, 72, 1, 101, 3, 4, 2, 7};
#endif
#if defined(WOLFSSL_SHA3) && !defined(WOLFSSL_NOSHA3_256)
static const byte hashSha3_256hOid[] = {96, 134, 72, 1, 101, 3, 4, 2, 8};
#endif
#if defined(WOLFSSL_SHA3) && !defined(WOLFSSL_NOSHA3_384)
static const byte hashSha3_384hOid[] = {96, 134, 72, 1, 101, 3, 4, 2, 9};
#endif
#if defined(WOLFSSL_SHA3) && !defined(WOLFSSL_NOSHA3_512)
static const byte hashSha3_512hOid[] = {96, 134, 72, 1, 101, 3, 4, 2, 10};
#endif
/* hmacType */
#ifndef NO_HMAC
@ -1764,6 +1776,30 @@ const byte* OidFromId(word32 id, word32 type, word32* oidSz)
oid = hashSha512hOid;
*oidSz = sizeof(hashSha512hOid);
break;
#endif
#if defined(WOLFSSL_SHA3) && !defined(WOLFSSL_NOSHA3_224)
case SHA3_224h:
oid = hashSha3_224hOid;
*oidSz = sizeof(hashSha3_224hOid);
break;
#endif
#if defined(WOLFSSL_SHA3) && !defined(WOLFSSL_NOSHA3_256)
case SHA3_256h:
oid = hashSha3_256hOid;
*oidSz = sizeof(hashSha3_256hOid);
break;
#endif
#if defined(WOLFSSL_SHA3) && !defined(WOLFSSL_NOSHA3_384)
case SHA3_384h:
oid = hashSha3_384hOid;
*oidSz = sizeof(hashSha3_384hOid);
break;
#endif
#if defined(WOLFSSL_SHA3) && !defined(WOLFSSL_NOSHA3_512)
case SHA3_512h:
oid = hashSha3_512hOid;
*oidSz = sizeof(hashSha3_512hOid);
break;
#endif
default:
break;