WolfSSL
/
wolfssl
mirror of https://github.com/wolfSSL/wolfssl.git
1
0
Fork 0
Code Issues Releases Wiki Activity

macro and tests for get_passwd_cb functions

pull/618/head
Jacob Barthelmeh 2016-12-12 10:39:15 -07:00
parent 4f317a9a1d
commit f60cb08c29
4 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/ssl.c
View File

@ -12102,14 +12102,14 @@ int wolfSSL_EVP_MD_type(const WOLFSSL_EVP_MD *md)
return 0; return 0;
} }
WOLFSSL_API pem_password_cb wolfSSL_CTX_get_default_passwd_cb( WOLFSSL_API pem_password_cb* wolfSSL_CTX_get_default_passwd_cb(
WOLFSSL_CTX *ctx) WOLFSSL_CTX *ctx)
{ {
if (ctx == NULL) { if (ctx == NULL || ctx->passwd_cb == NULL) {
return NULL; return NULL;
} }
return ctx->passwd_cb; return &(ctx->passwd_cb);
} }

3
tests/api.c
View File

@ -2623,6 +2623,9 @@ static void test_wolfSSL_CTX_add_extra_chain_cert(void)
AssertNotNull(x509); AssertNotNull(x509);
AssertIntEQ((int)SSL_CTX_add_extra_chain_cert(ctx, x509), SSL_SUCCESS); AssertIntEQ((int)SSL_CTX_add_extra_chain_cert(ctx, x509), SSL_SUCCESS);
AssertNull(SSL_CTX_get_default_passwd_cb(ctx));
AssertNull(SSL_CTX_get_default_passwd_cb_userdata(ctx));
SSL_CTX_free(ctx); SSL_CTX_free(ctx);
printf(resultFmt, passed); printf(resultFmt, passed);
#endif /* defined(OPENSSL_EXTRA) && !defined(NO_CERTS) && \ #endif /* defined(OPENSSL_EXTRA) && !defined(NO_CERTS) && \

4
wolfssl/openssl/ssl.h
View File

@ -652,8 +652,6 @@ typedef WOLFSSL_ASN1_BIT_STRING ASN1_BIT_STRING;
#define SSL_CTX_get_verify_callback wolfSSL_CTX_get_verify_callback #define SSL_CTX_get_verify_callback wolfSSL_CTX_get_verify_callback
#define SSL_CTX_set_tlsext_servername_callback wolfSSL_CTX_set_servername_callback #define SSL_CTX_set_tlsext_servername_callback wolfSSL_CTX_set_servername_callback
#define SSL_CTX_set_tlsext_servername_arg wolfSSL_CTX_set_servername_arg #define SSL_CTX_set_tlsext_servername_arg wolfSSL_CTX_set_servername_arg
#define SSL_CTX_get_default_passwd_cb wolfSSL_SSL_CTX_get_default_passwd_cb
#define SSL_CTX_get_default_passwd_cb_userdata wolfSSL_SSL_CTX_get_default_passwd_cb_userdata
#define PSK_MAX_PSK_LEN 256 #define PSK_MAX_PSK_LEN 256
#define PSK_MAX_IDENTITY_LEN 128 #define PSK_MAX_IDENTITY_LEN 128
@ -662,6 +660,8 @@ typedef WOLFSSL_ASN1_BIT_STRING ASN1_BIT_STRING;
#endif /* HAVE_STUNNEL */ #endif /* HAVE_STUNNEL */
#define SSL_CTX_get_default_passwd_cb wolfSSL_CTX_get_default_passwd_cb
#define SSL_CTX_get_default_passwd_cb_userdata wolfSSL_CTX_get_default_passwd_cb_userdata
/* certificate extension NIDs */ /* certificate extension NIDs */
#define NID_basic_constraints 133 #define NID_basic_constraints 133

2
wolfssl/ssl.h
View File

@ -1963,7 +1963,7 @@ WOLFSSL_API size_t wolfSSL_get_server_random(const WOLFSSL *ssl,
unsigned char *out, size_t outlen); unsigned char *out, size_t outlen);
WOLFSSL_API size_t wolfSSL_get_client_random(const WOLFSSL* ssl, WOLFSSL_API size_t wolfSSL_get_client_random(const WOLFSSL* ssl,
unsigned char* out, size_t outSz); unsigned char* out, size_t outSz);
WOLFSSL_API pem_password_cb wolfSSL_CTX_get_default_passwd_cb(WOLFSSL_CTX *ctx); WOLFSSL_API pem_password_cb* wolfSSL_CTX_get_default_passwd_cb(WOLFSSL_CTX *ctx);
WOLFSSL_API void *wolfSSL_CTX_get_default_passwd_cb_userdata(WOLFSSL_CTX *ctx); WOLFSSL_API void *wolfSSL_CTX_get_default_passwd_cb_userdata(WOLFSSL_CTX *ctx);
WOLFSSL_API int wolfSSL_CTX_use_PrivateKey(WOLFSSL_CTX *ctx, WOLFSSL_EVP_PKEY *pkey); WOLFSSL_API int wolfSSL_CTX_use_PrivateKey(WOLFSSL_CTX *ctx, WOLFSSL_EVP_PKEY *pkey);
WOLFSSL_API WOLFSSL_X509 *wolfSSL_PEM_read_bio_X509(WOLFSSL_BIO *bp, WOLFSSL_X509 **x, pem_password_cb *cb, void *u); WOLFSSL_API WOLFSSL_X509 *wolfSSL_PEM_read_bio_X509(WOLFSSL_BIO *bp, WOLFSSL_X509 **x, pem_password_cb *cb, void *u);