espressif/ESP8266_RTOS_SDK
1
0
Fork 0
mirror of https://github.com/espressif/ESP8266_RTOS_SDK.git synced 2025-08-06 15:15:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: SSL_VERIFY_NONE redefined

Browse Source
This commit is contained in:
Chen Wu
2019-02-27 14:24:55 +08:00
parent a18f022543
commit b21b085386
4 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/mbedtls/compat-1.3.h
View File

@ -1535,7 +1535,9 @@
#define SSL_TRUNC_HMAC_DISABLED MBEDTLS_SSL_TRUNC_HMAC_DISABLED #define SSL_TRUNC_HMAC_DISABLED MBEDTLS_SSL_TRUNC_HMAC_DISABLED
#define SSL_TRUNC_HMAC_ENABLED MBEDTLS_SSL_TRUNC_HMAC_ENABLED #define SSL_TRUNC_HMAC_ENABLED MBEDTLS_SSL_TRUNC_HMAC_ENABLED
#define SSL_VERIFY_DATA_MAX_LEN MBEDTLS_SSL_VERIFY_DATA_MAX_LEN #define SSL_VERIFY_DATA_MAX_LEN MBEDTLS_SSL_VERIFY_DATA_MAX_LEN
#ifndef SSL_VERIFY_NONE
#define SSL_VERIFY_NONE MBEDTLS_SSL_VERIFY_NONE #define SSL_VERIFY_NONE MBEDTLS_SSL_VERIFY_NONE
#endif
#define SSL_VERIFY_OPTIONAL MBEDTLS_SSL_VERIFY_OPTIONAL #define SSL_VERIFY_OPTIONAL MBEDTLS_SSL_VERIFY_OPTIONAL
#define SSL_VERIFY_REQUIRED MBEDTLS_SSL_VERIFY_REQUIRED #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 #define TLS_DHE_PSK_WITH_3DES_EDE_CBC_SHA MBEDTLS_TLS_DHE_PSK_WITH_3DES_EDE_CBC_SHA

2
include/openssl/internal/ssl_code.h
View File

@ -27,7 +27,9 @@
# define SSL_SENT_SHUTDOWN 1 # define SSL_SENT_SHUTDOWN 1
# define SSL_RECEIVED_SHUTDOWN 2 # define SSL_RECEIVED_SHUTDOWN 2
#ifndef SSL_VERIFY_NONE
# define SSL_VERIFY_NONE 0x00 # define SSL_VERIFY_NONE 0x00
#endif
# define SSL_VERIFY_PEER 0x01 # define SSL_VERIFY_PEER 0x01
# define SSL_VERIFY_FAIL_IF_NO_PEER_CERT 0x02 # define SSL_VERIFY_FAIL_IF_NO_PEER_CERT 0x02
# define SSL_VERIFY_CLIENT_ONCE 0x04 # define SSL_VERIFY_CLIENT_ONCE 0x04

2
include/ssl/ssl_compat-1.0.h
View File

@ -91,7 +91,9 @@
#define EVP_MAX_MD_SIZE ESP_EVP_MAX_MD_SIZE #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_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 #define SSL_MODE_ENABLE_PARTIAL_WRITE ESP_SSL_MODE_ENABLE_PARTIAL_WRITE
#ifndef SSL_VERIFY_NONE
#define SSL_VERIFY_NONE ESP_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_CONNECT ESP_SSL_ERROR_WANT_CONNECT
#define SSL_ERROR_WANT_ACCEPT ESP_SSL_ERROR_WANT_ACCEPT #define SSL_ERROR_WANT_ACCEPT ESP_SSL_ERROR_WANT_ACCEPT

2
include/wolfssl/ssl.h
View File

@ -1246,7 +1246,9 @@ WOLFSSL_API void wolfSSL_ERR_dump_errors_fp(XFILE fp);
#define SSL_FILETYPE_DEFAULT WOLFSSL_FILETYPE_DEFAULT #define SSL_FILETYPE_DEFAULT WOLFSSL_FILETYPE_DEFAULT
#define SSL_FILETYPE_RAW WOLFSSL_FILETYPE_RAW #define SSL_FILETYPE_RAW WOLFSSL_FILETYPE_RAW
#ifndef SSL_VERIFY_NONE
#define SSL_VERIFY_NONE WOLFSSL_VERIFY_NONE #define SSL_VERIFY_NONE WOLFSSL_VERIFY_NONE
#endif
#define SSL_VERIFY_PEER WOLFSSL_VERIFY_PEER #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_FAIL_IF_NO_PEER_CERT WOLFSSL_VERIFY_FAIL_IF_NO_PEER_CERT
#define SSL_VERIFY_CLIENT_ONCE WOLFSSL_VERIFY_CLIENT_ONCE #define SSL_VERIFY_CLIENT_ONCE WOLFSSL_VERIFY_CLIENT_ONCE