feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

Merge pull request #743 from JacobBarthelmeh/master

Browse Source 
change pem_password_cb typedef for compatibility
This commit is contained in:
toddouska
2017-02-21 13:23:05 -08:00
committed by GitHub
parent ce94243a20 c02f35c128
commit e9c806a639
3 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/ssl.c
View File

@@ -10342,7 +10342,7 @@ int wolfSSL_set_compression(WOLFSSL* ssl)
}
void wolfSSL_CTX_set_default_passwd_cb(WOLFSSL_CTX* ctx, pem_password_cb cb)
void wolfSSL_CTX_set_default_passwd_cb(WOLFSSL_CTX* ctx,pem_password_cb* cb)
{
WOLFSSL_ENTER("SSL_CTX_set_default_passwd_cb");
if (ctx != NULL) {
@@ -12141,7 +12141,7 @@ int wolfSSL_EVP_MD_type(const WOLFSSL_EVP_MD *md)
return NULL;
}
return &(ctx->passwd_cb);
return ctx->passwd_cb;
}
@@ -20633,7 +20633,8 @@ void* wolfSSL_get_ex_data(const WOLFSSL* ssl, int idx)
}
#ifndef NO_DSA
WOLFSSL_DSA *wolfSSL_PEM_read_bio_DSAparams(WOLFSSL_BIO *bp, WOLFSSL_DSA **x, pem_password_cb *cb, void *u)
WOLFSSL_DSA *wolfSSL_PEM_read_bio_DSAparams(WOLFSSL_BIO *bp, WOLFSSL_DSA **x,
pem_password_cb *cb, void *u)
{
WOLFSSL_DSA* dsa;
DsaKey* key;
@@ -20762,7 +20763,8 @@ WOLFSSL_BIO *wolfSSL_BIO_new_file(const char *filename, const char *mode) {
}
WOLFSSL_DH *wolfSSL_PEM_read_bio_DHparams(WOLFSSL_BIO *bp, WOLFSSL_DH **x, pem_password_cb *cb, void *u)
WOLFSSL_DH *wolfSSL_PEM_read_bio_DHparams(WOLFSSL_BIO *bp, WOLFSSL_DH **x,
pem_password_cb *cb, void *u)
{
(void) bp;
(void) x;