From ccc72d72c2194c6ea26068edfc01ec01351dede6 Mon Sep 17 00:00:00 2001 From: Jacob Barthelmeh Date: Fri, 9 Dec 2016 18:07:31 -0700 Subject: [PATCH] change argument to pointer. In most cases NULL is used for this argument, as was the case in previous ports --- src/ssl.c | 10 +++++----- wolfssl/openssl/pem.h | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/ssl.c b/src/ssl.c index 6b05c120c..9ce4b7c3c 100644 --- a/src/ssl.c +++ b/src/ssl.c @@ -17861,7 +17861,7 @@ static int EncryptDerKey(byte *der, int *derSz, const EVP_CIPHER* cipher, int wolfSSL_PEM_write_bio_PrivateKey(WOLFSSL_BIO* bio, WOLFSSL_EVP_PKEY* key, const WOLFSSL_EVP_CIPHER* cipher, unsigned char* passwd, int len, - pem_password_cb cb, void* arg) + pem_password_cb* cb, void* arg) { byte* keyDer; int pemSz; @@ -18075,7 +18075,7 @@ int wolfSSL_PEM_write_RSAPrivateKey(FILE *fp, WOLFSSL_RSA *rsa, int wolfSSL_PEM_write_bio_RSAPrivateKey(WOLFSSL_BIO* bio, RSA* rsa, const EVP_CIPHER* cipher, unsigned char* passwd, int len, - pem_password_cb cb, void* arg) + pem_password_cb* cb, void* arg) { (void)bio; (void)rsa; @@ -19318,7 +19318,7 @@ int wolfSSL_PEM_write_EC_PUBKEY(FILE *fp, WOLFSSL_EC_KEY *x) int wolfSSL_PEM_write_bio_ECPrivateKey(WOLFSSL_BIO* bio, WOLFSSL_EC_KEY* ecc, const EVP_CIPHER* cipher, unsigned char* passwd, int len, - pem_password_cb cb, void* arg) + pem_password_cb* cb, void* arg) { (void)bio; (void)ecc; @@ -19493,7 +19493,7 @@ int wolfSSL_PEM_write_ECPrivateKey(FILE *fp, WOLFSSL_EC_KEY *ecc, int wolfSSL_PEM_write_bio_DSAPrivateKey(WOLFSSL_BIO* bio, WOLFSSL_DSA* dsa, const EVP_CIPHER* cipher, unsigned char* passwd, int len, - pem_password_cb cb, void* arg) + pem_password_cb* cb, void* arg) { (void)bio; (void)dsa; @@ -19673,7 +19673,7 @@ int wolfSSL_PEM_write_DSA_PUBKEY(FILE *fp, WOLFSSL_DSA *x) #endif /* #ifndef NO_DSA */ WOLFSSL_EVP_PKEY* wolfSSL_PEM_read_bio_PrivateKey(WOLFSSL_BIO* bio, - WOLFSSL_EVP_PKEY** key, pem_password_cb cb, void* arg) + WOLFSSL_EVP_PKEY** key, pem_password_cb* cb, void* arg) { (void)bio; (void)key; diff --git a/wolfssl/openssl/pem.h b/wolfssl/openssl/pem.h index 9f0ec25bb..60624aa5c 100644 --- a/wolfssl/openssl/pem.h +++ b/wolfssl/openssl/pem.h @@ -20,7 +20,7 @@ WOLFSSL_API int wolfSSL_PEM_write_bio_RSAPrivateKey(WOLFSSL_BIO* bio, WOLFSSL_RSA* rsa, const EVP_CIPHER* cipher, unsigned char* passwd, int len, - pem_password_cb cb, void* arg); + pem_password_cb* cb, void* arg); WOLFSSL_API int wolfSSL_PEM_write_mem_RSAPrivateKey(RSA* rsa, const EVP_CIPHER* cipher, unsigned char* passwd, int len, @@ -47,7 +47,7 @@ int wolfSSL_PEM_write_bio_DSAPrivateKey(WOLFSSL_BIO* bio, WOLFSSL_DSA* dsa, const EVP_CIPHER* cipher, unsigned char* passwd, int len, - pem_password_cb cb, void* arg); + pem_password_cb* cb, void* arg); WOLFSSL_API int wolfSSL_PEM_write_mem_DSAPrivateKey(WOLFSSL_DSA* dsa, const EVP_CIPHER* cipher, @@ -68,7 +68,7 @@ WOLFSSL_API int wolfSSL_PEM_write_bio_ECPrivateKey(WOLFSSL_BIO* bio, WOLFSSL_EC_KEY* ec, const EVP_CIPHER* cipher, unsigned char* passwd, int len, - pem_password_cb cb, void* arg); + pem_password_cb* cb, void* arg); WOLFSSL_API int wolfSSL_PEM_write_mem_ECPrivateKey(WOLFSSL_EC_KEY* key, const EVP_CIPHER* cipher, @@ -88,13 +88,13 @@ int wolfSSL_PEM_write_EC_PUBKEY(FILE *fp, WOLFSSL_EC_KEY *key); WOLFSSL_API WOLFSSL_EVP_PKEY* wolfSSL_PEM_read_bio_PrivateKey(WOLFSSL_BIO* bio, WOLFSSL_EVP_PKEY**, - pem_password_cb cb, + pem_password_cb* cb, void* arg); WOLFSSL_API int wolfSSL_PEM_write_bio_PrivateKey(WOLFSSL_BIO* bio, WOLFSSL_EVP_PKEY* key, const WOLFSSL_EVP_CIPHER* cipher, unsigned char* passwd, int len, - pem_password_cb cb, void* arg); + pem_password_cb* cb, void* arg); WOLFSSL_API int wolfSSL_EVP_PKEY_type(int type);