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

Fixes from code review

Browse Source 
Document how length of ECDSA signature calculated.
Check parameter not NULL before use.
Formatting fix.
Also, disable RSA test of EVP_DigestSign/Verify* when HAVE_USER_RSA.
This commit is contained in:
Sean Parkinson
2018-09-13 08:47:09 +10:00
parent df20daa1ae
commit 0275366fb6
3 changed files with 25 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/ssl.c
View File

@@ -27491,11 +27491,19 @@ int wolfSSL_i2d_ECDSA_SIG(const WOLFSSL_ECDSA_SIG *sig, unsigned char **pp)
if (sig == NULL) if (sig == NULL)
return 0; return 0;
len = 2 + 2 + mp_leading_bit((mp_int*)sig->r->internal) + /* ASN.1: SEQ + INT + INT
mp_unsigned_bin_size((mp_int*)sig->r->internal) + * ASN.1 Integer must be a positive value - prepend zero if number has
2 + mp_leading_bit((mp_int*)sig->s->internal) + * top bit set.
mp_unsigned_bin_size((mp_int*)sig->s->internal); */
if (pp != NULL) { len = 2 + mp_leading_bit((mp_int*)sig->r->internal) +
mp_unsigned_bin_size((mp_int*)sig->r->internal) +
2 + mp_leading_bit((mp_int*)sig->s->internal) +
mp_unsigned_bin_size((mp_int*)sig->s->internal);
/* Two bytes required for length if ASN.1 SEQ data greater than 127 bytes
* and less than 256 bytes.
*/
len = 1 + ((len > 127) ? 2 : 1) + len;
if (pp != NULL && *pp != NULL) {
if (StoreECC_DSA_Sig(*pp, &len, (mp_int*)sig->r->internal, if (StoreECC_DSA_Sig(*pp, &len, (mp_int*)sig->r->internal,
(mp_int*)sig->s->internal) != MP_OKAY) { (mp_int*)sig->s->internal) != MP_OKAY) {
len = 0; len = 0;
@@ -28230,13 +28238,17 @@ int wolfSSL_EVP_PKEY_type(int type)
int wolfSSL_EVP_PKEY_id(const EVP_PKEY *pkey) int wolfSSL_EVP_PKEY_id(const EVP_PKEY *pkey)
{ {
return pkey->type; if (pkey != NULL)
return pkey->type;
return 0;
} }
int wolfSSL_EVP_PKEY_base_id(const EVP_PKEY *pkey) int wolfSSL_EVP_PKEY_base_id(const EVP_PKEY *pkey)
{ {
return EVP_PKEY_type(pkey->type); if (pkey == NULL)
return NID_undef;
return wolfSSL_EVP_PKEY_type(pkey->type);
} }

7
tests/api.c
View File

@@ -16798,7 +16798,8 @@ static void test_wolfSSL_EVP_MD_hmac_signing(void)
static void test_wolfSSL_EVP_MD_rsa_signing(void) static void test_wolfSSL_EVP_MD_rsa_signing(void)
{ {
#if defined(OPENSSL_EXTRA) && !defined(NO_RSA) && defined(USE_CERT_BUFFERS_2048) #if defined(OPENSSL_EXTRA) && !defined(NO_RSA) && !defined(HAVE_USER_RSA) && \
defined(USE_CERT_BUFFERS_2048)
WOLFSSL_EVP_PKEY* privKey; WOLFSSL_EVP_PKEY* privKey;
WOLFSSL_EVP_PKEY* pubKey; WOLFSSL_EVP_PKEY* pubKey;
const char testData[] = "Hi There"; const char testData[] = "Hi There";
@@ -16866,7 +16867,7 @@ static void test_wolfSSL_EVP_MD_rsa_signing(void)
wolfSSL_EVP_PKEY_free(privKey); wolfSSL_EVP_PKEY_free(privKey);
printf(resultFmt, passed); printf(resultFmt, passed);
#endif /* OPENSSL_EXTRA */ #endif
} }
@@ -16934,7 +16935,7 @@ static void test_wolfSSL_EVP_MD_ecc_signing(void)
wolfSSL_EVP_PKEY_free(privKey); wolfSSL_EVP_PKEY_free(privKey);
printf(resultFmt, passed); printf(resultFmt, passed);
#endif /* OPENSSL_EXTRA */ #endif
} }

3
wolfcrypt/src/evp.c
View File

@@ -1391,7 +1391,8 @@ int wolfSSL_EVP_DigestSignFinal(WOLFSSL_EVP_MD_CTX *ctx, unsigned char *sig,
case EVP_PKEY_RSA: { case EVP_PKEY_RSA: {
unsigned int sigSz; unsigned int sigSz;
int nid = md2nid(ctx->macType); int nid = md2nid(ctx->macType);
if (nid < 0) break; if (nid < 0)
break;
ret = wolfSSL_RSA_sign(nid, digest, hashLen, sig, &sigSz, ret = wolfSSL_RSA_sign(nid, digest, hashLen, sig, &sigSz,
ctx->pctx->pkey->rsa); ctx->pctx->pkey->rsa);
if (ret >= 0) if (ret >= 0)