diff --git a/src/ssl.c b/src/ssl.c index 3c265f0e2..175cddbae 100755 --- a/src/ssl.c +++ b/src/ssl.c @@ -14562,12 +14562,6 @@ WOLFSSL_COMP_METHOD* wolfSSL_COMP_rle(void) return 0; } -int sk_SSL_COMP_zero(WOLFSSL* st) -{ - wolfSSL_set_options(st, SSL_OP_NO_COMPRESSION); - return 0; -} - int wolfSSL_COMP_add_compression_method(int method, void* data) { (void)method; @@ -15679,6 +15673,16 @@ const unsigned char *SSL_SESSION_get0_id_context(const SSL_SESSION *sess, unsign } #endif +/*** TBD ***/ +WOLFSSL_API int wolfSSL_sk_SSL_COMP_zero(WOLFSSL_STACK* st) +{ + (void)st; + WOLFSSL_STUB("wolfSSL_sk_SSL_COMP_zero"); + //wolfSSL_set_options(ssl, SSL_OP_NO_COMPRESSION); + return SSL_FAILURE; +} + + /*** TBD ***/ WOLFSSL_API long wolfSSL_set_tlsext_status_type(WOLFSSL *s, int type) { @@ -15853,10 +15857,10 @@ WOLFSSL_API STACK_OF(SSL_COMP) *SSL_COMP_get_compression_methods(void) } /*** TBD ***/ -WOLFSSL_API int sk_SSL_CIPHER_num(const void * p) +WOLFSSL_API int wolfSSL_sk_SSL_CIPHER_num(const void * p) { (void)p; - WOLFSSL_STUB("sk_SSL_CIPHER_num"); + WOLFSSL_STUB("wolfSSL_sk_SSL_CIPHER_num"); return -1; } @@ -15895,12 +15899,12 @@ WOLFSSL_API int X509_STORE_load_locations(WOLFSSL_X509_STORE *ctx, const char *f } /*** TBD ***/ -WOLFSSL_API int sk_SSL_CIPHER_value(void *ciphers, int idx) +WOLFSSL_API WOLFSSL_CIPHER* wolfSSL_sk_SSL_CIPHER_value(void *ciphers, int idx) { (void)ciphers; (void)idx; - WOLFSSL_STUB("sk_SSL_CIPHER_value"); - return SSL_FAILURE; + WOLFSSL_STUB("wolfSSL_sk_SSL_CIPHER_value"); + return NULL; } WOLFSSL_API void ERR_load_SSL_strings(void) @@ -23721,6 +23725,14 @@ unsigned long wolfSSL_ERR_peek_error_line_data(const char **file, int *line, #endif #if defined(WOLFSSL_NGINX) || defined(WOLFSSL_HAPROXY) + +STACK_OF(WOLFSSL_CIPHER) *wolfSSL_get_ciphers_compat(const WOLFSSL *ssl) +{ + (void)ssl; + WOLFSSL_STUB("wolfSSL_get_ciphers_compat"); + return NULL; +} + void wolfSSL_OPENSSL_config(char *config_name) { WOLFSSL_STUB("wolfSSL_OPENSSL_config"); diff --git a/support/wolfssl.pc b/support/wolfssl.pc index c05107569..b363b692b 100644 --- a/support/wolfssl.pc +++ b/support/wolfssl.pc @@ -1,4 +1,4 @@ -prefix=/usr/local +prefix=/usr exec_prefix=${prefix} libdir=${exec_prefix}/lib includedir=${prefix}/include diff --git a/wolfssl/openssl/ssl.h b/wolfssl/openssl/ssl.h index e58dc6c89..c00c8fe6c 100644 --- a/wolfssl/openssl/ssl.h +++ b/wolfssl/openssl/ssl.h @@ -517,10 +517,13 @@ 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((char *)x, sizeof(x)) +#define SSL_get_ciphers(x) wolfSSL_get_ciphers_compat(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) +#define sk_SSL_CIPHER_num wolfSSL_sk_SSL_CIPHER_num +#define sk_SSL_COMP_zero wolfSSL_sk_SSL_COMP_zero +#define sk_SSL_CIPHER_value wolfSSL_sk_SSL_CIPHER_value #endif /* WOLFSSL_HAPROXY */ #endif /* HAVE_STUNNEL || HAVE_LIGHTY || WOLFSSL_MYSQL_COMPATIBLE || WOLFSSL_NGINX || HAVE_POCO_LIB || WOLFSSL_HAPROXY */ diff --git a/wolfssl/ssl.h b/wolfssl/ssl.h index 69061a76d..90b566ed2 100644 --- a/wolfssl/ssl.h +++ b/wolfssl/ssl.h @@ -2310,11 +2310,10 @@ WOLFSSL_API void wolfSSL_get0_next_proto_negotiated(const WOLFSSL *s, const unsi unsigned *len); -WOLFSSL_API int sk_SSL_COMP_zero(WOLFSSL* st); - #ifdef WOLFSSL_HAPROXY WOLFSSL_API const unsigned char *SSL_SESSION_get0_id_context( const WOLFSSL_SESSION *sess, unsigned int *sid_ctx_length); +WOLFSSL_API STACK_OF(WOLFSSL_CIPHER) *wolfSSL_get_ciphers_compat(const WOLFSSL *ssl); #endif WOLFSSL_API int SSL_SESSION_set1_id(WOLFSSL_SESSION *s, const unsigned char *sid, unsigned int sid_len); @@ -2330,9 +2329,10 @@ WOLFSSL_API size_t SSL_get_finished(const WOLFSSL *s, void *buf, size_t count); WOLFSSL_API size_t SSL_get_peer_finished(const WOLFSSL *s, void *buf, size_t count); WOLFSSL_API void SSL_CTX_set_tmp_dh_callback(WOLFSSL_CTX *ctx, WOLFSSL_DH *(*dh) (WOLFSSL *ssl, int is_export, int keylength)); WOLFSSL_API STACK_OF(SSL_COMP) *SSL_COMP_get_compression_methods(void); -WOLFSSL_API int sk_SSL_CIPHER_num(const void * p); WOLFSSL_API int X509_STORE_load_locations(WOLFSSL_X509_STORE *ctx, const char *file, const char *dir); -WOLFSSL_API int sk_SSL_CIPHER_value(void *ciphers, int idx); +WOLFSSL_API int wolfSSL_sk_SSL_CIPHER_num(const void * p); +WOLFSSL_API int wolfSSL_sk_SSL_COMP_zero(WOLFSSL_STACK* st); +WOLFSSL_API WOLFSSL_CIPHER* wolfSSL_sk_SSL_CIPHER_value(void *ciphers, int idx); WOLFSSL_API void ERR_load_SSL_strings(void); #ifdef __cplusplus