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

Fixed compile errors for older SSL libraries.

Browse Source
This commit is contained in:
Markus Makela
2015-06-25 16:43:50 +03:00
parent 61bee570d1
commit 80709ce039
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
server/core/service.c
View File

@ -1966,13 +1966,14 @@ int serviceInitSSL(SERVICE* service)
case SERVICE_TLS10: case SERVICE_TLS10:
service->method = (SSL_METHOD*)TLSv1_server_method(); service->method = (SSL_METHOD*)TLSv1_server_method();
break; break;
#ifdef OPENSSL_1_0
case SERVICE_TLS11: case SERVICE_TLS11:
service->method = (SSL_METHOD*)TLSv1_1_server_method(); service->method = (SSL_METHOD*)TLSv1_1_server_method();
break; break;
case SERVICE_TLS12: case SERVICE_TLS12:
service->method = (SSL_METHOD*)TLSv1_2_server_method(); service->method = (SSL_METHOD*)TLSv1_2_server_method();
break; break;
#endif
/** Rest of these use the maximum available SSL/TLS methods */ /** Rest of these use the maximum available SSL/TLS methods */
case SERVICE_SSL_MAX: case SERVICE_SSL_MAX:
service->method = (SSL_METHOD*)SSLv23_server_method(); service->method = (SSL_METHOD*)SSLv23_server_method();

2
server/include/service.h
View File

@ -117,8 +117,10 @@ typedef enum {
enum{ enum{
SERVICE_SSLV3, SERVICE_SSLV3,
SERVICE_TLS10, SERVICE_TLS10,
#ifdef OPENSSL_1_0
SERVICE_TLS11, SERVICE_TLS11,
SERVICE_TLS12, SERVICE_TLS12,
#endif
SERVICE_SSL_MAX, SERVICE_SSL_MAX,
SERVICE_TLS_MAX, SERVICE_TLS_MAX,
SERVICE_SSL_TLS_MAX SERVICE_SSL_TLS_MAX