diff --git a/src/ssl.c b/src/ssl.c index 592c8f8ef..dc9bb37f8 100644 --- a/src/ssl.c +++ b/src/ssl.c @@ -1971,16 +1971,6 @@ WOLFSSL_API int wolfSSL_UseTrustedCA(WOLFSSL* ssl, byte type, return TLSX_UseTrustedCA(&ssl->extensions, type, cert, certSz, ssl->heap); } - -WOLFSSL_API int wolfSSL_CTX_UseTrustedCA(WOLFSSL_CTX* ctx, byte type, - const byte* cert, word32 certSz) -{ - if (ctx == NULL) - return BAD_FUNC_ARG; - - return TLSX_UseTrustedCA(&ctx->extensions, type, cert, certSz, ctx->heap); -} - #endif /* HAVE_TRUSTED_CA */ diff --git a/tests/api.c b/tests/api.c index 384931256..da5767174 100644 --- a/tests/api.c +++ b/tests/api.c @@ -3037,36 +3037,21 @@ static void test_wolfSSL_UseTrustedCA(void) XMEMSET(id, 0, sizeof(id)); /* error cases */ - AssertIntNE(WOLFSSL_SUCCESS, wolfSSL_CTX_UseTrustedCA(NULL, 0, NULL, 0)); AssertIntNE(WOLFSSL_SUCCESS, wolfSSL_UseTrustedCA(NULL, 0, NULL, 0)); - AssertIntNE(WOLFSSL_SUCCESS, wolfSSL_CTX_UseTrustedCA(ctx, - WOLFSSL_TRUSTED_CA_CERT_SHA1+1, NULL, 0)); AssertIntNE(WOLFSSL_SUCCESS, wolfSSL_UseTrustedCA(ssl, WOLFSSL_TRUSTED_CA_CERT_SHA1+1, NULL, 0)); - AssertIntNE(WOLFSSL_SUCCESS, wolfSSL_CTX_UseTrustedCA(ctx, - WOLFSSL_TRUSTED_CA_CERT_SHA1, NULL, 0)); AssertIntNE(WOLFSSL_SUCCESS, wolfSSL_UseTrustedCA(ssl, WOLFSSL_TRUSTED_CA_CERT_SHA1, NULL, 0)); - AssertIntNE(WOLFSSL_SUCCESS, wolfSSL_CTX_UseTrustedCA(ctx, - WOLFSSL_TRUSTED_CA_CERT_SHA1, id, 5)); AssertIntNE(WOLFSSL_SUCCESS, wolfSSL_UseTrustedCA(ssl, WOLFSSL_TRUSTED_CA_CERT_SHA1, id, 5)); - AssertIntNE(WOLFSSL_SUCCESS, wolfSSL_CTX_UseTrustedCA(ctx, - WOLFSSL_TRUSTED_CA_X509_NAME, id, 0)); AssertIntNE(WOLFSSL_SUCCESS, wolfSSL_UseTrustedCA(ssl, WOLFSSL_TRUSTED_CA_X509_NAME, id, 0)); /* success cases */ - AssertIntEQ(WOLFSSL_SUCCESS, wolfSSL_CTX_UseTrustedCA(ctx, - WOLFSSL_TRUSTED_CA_PRE_AGREED, NULL, 0)); AssertIntEQ(WOLFSSL_SUCCESS, wolfSSL_UseTrustedCA(ssl, WOLFSSL_TRUSTED_CA_PRE_AGREED, NULL, 0)); - AssertIntEQ(WOLFSSL_SUCCESS, wolfSSL_CTX_UseTrustedCA(ctx, - WOLFSSL_TRUSTED_CA_KEY_SHA1, id, sizeof(id))); AssertIntEQ(WOLFSSL_SUCCESS, wolfSSL_UseTrustedCA(ssl, WOLFSSL_TRUSTED_CA_KEY_SHA1, id, sizeof(id))); - AssertIntEQ(WOLFSSL_SUCCESS, wolfSSL_CTX_UseTrustedCA(ctx, - WOLFSSL_TRUSTED_CA_X509_NAME, id, 5)); AssertIntEQ(WOLFSSL_SUCCESS, wolfSSL_UseTrustedCA(ssl, WOLFSSL_TRUSTED_CA_X509_NAME, id, 5)); diff --git a/wolfssl/ssl.h b/wolfssl/ssl.h index 948263956..16baa6394 100644 --- a/wolfssl/ssl.h +++ b/wolfssl/ssl.h @@ -2261,8 +2261,6 @@ enum { WOLFSSL_API int wolfSSL_UseTrustedCA(WOLFSSL* ssl, unsigned char type, const unsigned char* cert, unsigned int certSz); -WOLFSSL_API int wolfSSL_CTX_UseTrustedCA(WOLFSSL_CTX* ctx, unsigned char type, - const unsigned char* cert, unsigned int certSz); #endif /* HAVE_TRUSTED_CA */ /* Application-Layer Protocol Negotiation */