From 638d1bf354d4a5d026c5b712cc4a1f0dcdffac1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20M=C3=A4kel=C3=A4?= Date: Fri, 8 Nov 2019 16:56:53 +0200 Subject: [PATCH] MXS-2760: Fix ssl_version conversion The value is now correctly converted to the enum values. --- server/core/config.cc | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/server/core/config.cc b/server/core/config.cc index d0c494ca5..b13a24767 100644 --- a/server/core/config.cc +++ b/server/core/config.cc @@ -278,17 +278,13 @@ static const MXS_ENUM_VALUE ssl_values[] = static const MXS_ENUM_VALUE ssl_version_values[] = { - {"MAX", - 1}, + {"MAX", SERVICE_SSL_TLS_MAX}, #ifndef OPENSSL_1_1 - {"TLSv10", - 1}, + {"TLSv10", SERVICE_TLS10 }, #endif #ifdef OPENSSL_1_0 - {"TLSv11", - 1}, - {"TLSv12", - 1}, + {"TLSv11", SERVICE_TLS11 }, + {"TLSv12", SERVICE_TLS12 }, #endif {NULL} };