From bd18a66a17f7616f99023a171ecaf1bbff95e02c Mon Sep 17 00:00:00 2001 From: Lu Qiuwen Date: Mon, 26 Nov 2018 16:04:03 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E6=9C=AA=E5=88=9D=E5=A7=8B?= =?UTF-8?q?=E5=8C=96=E7=9A=84=E5=AD=97=E7=AC=A6=E4=B8=B2=E6=95=B0=E7=BB=84?= =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=AD=A3ssl=5Fversion=E6=A3=80=E6=9F=A5?= =?UTF-8?q?=E7=9A=84=E9=80=BB=E8=BE=91=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- platform/src/ssl_stream.cpp | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/platform/src/ssl_stream.cpp b/platform/src/ssl_stream.cpp index eb9f919..27192e4 100644 --- a/platform/src/ssl_stream.cpp +++ b/platform/src/ssl_stream.cpp @@ -524,19 +524,28 @@ struct ssl_mgr * ssl_manager_init(const char * ini_profile, const char * section struct ssl_mgr * mgr = ALLOC(struct ssl_mgr, 1); int ret = 0; - char version_str[TFE_SYMBOL_MAX]; + + char version_str[TFE_SYMBOL_MAX] = {}; mgr->logger = logger; mgr->ev_base_gc=ev_base_gc; MESA_load_profile_string_def(ini_profile, section, "ssl_min_version", version_str, sizeof(version_str), "ssl3"); mgr->ssl_min_version = sslver_str2num(version_str); - MESA_load_profile_string_def(ini_profile, section, "ssl_max_version", version_str, sizeof(version_str), "tls12"); - mgr->ssl_max_version = sslver_str2num(version_str); - + if (mgr->ssl_min_version < 0) { TFE_LOG_ERROR(logger, "Unsupported SSL/TLS protocol %s", version_str); goto error_out; } + + MESA_load_profile_string_def(ini_profile, section, "ssl_max_version", version_str, sizeof(version_str), "tls12"); + mgr->ssl_max_version = sslver_str2num(version_str); + + if (mgr->ssl_max_version < 0) + { + TFE_LOG_ERROR(logger, "Unsupported SSL/TLS protocol %s", version_str); + goto error_out; + } + ret=ssl_init(); if(ret<0) {