kris/httperf
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix building when OpenSSL was compiled -nossl2 or -noss3

Browse Source 
This also fixes building with LibreSSL 2.2 (no SSLv2) and 2.3 (no SSLv3)
This commit is contained in:
Bernard Spil 2016-01-07 21:57:54 +01:00
parent dcfb746bc5
commit bea56ffa7e
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/httperf.c
View File

@ -664,10 +664,14 @@ main(int argc, char **argv)
{ {
if (strcasecmp (optarg, "auto") == 0) if (strcasecmp (optarg, "auto") == 0)
param.ssl_protocol = 0; param.ssl_protocol = 0;
#ifndef OPENSSL_NO_SSL2
else if (strcasecmp (optarg, "SSLv2") == 0) else if (strcasecmp (optarg, "SSLv2") == 0)
param.ssl_protocol = 2; param.ssl_protocol = 2;
#endif
#ifndef OPENSSL_NO_SSL3
else if (strcasecmp (optarg, "SSLv3") == 0) else if (strcasecmp (optarg, "SSLv3") == 0)
param.ssl_protocol = 3; param.ssl_protocol = 3;
#endif
else if (strcasecmp (optarg, "TLSv1") == 0) else if (strcasecmp (optarg, "TLSv1") == 0)
param.ssl_protocol = 4; param.ssl_protocol = 4;
else else
@ -997,10 +1001,14 @@ main(int argc, char **argv)
{ {
/* 0/auto for SSLv23 */ /* 0/auto for SSLv23 */
case 0: ssl_ctx = SSL_CTX_new (SSLv23_client_method ()); break; case 0: ssl_ctx = SSL_CTX_new (SSLv23_client_method ()); break;
#ifndef OPENSSL_NO_SSL2
/* 2/SSLv2 */ /* 2/SSLv2 */
case 2: ssl_ctx = SSL_CTX_new (SSLv2_client_method ()); break; case 2: ssl_ctx = SSL_CTX_new (SSLv2_client_method ()); break;
#endif
#ifndef OPENSSL_NO_SSL3
/* 3/SSLv3 */ /* 3/SSLv3 */
case 3: ssl_ctx = SSL_CTX_new (SSLv3_client_method ()); break; case 3: ssl_ctx = SSL_CTX_new (SSLv3_client_method ()); break;
#endif
/* 4/TLSv1 */ /* 4/TLSv1 */
case 4: ssl_ctx = SSL_CTX_new (TLSv1_client_method ()); break; case 4: ssl_ctx = SSL_CTX_new (TLSv1_client_method ()); break;
} }
@ -1204,8 +1212,12 @@ main(int argc, char **argv)
switch (param.ssl_protocol) switch (param.ssl_protocol)
{ {
case 0: printf (" --ssl-protocol=auto"); break; case 0: printf (" --ssl-protocol=auto"); break;
#ifndef OPENSSL_NO_SSL2
case 2: printf (" --ssl-protocol=SSLv2"); break; case 2: printf (" --ssl-protocol=SSLv2"); break;
#endif
#ifndef OPENSSL_NO_SSL3
case 3: printf (" --ssl-protocol=SSLv3"); break; case 3: printf (" --ssl-protocol=SSLv3"); break;
#endif
case 4: printf (" --ssl-protocol=TLSv1"); break; case 4: printf (" --ssl-protocol=TLSv1"); break;
} }
#endif #endif