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

Merge pull request #4646 from julek-wolfssl/SSL_OP_NO_COMPRESSION-redef-error

Browse Source 
Fix redefinition error of `WOLFSSL_OP_NO_COMPRESSION`
This commit is contained in:
David Garske
2021-12-10 08:46:43 -08:00
committed by GitHub
parent 65a0b71994 e40ba00ece
commit dde8cd9039
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wolfssl/ssl.h
View File

@ -2063,7 +2063,7 @@ enum {
WOLFSSL_OP_CIPHER_SERVER_PREFERENCE = 0x02000000,
WOLFSSL_OP_NO_TLSv1_1 = 0x04000000,
WOLFSSL_OP_NO_TLSv1_2 = 0x08000000,
SSL_OP_NO_COMPRESSION = 0x10000000,
WOLFSSL_OP_NO_COMPRESSION = 0x10000000,
WOLFSSL_OP_NO_TLSv1_3 = 0x20000000,
WOLFSSL_OP_NO_SSLv2 = 0x40000000,
SSL_OP_ALL =

2
wolfssl/wolfcrypt/settings.h
View File

@ -2297,9 +2297,9 @@ extern void uITRON4_free(void *p) ;
#undef HAVE_GMTIME_R /* don't trust macro with windows */
#endif /* WOLFSSL_MYSQL_COMPATIBLE */
#define SSL_OP_NO_COMPRESSION WOLFSSL_OP_NO_COMPRESSION
#if defined(OPENSSL_ALL) || defined(WOLFSSL_NGINX) || defined(WOLFSSL_HAPROXY) \
|| defined(HAVE_LIGHTY)
#define SSL_OP_NO_COMPRESSION SSL_OP_NO_COMPRESSION
#define OPENSSL_NO_ENGINE
#ifndef OPENSSL_EXTRA
#define OPENSSL_EXTRA