Merge branch '2.1' into develop

2017-07-24 12:37:25 +03:00
parent 4bb4b921cb f76e4cd61d
commit 26bf342e6b
21 changed files with 111 additions and 42 deletions
--- a/include/maxscale/ssl.h
+++ b/include/maxscale/ssl.h
@ -31,7 +31,9 @@ struct dcb;

 typedef enum ssl_method_type
 {
+#ifndef OPENSSL_1_1
    SERVICE_TLS10,
+#endif
 #ifdef OPENSSL_1_0
    SERVICE_TLS11,
    SERVICE_TLS12,