WolfSSL
/
wolfssl
mirror of https://github.com/wolfSSL/wolfssl.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix for occasional unit.test failure in `test_wolfSSL_EVP_PKEY_derive`.

pull/3266/head
David Garske 2020-08-31 14:04:51 -07:00
parent e9b1ceae7e
commit c587ff72d2
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ssl.c
View File

@ -29795,7 +29795,7 @@ int wolfSSL_DH_compute_key(unsigned char* key, WOLFSSL_BIGNUM* otherPub,
privSz = wolfSSL_BN_bn2bin(dh->priv_key, priv);
pubSz = wolfSSL_BN_bn2bin(otherPub, pub);
if (dh->inSet == 0 && SetDhInternal(dh) != SSL_SUCCESS){
WOLFSSL_MSG("Bad DH set internal");
WOLFSSL_MSG("Bad DH set internal");
}
if (privSz <= 0 || pubSz <= 0)
WOLFSSL_MSG("Bad BN2bin set");
@ -29811,6 +29811,8 @@ int wolfSSL_DH_compute_key(unsigned char* key, WOLFSSL_BIGNUM* otherPub,
XFREE(priv, NULL, DYNAMIC_TYPE_PRIVATE_KEY);
#endif
WOLFSSL_LEAVE("wolfSSL_DH_compute_key", ret);
return ret;
}

4
tests/api.c
View File

@ -27628,7 +27628,7 @@ static void test_wolfSSL_X509_sign(void)
byte sn[16];
int snSz = sizeof(sn);
printf(testingFmt, "wolfSSL_X509_sign\n");
printf(testingFmt, "wolfSSL_X509_sign");
/* Set X509_NAME fields */
AssertNotNull(name = X509_NAME_new());
@ -32653,6 +32653,7 @@ static void test_wolfSSL_OCSP_get0_info()
static void test_wolfSSL_EVP_PKEY_derive(void)
{
#ifdef OPENSSL_ALL
printf(testingFmt, "wolfSSL_EVP_PKEY_derive()");
#if !defined(HAVE_FIPS) || (defined(HAVE_FIPS_VERSION) && (HAVE_FIPS_VERSION>2))
EVP_PKEY_CTX *ctx;
unsigned char *skey;
@ -32702,6 +32703,7 @@ static void test_wolfSSL_EVP_PKEY_derive(void)
XFREE(skey, NULL, DYNAMIC_TYPE_OPENSSL);
#endif /* HAVE_ECC */
#endif /* !HAVE_FIPS || HAVE_FIPS_VERSION > 2 */
printf(resultFmt, "passed");
#endif /* OPENSSL_ALL */
}

3
wolfcrypt/src/evp.c
View File

@ -1385,8 +1385,9 @@ int wolfSSL_EVP_PKEY_derive(WOLFSSL_EVP_PKEY_CTX *ctx, unsigned char *key, size_
if (*keylen < (size_t)len) {
return WOLFSSL_FAILURE;
}
/* computed DH agreement can be less than DH size if leading zeros */
if (wolfSSL_DH_compute_key(key, ctx->peerKey->dh->pub_key,
ctx->pkey->dh) != len) {
ctx->pkey->dh) <= 0) {
return WOLFSSL_FAILURE;
}
}