wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-30 18:57:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add DSA support to ConfirmSignature and add DSAwithSHA256

Browse Source
This commit is contained in:
Juliusz Sosinowicz
2020-09-10 09:40:40 +02:00
parent 2a20896e44
commit b808124a47
4 changed files with 110 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/ssl.c
View File

@ -29981,6 +29981,8 @@ const WOLFSSL_ObjectInfo wolfssl_object_info[] = {
#ifndef NO_DSA #ifndef NO_DSA
#ifndef NO_SHA #ifndef NO_SHA
{ CTC_SHAwDSA, CTC_SHAwDSA, oidSigType, "DSA-SHA1", "dsaWithSHA1"}, { CTC_SHAwDSA, CTC_SHAwDSA, oidSigType, "DSA-SHA1", "dsaWithSHA1"},
{ CTC_SHA256wDSA, CTC_SHA256wDSA, oidSigType, "dsa_with_SHA256",
"dsa_with_SHA256"},
#endif #endif
#endif /* NO_DSA */ #endif /* NO_DSA */
#ifndef NO_RSA #ifndef NO_RSA
@ -47527,6 +47529,8 @@ int oid2nid(word32 oid, int grp)
#ifndef NO_DSA #ifndef NO_DSA
case CTC_SHAwDSA: case CTC_SHAwDSA:
return CTC_SHAwDSA; return CTC_SHAwDSA;
case CTC_SHA256wDSA:
return CTC_SHA256wDSA;
#endif /* NO_DSA */ #endif /* NO_DSA */
#ifndef NO_RSA #ifndef NO_RSA
case CTC_MD2wRSA: case CTC_MD2wRSA:

109
wolfcrypt/src/asn.c
View File

@ -524,6 +524,7 @@ static int GetInteger7Bit(const byte* input, word32* inOutIdx, word32 maxIdx)
#if !defined(NO_DSA) && !defined(NO_SHA) #if !defined(NO_DSA) && !defined(NO_SHA)
static const char sigSha1wDsaName[] = "SHAwDSA"; static const char sigSha1wDsaName[] = "SHAwDSA";
static const char sigSha256wDsaName[] = "SHA256wDSA";
#endif /* NO_DSA */ #endif /* NO_DSA */
#ifndef NO_RSA #ifndef NO_RSA
#ifdef WOLFSSL_MD2 #ifdef WOLFSSL_MD2
@ -577,6 +578,8 @@ const char* GetSigName(int oid) {
#if !defined(NO_DSA) && !defined(NO_SHA) #if !defined(NO_DSA) && !defined(NO_SHA)
case CTC_SHAwDSA: case CTC_SHAwDSA:
return sigSha1wDsaName; return sigSha1wDsaName;
case CTC_SHA256wDSA:
return sigSha256wDsaName;
#endif /* NO_DSA && NO_SHA */ #endif /* NO_DSA && NO_SHA */
#ifndef NO_RSA #ifndef NO_RSA
#ifdef WOLFSSL_MD2 #ifdef WOLFSSL_MD2
@ -1469,6 +1472,7 @@ static word32 SetBitString16Bit(word16 val, byte* output)
/* sigType */ /* sigType */
#if !defined(NO_DSA) && !defined(NO_SHA) #if !defined(NO_DSA) && !defined(NO_SHA)
static const byte sigSha1wDsaOid[] = {42, 134, 72, 206, 56, 4, 3}; static const byte sigSha1wDsaOid[] = {42, 134, 72, 206, 56, 4, 3};
static const byte sigSha256wDsaOid[] = {96, 134, 72, 1, 101, 3, 4, 3, 2};
#endif /* NO_DSA */ #endif /* NO_DSA */
#ifndef NO_RSA #ifndef NO_RSA
#ifdef WOLFSSL_MD2 #ifdef WOLFSSL_MD2
@ -1759,6 +1763,10 @@ const byte* OidFromId(word32 id, word32 type, word32* oidSz)
oid = sigSha1wDsaOid; oid = sigSha1wDsaOid;
*oidSz = sizeof(sigSha1wDsaOid); *oidSz = sizeof(sigSha1wDsaOid);
break; break;
case CTC_SHA256wDSA:
oid = sigSha256wDsaOid;
*oidSz = sizeof(sigSha256wDsaOid);
break;
#endif /* NO_DSA */ #endif /* NO_DSA */
#ifndef NO_RSA #ifndef NO_RSA
#ifdef WOLFSSL_MD2 #ifdef WOLFSSL_MD2
@ -7015,10 +7023,10 @@ void FreeSignatureCtx(SignatureCtx* sigCtx)
XFREE(sigCtx->digest, sigCtx->heap, DYNAMIC_TYPE_DIGEST); XFREE(sigCtx->digest, sigCtx->heap, DYNAMIC_TYPE_DIGEST);
sigCtx->digest = NULL; sigCtx->digest = NULL;
} }
#ifndef NO_RSA #if !defined(NO_RSA) && !defined(NO_DSA)
if (sigCtx->plain) { if (sigCtx->sigCpy) {
XFREE(sigCtx->plain, sigCtx->heap, DYNAMIC_TYPE_SIGNATURE); XFREE(sigCtx->sigCpy, sigCtx->heap, DYNAMIC_TYPE_SIGNATURE);
sigCtx->plain = NULL; sigCtx->sigCpy = NULL;
} }
#endif #endif
#ifndef NO_ASN_CRYPT #ifndef NO_ASN_CRYPT
@ -7030,6 +7038,12 @@ void FreeSignatureCtx(SignatureCtx* sigCtx)
XFREE(sigCtx->key.ptr, sigCtx->heap, DYNAMIC_TYPE_RSA); XFREE(sigCtx->key.ptr, sigCtx->heap, DYNAMIC_TYPE_RSA);
break; break;
#endif /* !NO_RSA */ #endif /* !NO_RSA */
#ifndef NO_DSA
case DSAk:
wc_FreeDsaKey(sigCtx->key.dsa);
XFREE(sigCtx->key.dsa, sigCtx->heap, DYNAMIC_TYPE_DSA);
break;
#endif
#ifdef HAVE_ECC #ifdef HAVE_ECC
case ECDSAk: case ECDSAk:
wc_ecc_free(sigCtx->key.ecc); wc_ecc_free(sigCtx->key.ecc);
@ -7110,6 +7124,7 @@ static int HashForSignature(const byte* buf, word32 bufSz, word32 sigOID,
#ifndef NO_SHA256 #ifndef NO_SHA256
case CTC_SHA256wRSA: case CTC_SHA256wRSA:
case CTC_SHA256wECDSA: case CTC_SHA256wECDSA:
case CTC_SHA256wDSA:
if ((ret = wc_Sha256Hash(buf, bufSz, digest)) == 0) { if ((ret = wc_Sha256Hash(buf, bufSz, digest)) == 0) {
*typeH = SHA256h; *typeH = SHA256h;
*digestSz = WC_SHA256_DIGEST_SIZE; *digestSz = WC_SHA256_DIGEST_SIZE;
@ -7217,9 +7232,9 @@ static int ConfirmSignature(SignatureCtx* sigCtx,
sigCtx->key.rsa = (RsaKey*)XMALLOC(sizeof(RsaKey), sigCtx->key.rsa = (RsaKey*)XMALLOC(sizeof(RsaKey),
sigCtx->heap, DYNAMIC_TYPE_RSA); sigCtx->heap, DYNAMIC_TYPE_RSA);
sigCtx->plain = (byte*)XMALLOC(MAX_ENCODED_SIG_SZ, sigCtx->sigCpy = (byte*)XMALLOC(MAX_ENCODED_SIG_SZ,
sigCtx->heap, DYNAMIC_TYPE_SIGNATURE); sigCtx->heap, DYNAMIC_TYPE_SIGNATURE);
if (sigCtx->key.rsa == NULL || sigCtx->plain == NULL) { if (sigCtx->key.rsa == NULL || sigCtx->sigCpy == NULL) {
ERROR_OUT(MEMORY_E, exit_cs); ERROR_OUT(MEMORY_E, exit_cs);
} }
if ((ret = wc_InitRsaKey_ex(sigCtx->key.rsa, sigCtx->heap, if ((ret = wc_InitRsaKey_ex(sigCtx->key.rsa, sigCtx->heap,
@ -7235,7 +7250,7 @@ static int ConfirmSignature(SignatureCtx* sigCtx,
WOLFSSL_MSG("ASN Key decode error RSA"); WOLFSSL_MSG("ASN Key decode error RSA");
goto exit_cs; goto exit_cs;
} }
XMEMCPY(sigCtx->plain, sig, sigSz); XMEMCPY(sigCtx->sigCpy, sig, sigSz);
sigCtx->out = NULL; sigCtx->out = NULL;
#ifdef WOLFSSL_ASYNC_CRYPT #ifdef WOLFSSL_ASYNC_CRYPT
@ -7244,6 +7259,59 @@ static int ConfirmSignature(SignatureCtx* sigCtx,
break; break;
} }
#endif /* !NO_RSA */ #endif /* !NO_RSA */
#ifndef NO_DSA
case DSAk:
{
word32 idx = 0;
mp_int r, s;
if (sigSz < DSA_SIG_SIZE) {
WOLFSSL_MSG("Verify Signature is too small");
ERROR_OUT(BUFFER_E, exit_cs);
}
sigCtx->key.dsa = (DsaKey*)XMALLOC(sizeof(DsaKey),
sigCtx->heap, DYNAMIC_TYPE_DSA);
sigCtx->sigCpy = (byte*)XMALLOC(sigSz,
sigCtx->heap, DYNAMIC_TYPE_SIGNATURE);
if (sigCtx->key.dsa == NULL || sigCtx->sigCpy == NULL) {
ERROR_OUT(MEMORY_E, exit_cs);
}
if ((ret = wc_InitDsaKey_h(sigCtx->key.dsa, sigCtx->heap)) != 0) {
WOLFSSL_MSG("wc_InitDsaKey_h error");
goto exit_cs;
}
if ((ret = wc_DsaPublicKeyDecode(key, &idx, sigCtx->key.dsa,
keySz)) != 0) {
WOLFSSL_MSG("ASN Key decode error RSA");
goto exit_cs;
}
if (sigSz != DSA_SIG_SIZE) {
/* Try to parse it as the contents of a bitstring */
idx = 0;
if (DecodeECC_DSA_Sig(sig + idx, sigSz - idx,
&r, &s) != 0) {
WOLFSSL_MSG("DSA Sig is in unrecognized or "
"incorrect format");
ERROR_OUT(ASN_SIG_CONFIRM_E, exit_cs);
}
if (mp_to_unsigned_bin_len(&r, sigCtx->sigCpy,
DSA_HALF_SIZE) != MP_OKAY ||
mp_to_unsigned_bin_len(&s,
sigCtx->sigCpy + DSA_HALF_SIZE,
DSA_HALF_SIZE) != MP_OKAY) {
WOLFSSL_MSG("DSA Sig is in unrecognized or "
"incorrect format");
ERROR_OUT(ASN_SIG_CONFIRM_E, exit_cs);
}
mp_free(&r);
mp_free(&s);
}
else {
XMEMCPY(sigCtx->sigCpy, sig, DSA_SIG_SIZE);
}
break;
}
#endif /* !NO_DSA */
#ifdef HAVE_ECC #ifdef HAVE_ECC
case ECDSAk: case ECDSAk:
{ {
@ -7351,7 +7419,7 @@ static int ConfirmSignature(SignatureCtx* sigCtx,
#ifdef HAVE_PK_CALLBACKS #ifdef HAVE_PK_CALLBACKS
if (sigCtx->pkCbRsa) { if (sigCtx->pkCbRsa) {
ret = sigCtx->pkCbRsa( ret = sigCtx->pkCbRsa(
sigCtx->plain, sigSz, &sigCtx->out, sigCtx->sigCpy, sigSz, &sigCtx->out,
key, keySz, key, keySz,
sigCtx->pkCtxRsa); sigCtx->pkCtxRsa);
} }
@ -7361,7 +7429,7 @@ static int ConfirmSignature(SignatureCtx* sigCtx,
#ifdef WOLFSSL_RENESAS_TSIP_TLS #ifdef WOLFSSL_RENESAS_TSIP_TLS
if (rsaKeyIdx != NULL) if (rsaKeyIdx != NULL)
{ {
ret = tsip_tls_CertVerify(buf, bufSz, sigCtx->plain, ret = tsip_tls_CertVerify(buf, bufSz, sigCtx->sigCpy,
sigSz, sigSz,
sigCtx->pubkey_n_start - sigCtx->certBegin, sigCtx->pubkey_n_start - sigCtx->certBegin,
sigCtx->pubkey_n_len - 1, sigCtx->pubkey_n_len - 1,
@ -7378,12 +7446,20 @@ static int ConfirmSignature(SignatureCtx* sigCtx,
} }
} else } else
#endif #endif
ret = wc_RsaSSL_VerifyInline(sigCtx->plain, sigSz, ret = wc_RsaSSL_VerifyInline(sigCtx->sigCpy, sigSz,
&sigCtx->out, sigCtx->key.rsa); &sigCtx->out, sigCtx->key.rsa);
} }
break; break;
} }
#endif /* !NO_RSA */ #endif /* !NO_RSA */
#ifndef NO_DSA
case DSAk:
{
ret = wc_DsaVerify(sigCtx->digest, sigCtx->sigCpy,
sigCtx->key.dsa, &sigCtx->verify);
break;
}
#endif /* !NO_DSA */
#if defined(HAVE_ECC) #if defined(HAVE_ECC)
case ECDSAk: case ECDSAk:
{ {
@ -7482,6 +7558,19 @@ static int ConfirmSignature(SignatureCtx* sigCtx,
break; break;
} }
#endif /* NO_RSA */ #endif /* NO_RSA */
#ifndef NO_DSA
case DSAk:
{
if (sigCtx->verify == 1) {
ret = 0;
}
else {
WOLFSSL_MSG("DSA Verify didn't match");
ret = ASN_SIG_CONFIRM_E;
}
break;
}
#endif /* !NO_DSA */
#ifdef HAVE_ECC #ifdef HAVE_ECC
case ECDSAk: case ECDSAk:
{ {

7
wolfssl/wolfcrypt/asn.h
View File

@ -677,7 +677,9 @@ struct SignatureCtx {
byte* digest; byte* digest;
#ifndef NO_RSA #ifndef NO_RSA
byte* out; byte* out;
byte* plain; #endif
#if !defined(NO_RSA) && !defined(NO_DSA)
byte* sigCpy;
#endif #endif
#if defined(HAVE_ECC) || defined(HAVE_ED25519) || defined(HAVE_ED448) #if defined(HAVE_ECC) || defined(HAVE_ED25519) || defined(HAVE_ED448)
int verify; int verify;
@ -686,6 +688,9 @@ struct SignatureCtx {
#ifndef NO_RSA #ifndef NO_RSA
struct RsaKey* rsa; struct RsaKey* rsa;
#endif #endif
#ifndef NO_DSA
struct DsaKey* dsa;
#endif
#ifdef HAVE_ECC #ifdef HAVE_ECC
struct ecc_key* ecc; struct ecc_key* ecc;
#endif #endif

1
wolfssl/wolfcrypt/asn_public.h
View File

@ -126,6 +126,7 @@ enum CertType {
/* Signature type, by OID sum */ /* Signature type, by OID sum */
enum Ctc_SigType { enum Ctc_SigType {
CTC_SHAwDSA = 517, CTC_SHAwDSA = 517,
CTC_SHA256wDSA = 416,
CTC_MD2wRSA = 646, CTC_MD2wRSA = 646,
CTC_MD5wRSA = 648, CTC_MD5wRSA = 648,
CTC_SHAwRSA = 649, CTC_SHAwRSA = 649,