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

Merge pull request #5267 from douzzer/20220620-multi-test-fixes

Browse Source 
20220620-multi-test-fixes
This commit is contained in:
David Garske
2022-06-20 12:13:39 -07:00
committed by GitHub
parent db6c14e7f9 69ca1d37c0
commit 38ac96aefb
5 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tests/api.c
View File

@ -38614,8 +38614,8 @@ static void test_wolfSSL_PEM_write_bio_X509(void)
BIO_free(output); BIO_free(output);
X509_free(x509a); X509_free(x509a);
/* test CA and basicConstSet values are encoded when /* test CA and basicConstSet values are encoded when
* the cert is a CA */ * the cert is a CA */
AssertNotNull(input = BIO_new_file( AssertNotNull(input = BIO_new_file(
"certs/server-cert.pem", "rb")); "certs/server-cert.pem", "rb"));
@ -38631,14 +38631,14 @@ static void test_wolfSSL_PEM_write_bio_X509(void)
AssertNotNull(PEM_read_bio_X509(output, &x509b, NULL, NULL)); AssertNotNull(PEM_read_bio_X509(output, &x509b, NULL, NULL));
AssertIntEQ(x509b->isCa, 1); AssertIntEQ(x509b->isCa, 1);
AssertIntEQ(x509b->basicConstSet, 1); AssertIntEQ(x509b->basicConstSet, 1);
X509_free(x509a); X509_free(x509a);
X509_free(x509b); X509_free(x509b);
BIO_free(input); BIO_free(input);
BIO_free(output); BIO_free(output);
/* test CA and basicConstSet values are encoded when /* test CA and basicConstSet values are encoded when
* the cert is not CA */ * the cert is not CA */
AssertNotNull(input = BIO_new_file( AssertNotNull(input = BIO_new_file(
"certs/client-uri-cert.pem", "rb")); "certs/client-uri-cert.pem", "rb"));
@ -38654,7 +38654,7 @@ static void test_wolfSSL_PEM_write_bio_X509(void)
AssertNotNull(PEM_read_bio_X509(output, &x509b, NULL, NULL)); AssertNotNull(PEM_read_bio_X509(output, &x509b, NULL, NULL));
AssertIntEQ(x509b->isCa, 0); AssertIntEQ(x509b->isCa, 0);
AssertIntEQ(x509b->basicConstSet, 1); AssertIntEQ(x509b->basicConstSet, 1);
X509_free(x509a); X509_free(x509a);
X509_free(x509b); X509_free(x509b);
BIO_free(input); BIO_free(input);

6
testsuite/testsuite.c
View File

@ -315,7 +315,7 @@ static int test_tls(func_args* server_args)
} }
/* Show cipher suites available. */ /* Show cipher suites available. */
static void show_ciphers() static void show_ciphers(void)
{ {
char ciphers[WOLFSSL_CIPHER_LIST_MAX_SIZE]; char ciphers[WOLFSSL_CIPHER_LIST_MAX_SIZE];
XMEMSET(ciphers, 0, sizeof(ciphers)); XMEMSET(ciphers, 0, sizeof(ciphers));
@ -324,7 +324,7 @@ static void show_ciphers()
} }
/* Cleanup temporary output file. */ /* Cleanup temporary output file. */
static void cleanup_output() static void cleanup_output(void)
{ {
remove(outputName); remove(outputName);
} }
@ -334,7 +334,7 @@ static void cleanup_output()
* @return 0 on success. * @return 0 on success.
* @return 1 on failure. * @return 1 on failure.
*/ */
static int validate_cleanup_output() static int validate_cleanup_output(void)
{ {
#ifndef NO_SHA256 #ifndef NO_SHA256
byte input[WC_SHA256_DIGEST_SIZE]; byte input[WC_SHA256_DIGEST_SIZE];

2
wolfcrypt/src/cryptocb.c
View File

@ -1268,7 +1268,7 @@ int wc_CryptoCb_Cmac(Cmac* cmac, const byte* key, word32 keySz,
#endif #endif
/* returns the default dev id for the current build */ /* returns the default dev id for the current build */
int wc_CryptoCb_DefaultDevID() int wc_CryptoCb_DefaultDevID(void)
{ {
int ret; int ret;

4
wolfcrypt/src/ecc.c
View File

@ -13825,7 +13825,7 @@ static WC_INLINE void IncrementX963KdfCounter(byte* inOutCtr)
int wc_X963_KDF(enum wc_HashType type, const byte* secret, word32 secretSz, int wc_X963_KDF(enum wc_HashType type, const byte* secret, word32 secretSz,
const byte* sinfo, word32 sinfoSz, byte* out, word32 outSz) const byte* sinfo, word32 sinfoSz, byte* out, word32 outSz)
{ {
int ret, i; int ret;
int digestSz, copySz; int digestSz, copySz;
int remaining = outSz; int remaining = outSz;
byte* outIdx; byte* outIdx;
@ -13869,7 +13869,7 @@ int wc_X963_KDF(enum wc_HashType type, const byte* secret, word32 secretSz,
outIdx = out; outIdx = out;
XMEMSET(counter, 0, sizeof(counter)); XMEMSET(counter, 0, sizeof(counter));
for (i = 1; remaining > 0; i++) { while (remaining > 0) {
IncrementX963KdfCounter(counter); IncrementX963KdfCounter(counter);

4
wolfcrypt/src/evp.c
View File

@ -4497,7 +4497,7 @@ int wolfSSL_EVP_MD_type(const WOLFSSL_EVP_MD* type)
* @param none * @param none
* @return "blake2b512" * @return "blake2b512"
*/ */
const WOLFSSL_EVP_MD* wolfSSL_EVP_blake2b512() const WOLFSSL_EVP_MD* wolfSSL_EVP_blake2b512(void)
{ {
WOLFSSL_ENTER("EVP_blake2b512"); WOLFSSL_ENTER("EVP_blake2b512");
return EVP_get_digestbyname("BLAKE2b512"); return EVP_get_digestbyname("BLAKE2b512");
@ -4510,7 +4510,7 @@ int wolfSSL_EVP_MD_type(const WOLFSSL_EVP_MD* type)
* @param none * @param none
* @return "blake2s256" * @return "blake2s256"
*/ */
const WOLFSSL_EVP_MD* wolfSSL_EVP_blake2s256() const WOLFSSL_EVP_MD* wolfSSL_EVP_blake2s256(void)
{ {
WOLFSSL_ENTER("EVP_blake2s256"); WOLFSSL_ENTER("EVP_blake2s256");
return EVP_get_digestbyname("BLAKE2s256"); return EVP_get_digestbyname("BLAKE2s256");