From 7bd7de350c77dabd2a9b56685c495bf8e400c670 Mon Sep 17 00:00:00 2001 From: Maxime Vincent Date: Mon, 24 Apr 2017 10:41:39 +0200 Subject: [PATCH] More fixes for haproxy port --- src/ssl.c | 2 +- wolfssl/openssl/ssl.h | 3 ++- wolfssl/ssl.h | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/ssl.c b/src/ssl.c index bd30a2947..3c265f0e2 100755 --- a/src/ssl.c +++ b/src/ssl.c @@ -15783,7 +15783,7 @@ WOLFSSL_API int X509_PUBKEY_get0_param(WOLFSSL_ASN1_OBJECT **ppkalg, const unsig } /*** TBD ***/ -WOLFSSL_API struct evp_pkey_st *SSL_get_privatekey(const WOLFSSL *ssl) +WOLFSSL_API WOLFSSL_EVP_PKEY *wolfSSL_get_privatekey(const WOLFSSL *ssl) { (void)ssl; WOLFSSL_STUB("SSL_get_privatekey"); diff --git a/wolfssl/openssl/ssl.h b/wolfssl/openssl/ssl.h index 1740acacc..e58dc6c89 100644 --- a/wolfssl/openssl/ssl.h +++ b/wolfssl/openssl/ssl.h @@ -118,6 +118,7 @@ typedef WOLFSSL_X509_STORE_CTX X509_STORE_CTX; #define SSL_use_PrivateKey wolfSSL_use_PrivateKey #define SSL_use_PrivateKey_ASN1 wolfSSL_use_PrivateKey_ASN1 #define SSL_use_RSAPrivateKey_ASN1 wolfSSL_use_RSAPrivateKey_ASN1 +#define SSL_get_privatekey wolfSSL_get_privatekey #define SSLv23_method wolfSSLv23_method #define SSLv3_server_method wolfSSLv3_server_method @@ -516,7 +517,7 @@ typedef WOLFSSL_X509_NAME_ENTRY X509_NAME_ENTRY; #define SSL_get_rbio wolfSSL_SSL_get_rbio #define SSL_get_wbio wolfSSL_SSL_get_wbio #define SSL_do_handshake wolfSSL_SSL_do_handshake -#define SSL_get_ciphers(x) wolfSSL_get_ciphers(x, sizeof(x)) +#define SSL_get_ciphers(x) wolfSSL_get_ciphers((char *)x, sizeof(x)) #define SSL_SESSION_get_id wolfSSL_SESSION_get_id #define ASN1_STRING_get0_data wolfSSL_ASN1_STRING_data #define SSL_get_cipher_bits(s,np) wolfSSL_CIPHER_get_bits(SSL_get_current_cipher(s),np) diff --git a/wolfssl/ssl.h b/wolfssl/ssl.h index f456c61f7..69061a76d 100644 --- a/wolfssl/ssl.h +++ b/wolfssl/ssl.h @@ -1993,6 +1993,7 @@ WOLFSSL_API int wolfSSL_use_certificate_ASN1(WOLFSSL* ssl, unsigned char* der, WOLFSSL_API int wolfSSL_use_PrivateKey(WOLFSSL* ssl, WOLFSSL_EVP_PKEY* pkey); WOLFSSL_API int wolfSSL_use_PrivateKey_ASN1(int pri, WOLFSSL* ssl, unsigned char* der, long derSz); +WOLFSSL_API WOLFSSL_EVP_PKEY *wolfSSL_get_privatekey(const WOLFSSL *ssl); #ifndef NO_RSA WOLFSSL_API int wolfSSL_use_RSAPrivateKey_ASN1(WOLFSSL* ssl, unsigned char* der, long derSz); @@ -2322,7 +2323,6 @@ WOLFSSL_API void *X509_get0_tbs_sigalg(const WOLFSSL_X509 *x); WOLFSSL_API void X509_ALGOR_get0(WOLFSSL_ASN1_OBJECT **paobj, int *pptype, const void **ppval, const void *algor); WOLFSSL_API void *X509_get_X509_PUBKEY(void * x); WOLFSSL_API int X509_PUBKEY_get0_param(WOLFSSL_ASN1_OBJECT **ppkalg, const unsigned char **pk, int *ppklen, void **pa, WOLFSSL_EVP_PKEY *pub); -WOLFSSL_API struct evp_pkey_st *SSL_get_privatekey(const WOLFSSL *ssl); WOLFSSL_API int EVP_PKEY_bits(WOLFSSL_EVP_PKEY *pkey); WOLFSSL_API int i2d_X509(WOLFSSL_X509 *x, unsigned char **out); WOLFSSL_API int i2t_ASN1_OBJECT(char *buf, int buf_len, WOLFSSL_ASN1_OBJECT *a);