From e40ba00eced49bdda8423638fb00615d99d06f09 Mon Sep 17 00:00:00 2001 From: Juliusz Sosinowicz Date: Fri, 10 Dec 2021 11:21:25 +0100 Subject: [PATCH] Fix redefinition error of `WOLFSSL_OP_NO_COMPRESSION` --- wolfssl/ssl.h | 2 +- wolfssl/wolfcrypt/settings.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/wolfssl/ssl.h b/wolfssl/ssl.h index b02959074..350e34859 100644 --- a/wolfssl/ssl.h +++ b/wolfssl/ssl.h @@ -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 = diff --git a/wolfssl/wolfcrypt/settings.h b/wolfssl/wolfcrypt/settings.h index 805c830ee..1c7cd8afa 100644 --- a/wolfssl/wolfcrypt/settings.h +++ b/wolfssl/wolfcrypt/settings.h @@ -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