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

Merge pull request #5611 from tim-weller-wolfssl/zd14815-updates

Browse Source 
Updates to remove build warnings and test/example code update to avoid memory leak
This commit is contained in:
John Safranek
2022-09-21 14:33:37 -07:00
committed by GitHub
parent 913bbc8f79 62766b0758
commit 216d4afaad
5 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/internal.c
View File

@@ -5004,7 +5004,9 @@ int EccVerify(WOLFSSL* ssl, const byte* in, word32 inSz, const byte* out,
#endif /* WOLFSSL_ASYNC_CRYPT */ #endif /* WOLFSSL_ASYNC_CRYPT */
{ {
if (ret != 0 || ssl->eccVerifyRes == 0) { if (ret != 0 || ssl->eccVerifyRes == 0) {
ret = VERIFY_SIGN_ERROR; if (ret == 0) {
ret = VERIFY_SIGN_ERROR;
}
WOLFSSL_ERROR_VERBOSE(ret); WOLFSSL_ERROR_VERBOSE(ret);
} }
else { else {

12
src/pk.c
View File

@@ -1377,7 +1377,7 @@ int wolfSSL_PEM_write_bio_RSAPrivateKey(WOLFSSL_BIO* bio, WOLFSSL_RSA* rsa,
int ret = 1; int ret = 1;
WOLFSSL_EVP_PKEY* pkey = NULL; WOLFSSL_EVP_PKEY* pkey = NULL;
#if defined(WOLFSSL_KEY_GEN) && !defined(HAVE_USER_RSA) #if defined(WOLFSSL_KEY_GEN) && !defined(HAVE_USER_RSA)
int derSz; int derSz = 0;
byte* derBuf = NULL; byte* derBuf = NULL;
#endif /* WOLFSSL_KEY_GEN && !HAVE_USER_RSA */ #endif /* WOLFSSL_KEY_GEN && !HAVE_USER_RSA */
@@ -1641,7 +1641,7 @@ int wolfSSL_PEM_write_mem_RSAPrivateKey(RSA* rsa, const EVP_CIPHER* cipher,
byte* tmp = NULL; byte* tmp = NULL;
byte* cipherInfo = NULL; byte* cipherInfo = NULL;
int derSz = 0; int derSz = 0;
int pemSz; int pemSz = 0;
const int type = PRIVATEKEY_TYPE; const int type = PRIVATEKEY_TYPE;
const char* header = NULL; const char* header = NULL;
const char* footer = NULL; const char* footer = NULL;
@@ -3491,7 +3491,7 @@ int wolfSSL_RSA_sign_generic_padding(int hashAlg, const unsigned char* hash,
{ {
int ret = 1; int ret = 1;
word32 outLen = 0; word32 outLen = 0;
int signSz; int signSz = 0;
WC_RNG* rng = NULL; WC_RNG* rng = NULL;
int initTmpRng = 0; int initTmpRng = 0;
#ifdef WOLFSSL_SMALL_STACK #ifdef WOLFSSL_SMALL_STACK
@@ -3502,7 +3502,7 @@ int wolfSSL_RSA_sign_generic_padding(int hashAlg, const unsigned char* hash,
WC_RNG* tmpRng = _tmpRng; WC_RNG* tmpRng = _tmpRng;
byte encodedSig[MAX_ENCODED_SIG_SZ]; byte encodedSig[MAX_ENCODED_SIG_SZ];
#endif #endif
unsigned int encSz; unsigned int encSz = 0;
WOLFSSL_ENTER("wolfSSL_RSA_sign_generic_padding"); WOLFSSL_ENTER("wolfSSL_RSA_sign_generic_padding");
@@ -3689,7 +3689,7 @@ int wolfSSL_RSA_verify_ex(int hashAlg, const unsigned char* hash,
#endif #endif
unsigned char* sigDec = NULL; unsigned char* sigDec = NULL;
unsigned int len = MAX_ENCODED_SIG_SZ; unsigned int len = MAX_ENCODED_SIG_SZ;
int verLen; int verLen = 0;
#if (!defined(HAVE_FIPS) || FIPS_VERSION_GE(5, 1)) && !defined(HAVE_SELFTEST) #if (!defined(HAVE_FIPS) || FIPS_VERSION_GE(5, 1)) && !defined(HAVE_SELFTEST)
enum wc_HashType hType = WC_HASH_TYPE_NONE; enum wc_HashType hType = WC_HASH_TYPE_NONE;
#endif #endif
@@ -3811,7 +3811,7 @@ int wolfSSL_RSA_public_encrypt(int len, const unsigned char* from,
#if !defined(HAVE_FIPS) #if !defined(HAVE_FIPS)
int mgf = WC_MGF1NONE; int mgf = WC_MGF1NONE;
enum wc_HashType hash = WC_HASH_TYPE_NONE; enum wc_HashType hash = WC_HASH_TYPE_NONE;
int pad_type; int pad_type = WC_RSA_NO_PAD;
#endif #endif
int outLen = 0; int outLen = 0;

6
wolfcrypt/src/port/st/stsafe.c
View File

@@ -123,7 +123,7 @@ int SSL_STSAFE_VerifyPeerCertCb(WOLFSSL* ssl,
word32 pubKeyY_len = sizeof(pubKeyY); word32 pubKeyY_len = sizeof(pubKeyY);
ecc_key key; ecc_key key;
word32 inOutIdx = 0; word32 inOutIdx = 0;
StSafeA_CurveId curve_id; StSafeA_CurveId curve_id = STSAFE_A_NIST_P_256;
int ecc_curve; int ecc_curve;
(void)ssl; (void)ssl;
@@ -170,7 +170,7 @@ int SSL_STSAFE_VerifyPeerCertCb(WOLFSSL* ssl,
#ifdef USE_STSAFE_VERBOSE #ifdef USE_STSAFE_VERBOSE
STSAFE_INTERFACE_PRINTF("stsafe_interface_verify error: %d\n", err); STSAFE_INTERFACE_PRINTF("stsafe_interface_verify error: %d\n", err);
#endif #endif
err = WC_HW_E; err = -err;
} }
} }
@@ -507,7 +507,7 @@ int wolfSSL_STSAFE_CryptoDevCb(int devId, wc_CryptoInfo* info, void* ctx)
#ifdef USE_STSAFE_VERBOSE #ifdef USE_STSAFE_VERBOSE
STSAFE_INTERFACE_PRINTF("stsafe_interface_verify error: %d\n", rc); STSAFE_INTERFACE_PRINTF("stsafe_interface_verify error: %d\n", rc);
#endif #endif
rc = WC_HW_E; rc = -rc;
} }
} }
} }

11
wolfcrypt/src/tfm.c
View File

@@ -3884,14 +3884,12 @@ void fp_set(fp_int *a, fp_digit b)
#endif #endif
int fp_set_int(fp_int *a, unsigned long b) int fp_set_int(fp_int *a, unsigned long b)
{ {
int x;
/* use direct fp_set if b is less than fp_digit max /* use direct fp_set if b is less than fp_digit max
* If input max value of b down shift by 1 less than full range * If input max value of b down shift by 1 less than full range
* fp_digit, then condition is always true. */ * fp_digit, then condition is always true. */
#if ((ULONG_MAX >> (DIGIT_BIT-1)) > 0) #if ((ULONG_MAX >> (DIGIT_BIT-1)) > 0)
int x;
if (b < FP_DIGIT_MAX) if (b < FP_DIGIT_MAX)
#endif
{ {
fp_set (a, (fp_digit)b); fp_set (a, (fp_digit)b);
return FP_OKAY; return FP_OKAY;
@@ -3918,8 +3916,11 @@ int fp_set_int(fp_int *a, unsigned long b)
/* clamp digits */ /* clamp digits */
fp_clamp(a); fp_clamp(a);
#else
return FP_OKAY; fp_set (a, (fp_digit)b);
#endif
return FP_OKAY;
} }
/* check if a bit is set */ /* check if a bit is set */

2
wolfssl/test.h
View File

@@ -2813,7 +2813,7 @@ static WC_INLINE int myVerify(int preverify, WOLFSSL_X509_STORE_CTX* store)
wolfSSL_BIO_free(bio); wolfSSL_BIO_free(bio);
} }
} }
wolfSSL_sk_X509_free(sk); wolfSSL_sk_X509_pop_free(sk, NULL);
} }
#endif #endif
} }