mirrors/wolfssl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

change pem_password_cb typedef for compatibility

Browse Source
This commit is contained in:
Jacob Barthelmeh 2017-02-08 11:48:50 -07:00
parent 868e704b82
commit c02f35c128
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/ssl.c
View File

@ -10329,7 +10329,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) {
@ -12128,7 +12128,7 @@ int wolfSSL_EVP_MD_type(const WOLFSSL_EVP_MD *md)
return NULL;
}
return &(ctx->passwd_cb);
return ctx->passwd_cb;
}
@ -20612,7 +20612,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;
@ -20741,7 +20742,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;

2
wolfssl/internal.h
View File

@ -2009,7 +2009,7 @@ struct WOLFSSL_CTX {
byte haveAnon; /* User wants to allow Anon suites */
#endif /* HAVE_ANON */
#if defined(OPENSSL_EXTRA) || defined(HAVE_WEBSERVER)
pem_password_cb passwd_cb;
pem_password_cb* passwd_cb;
void* userdata;
WOLFSSL_X509_STORE x509_store; /* points to ctx->cm */
byte readAhead;

5
wolfssl/ssl.h
View File

@ -386,7 +386,7 @@ WOLFSSL_API
#endif /* SESSION_INDEX && SESSION_CERTS */
typedef int (*VerifyCallback)(int, WOLFSSL_X509_STORE_CTX*);
typedef int (*pem_password_cb)(char*, int, int, void*);
typedef int (pem_password_cb)(char*, int, int, void*);
WOLFSSL_API void wolfSSL_CTX_set_verify(WOLFSSL_CTX*, int,
VerifyCallback verify_callback);
@ -670,7 +670,8 @@ WOLFSSL_API void* wolfSSL_get_ex_data(const WOLFSSL*, int);
WOLFSSL_API void wolfSSL_CTX_set_default_passwd_cb_userdata(WOLFSSL_CTX*,
void* userdata);
WOLFSSL_API void wolfSSL_CTX_set_default_passwd_cb(WOLFSSL_CTX*, pem_password_cb);
WOLFSSL_API void wolfSSL_CTX_set_default_passwd_cb(WOLFSSL_CTX*,
pem_password_cb*);
WOLFSSL_API void wolfSSL_CTX_set_info_callback(WOLFSSL_CTX*,