hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '2.3' into 2.4

Browse Source
This commit is contained in:
Markus Mäkelä
2019-11-11 09:09:10 +02:00
parent d67442356e 638d1bf354
commit 3f05059afa
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/core/ssl.cc
View File

@ -40,13 +40,13 @@ static RSA* rsa_1024 = NULL;
const MXS_ENUM_VALUE ssl_version_values[] = const MXS_ENUM_VALUE ssl_version_values[] =
{ {
{"MAX", 1}, {"MAX", SERVICE_SSL_TLS_MAX},
#ifndef OPENSSL_1_1 #ifndef OPENSSL_1_1
{"TLSv10", 1}, {"TLSv10", SERVICE_TLS10 },
#endif #endif
#ifdef OPENSSL_1_0 #ifdef OPENSSL_1_0
{"TLSv11", 1}, {"TLSv11", SERVICE_TLS11 },
{"TLSv12", 1}, {"TLSv12", SERVICE_TLS12 },
#endif #endif
{NULL} {NULL}
}; };