From b21b085386c0d189ddf47aaa7206c2e256bbaf56 Mon Sep 17 00:00:00 2001 From: Chen Wu Date: Wed, 27 Feb 2019 14:24:55 +0800 Subject: [PATCH] fix: SSL_VERIFY_NONE redefined --- include/mbedtls/compat-1.3.h | 2 ++ include/openssl/internal/ssl_code.h | 2 ++ include/ssl/ssl_compat-1.0.h | 2 ++ include/wolfssl/ssl.h | 2 ++ 4 files changed, 8 insertions(+) diff --git a/include/mbedtls/compat-1.3.h b/include/mbedtls/compat-1.3.h index 27abbd97..f9cc5a14 100644 --- a/include/mbedtls/compat-1.3.h +++ b/include/mbedtls/compat-1.3.h @@ -1535,7 +1535,9 @@ #define SSL_TRUNC_HMAC_DISABLED MBEDTLS_SSL_TRUNC_HMAC_DISABLED #define SSL_TRUNC_HMAC_ENABLED MBEDTLS_SSL_TRUNC_HMAC_ENABLED #define SSL_VERIFY_DATA_MAX_LEN MBEDTLS_SSL_VERIFY_DATA_MAX_LEN +#ifndef SSL_VERIFY_NONE #define SSL_VERIFY_NONE MBEDTLS_SSL_VERIFY_NONE +#endif #define SSL_VERIFY_OPTIONAL MBEDTLS_SSL_VERIFY_OPTIONAL #define SSL_VERIFY_REQUIRED MBEDTLS_SSL_VERIFY_REQUIRED #define TLS_DHE_PSK_WITH_3DES_EDE_CBC_SHA MBEDTLS_TLS_DHE_PSK_WITH_3DES_EDE_CBC_SHA diff --git a/include/openssl/internal/ssl_code.h b/include/openssl/internal/ssl_code.h index 80fdbb20..0cfbf1a9 100644 --- a/include/openssl/internal/ssl_code.h +++ b/include/openssl/internal/ssl_code.h @@ -27,7 +27,9 @@ # define SSL_SENT_SHUTDOWN 1 # define SSL_RECEIVED_SHUTDOWN 2 +#ifndef SSL_VERIFY_NONE # define SSL_VERIFY_NONE 0x00 +#endif # define SSL_VERIFY_PEER 0x01 # define SSL_VERIFY_FAIL_IF_NO_PEER_CERT 0x02 # define SSL_VERIFY_CLIENT_ONCE 0x04 diff --git a/include/ssl/ssl_compat-1.0.h b/include/ssl/ssl_compat-1.0.h index d0438a22..a4c3cfdb 100644 --- a/include/ssl/ssl_compat-1.0.h +++ b/include/ssl/ssl_compat-1.0.h @@ -91,7 +91,9 @@ #define EVP_MAX_MD_SIZE ESP_EVP_MAX_MD_SIZE #define SSL_VERIFY_FAIL_IF_NO_PEER_CERT ESP_SSL_VERIFY_FAIL_IF_NO_PEER_CERT #define SSL_MODE_ENABLE_PARTIAL_WRITE ESP_SSL_MODE_ENABLE_PARTIAL_WRITE +#ifndef SSL_VERIFY_NONE #define SSL_VERIFY_NONE ESP_SSL_VERIFY_NONE +#endif #define SSL_ERROR_WANT_CONNECT ESP_SSL_ERROR_WANT_CONNECT #define SSL_ERROR_WANT_ACCEPT ESP_SSL_ERROR_WANT_ACCEPT diff --git a/include/wolfssl/ssl.h b/include/wolfssl/ssl.h index 4b7881fe..b7b5c7d5 100644 --- a/include/wolfssl/ssl.h +++ b/include/wolfssl/ssl.h @@ -1246,7 +1246,9 @@ WOLFSSL_API void wolfSSL_ERR_dump_errors_fp(XFILE fp); #define SSL_FILETYPE_DEFAULT WOLFSSL_FILETYPE_DEFAULT #define SSL_FILETYPE_RAW WOLFSSL_FILETYPE_RAW +#ifndef SSL_VERIFY_NONE #define SSL_VERIFY_NONE WOLFSSL_VERIFY_NONE +#endif #define SSL_VERIFY_PEER WOLFSSL_VERIFY_PEER #define SSL_VERIFY_FAIL_IF_NO_PEER_CERT WOLFSSL_VERIFY_FAIL_IF_NO_PEER_CERT #define SSL_VERIFY_CLIENT_ONCE WOLFSSL_VERIFY_CLIENT_ONCE