Merge branch '2.3' into 2.4

2019-11-28 08:05:44 +02:00
parent 218354081c 774e9bc3f0
commit c5ce940b12
2 changed files with 43 additions and 24 deletions
--- a/include/maxscale/ssl.hh
+++ b/include/maxscale/ssl.hh
@ -34,13 +34,10 @@ class MXS_CONFIG_PARAMETER;

 enum ssl_method_type_t
 {
-#ifndef OPENSSL_1_1
    SERVICE_TLS10,
-#endif
-#ifdef OPENSSL_1_0
    SERVICE_TLS11,
    SERVICE_TLS12,
-#endif
+    SERVICE_TLS13,
    SERVICE_SSL_MAX,
    SERVICE_TLS_MAX,
    SERVICE_SSL_TLS_MAX,