diff --git a/examples/client/client.c b/examples/client/client.c index 2b638ec3b..0c5e06bea 100644 --- a/examples/client/client.c +++ b/examples/client/client.c @@ -1046,7 +1046,7 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args) #if (defined(HAVE_ECC) && !defined(ALT_ECC_SIZE)) \ || defined(SESSION_CERTS) /* big enough to handle most cases including session certs */ - byte memory[370000]; + byte memory[320000]; #else byte memory[80000]; #endif diff --git a/src/ssl.c b/src/ssl.c index d92277e2a..8ecce4258 100644 --- a/src/ssl.c +++ b/src/ssl.c @@ -11168,7 +11168,7 @@ int wolfSSL_set_compression(WOLFSSL* ssl) int wolfSSL_OpenSSL_add_all_algorithms_noconf(void) { - WOLFSSL_ENTER("wolfSSL_OPENSSL_add_all_algorithms_noconf"); + WOLFSSL_ENTER("wolfSSL_OpenSSL_add_all_algorithms_noconf"); if (wolfSSL_add_all_algorithms() == WOLFSSL_FATAL_ERROR) return WOLFSSL_FATAL_ERROR; diff --git a/tests/api.c b/tests/api.c index 241275041..157e57cd1 100644 --- a/tests/api.c +++ b/tests/api.c @@ -18726,7 +18726,7 @@ static void test_wolfSSL_BIO_gets(void) XMEMCPY(msg, "\nhello wolfSSL\n security plus\t---...**adf\na...b.c", sizeof(msg)); AssertNotNull(bio = BIO_new(BIO_s_bio())); - AssertIntEQ(BIO_gets(bio, buffer, 2), 0); /* nothing to read */ + AssertIntEQ(BIO_gets(bio, bio_buffer, 2), 0); /* nothing to read */ AssertNotNull(bio2 = BIO_new(BIO_s_bio())); AssertIntEQ(BIO_set_write_buf_size(bio, 10), SSL_SUCCESS); @@ -18748,8 +18748,8 @@ static void test_wolfSSL_BIO_gets(void) /* check reading an empty string */ AssertNotNull(bio = BIO_new(BIO_s_bio())); AssertIntEQ(BIO_set_write_buf_size(bio, sizeof(emp)), SSL_SUCCESS); - AssertIntEQ(BIO_gets(bio, buffer, bufferSz), 0); /* Nothing to read */ - AssertStrEQ(emp, buffer); + AssertIntEQ(BIO_gets(bio, bio_buffer, bufferSz), 0); /* Nothing to read */ + AssertStrEQ(emp, bio_buffer); BIO_free(bio); diff --git a/wolfcrypt/test/test.c b/wolfcrypt/test/test.c index ad0307961..cd45670c7 100644 --- a/wolfcrypt/test/test.c +++ b/wolfcrypt/test/test.c @@ -409,7 +409,7 @@ static void myFipsCb(int ok, int err, const char* hash) #elif defined(WOLFSSL_CERT_EXT) static byte gTestMemory[140000]; #elif defined(USE_FAST_MATH) && !defined(ALT_ECC_SIZE) - static byte gTestMemory[130000]; + static byte gTestMemory[150000]; #else static byte gTestMemory[80000]; #endif diff --git a/wolfssl/openssl/evp.h b/wolfssl/openssl/evp.h index 7024ad571..a8c60bc46 100644 --- a/wolfssl/openssl/evp.h +++ b/wolfssl/openssl/evp.h @@ -414,10 +414,7 @@ WOLFSSL_API int wolfSSL_EVP_add_digest(const WOLFSSL_EVP_MD *digest); WOLFSSL_API int wolfSSL_EVP_add_cipher(const WOLFSSL_EVP_CIPHER *cipher); WOLFSSL_API void wolfSSL_EVP_cleanup(void); WOLFSSL_API int wolfSSL_add_all_algorithms(void); - -#ifdef OPENSSL_EXTRA -WOLFSSL_API int wolfSSL_OPENSSL_add_all_algorithms_noconf(void); -#endif +WOLFSSL_API int wolfSSL_OpenSSL_add_all_algorithms_noconf(void); WOLFSSL_API int wolfSSL_PKCS5_PBKDF2_HMAC_SHA1(const char * pass, int passlen, const unsigned char * salt, @@ -588,7 +585,7 @@ typedef WOLFSSL_EVP_CIPHER_CTX EVP_CIPHER_CTX; #define OpenSSL_add_all_digests() wolfCrypt_Init() #define OpenSSL_add_all_ciphers() wolfCrypt_Init() #define OpenSSL_add_all_algorithms wolfSSL_add_all_algorithms -#define OPENSSL_add_all_algorithms_noconf wolfSSL_OPENSSL_add_all_algorithms_noconf +#define OpenSSL_add_all_algorithms_noconf wolfSSL_OpenSSL_add_all_algorithms_noconf #define PKCS5_PBKDF2_HMAC_SHA1 wolfSSL_PKCS5_PBKDF2_HMAC_SHA1 diff --git a/wolfssl/openssl/ssl.h b/wolfssl/openssl/ssl.h index 8508be543..3242513ec 100644 --- a/wolfssl/openssl/ssl.h +++ b/wolfssl/openssl/ssl.h @@ -954,7 +954,6 @@ typedef WOLFSSL_ASN1_BIT_STRING ASN1_BIT_STRING; #define SSL_CTX_add_client_CA wolfSSL_CTX_add_client_CA #define SSL_CTX_set_srp_password wolfSSL_CTX_set_srp_password #define SSL_CTX_set_srp_username wolfSSL_CTX_set_srp_username -#define OpenSSL_add_all_algorithms_noconf wolfSSL_OpenSSL_add_all_alogrithms_noconf #define i2c_ASN1_INTEGER wolfSSL_i2c_ASN1_INTEGER #define X509_NAME_ENTRY_get_object wolfSSL_X509_NAME_ENTRY_get_object #define SSL_get_SSL_CTX wolfSSL_get_SSL_CTX diff --git a/wolfssl/ssl.h b/wolfssl/ssl.h index 800ee63e1..c05d85314 100644 --- a/wolfssl/ssl.h +++ b/wolfssl/ssl.h @@ -826,11 +826,6 @@ WOLFSSL_API WOLFSSL_BIO* wolfSSL_BIO_new_mem_buf(void* buf, int len); WOLFSSL_API long wolfSSL_BIO_set_ssl(WOLFSSL_BIO*, WOLFSSL*, int flag); WOLFSSL_API long wolfSSL_BIO_set_fd(WOLFSSL_BIO* b, int fd, int flag); WOLFSSL_API void wolfSSL_set_bio(WOLFSSL*, WOLFSSL_BIO* rd, WOLFSSL_BIO* wr); -WOLFSSL_API int wolfSSL_add_all_algorithms(void); - -#ifdef OPENSSL_EXTRA -WOLFSSL_API int wolfSSL_OpenSSL_add_all_algorithms_noconf(void); -#endif #ifndef NO_FILESYSTEM WOLFSSL_API WOLFSSL_BIO_METHOD *wolfSSL_BIO_s_file(void);