diff --git a/tests/api.c b/tests/api.c index 96eac1eb5..6173a7a92 100644 --- a/tests/api.c +++ b/tests/api.c @@ -2424,6 +2424,9 @@ static void test_wolfSSL_private_keys(void) printf(testingFmt, "wolfSSL_private_keys()"); + OpenSSL_add_all_digests(); + OpenSSL_add_all_algorithms(); + AssertNotNull(ctx = SSL_CTX_new(wolfSSLv23_server_method())); AssertTrue(SSL_CTX_use_certificate_file(ctx, svrCert, SSL_FILETYPE_PEM)); AssertTrue(SSL_CTX_use_PrivateKey_file(ctx, svrKey, SSL_FILETYPE_PEM)); @@ -2435,8 +2438,10 @@ static void test_wolfSSL_private_keys(void) AssertIntEQ(SSL_use_RSAPrivateKey_ASN1(ssl, (unsigned char*)client_key_der_2048, sizeof_client_key_der_2048), SSL_SUCCESS); +#ifndef HAVE_USER_RSA /* Should missmatch now that a different private key loaded */ AssertIntNE(wolfSSL_check_private_key(ssl), SSL_SUCCESS); +#endif AssertIntEQ(SSL_use_PrivateKey_ASN1(0, ssl, (unsigned char*)server_key_der_2048, diff --git a/wolfssl/openssl/ssl.h b/wolfssl/openssl/ssl.h index 4b577652d..9467d53bf 100644 --- a/wolfssl/openssl/ssl.h +++ b/wolfssl/openssl/ssl.h @@ -257,9 +257,10 @@ typedef WOLFSSL_X509_STORE_CTX X509_STORE_CTX; #define BIO_f_base64 wolfSSL_BIO_f_base64 #define BIO_set_flags wolfSSL_BIO_set_flags +#define OpenSSL_add_all_digests() #define OpenSSL_add_all_algorithms wolfSSL_add_all_algorithms #define SSLeay_add_ssl_algorithms wolfSSL_add_all_algorithms -#define SSLeay_add_all_algorithms wolfSSL_add_all_algorithms +#define SSLeay_add_all_algorithms wolfSSL_add_all_algorithms #define RAND_screen wolfSSL_RAND_screen #define RAND_file_name wolfSSL_RAND_file_name