From 6c066fad879e1974c19d02d33cd49831b0ae35b6 Mon Sep 17 00:00:00 2001 From: Wu Jian Gang Date: Thu, 31 May 2018 15:33:42 +0800 Subject: [PATCH] fix(openssl): Fix warning in openssl --- .../ssl/mbedtls/port/openssl/include/platform/ssl_port.h | 4 +--- components/ssl/mbedtls/port/openssl/source/platform/ssl_pm.c | 5 +++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/components/ssl/mbedtls/port/openssl/include/platform/ssl_port.h b/components/ssl/mbedtls/port/openssl/include/platform/ssl_port.h index 637bae84..63b22068 100644 --- a/components/ssl/mbedtls/port/openssl/include/platform/ssl_port.h +++ b/components/ssl/mbedtls/port/openssl/include/platform/ssl_port.h @@ -16,16 +16,14 @@ #define _SSL_PORT_H_ #include +#include #include "esp_system.h" - #ifdef __cplusplus extern "C" { #endif - - #ifdef MEMLEAK_DEBUG extern void *pvPortMalloc( size_t xWantedSize, const char * file, unsigned line, bool use_iram); diff --git a/components/ssl/mbedtls/port/openssl/source/platform/ssl_pm.c b/components/ssl/mbedtls/port/openssl/source/platform/ssl_pm.c index c5b8cbc3..59f18e6a 100644 --- a/components/ssl/mbedtls/port/openssl/source/platform/ssl_pm.c +++ b/components/ssl/mbedtls/port/openssl/source/platform/ssl_pm.c @@ -610,7 +610,7 @@ no_mem: long ssl_pm_get_verify_result(const SSL *ssl) { - long ret; + uint32_t ret; long verify_result; struct ssl_pm *ssl_pm = (struct ssl_pm *)ssl->ssl_pm; @@ -618,8 +618,9 @@ long ssl_pm_get_verify_result(const SSL *ssl) if (ret) { SSL_DEBUG(SSL_PLATFORM_ERROR_LEVEL, "mbedtls_ssl_get_verify_result() return -0x%x", -ret); verify_result = X509_V_ERR_UNSPECIFIED; - } else + } else { verify_result = X509_V_OK; + } return verify_result; }