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

Merge pull request #66 from steils/master

Browse Source 
Use correct ifdefs for checking TLS 1.3
This commit is contained in:
Adrian Chadd 2019-06-03 12:31:07 -07:00 committed by GitHub
commit 60191543a3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/httperf.c
View File

@ -687,7 +687,7 @@ main(int argc, char **argv)
param.ssl_protocol = 5; param.ssl_protocol = 5;
else if (strcasecmp (optarg, "TLSv1.2") == 0 || strcasecmp (optarg, "TLSv1_2") == 0) else if (strcasecmp (optarg, "TLSv1.2") == 0 || strcasecmp (optarg, "TLSv1_2") == 0)
param.ssl_protocol = 6; param.ssl_protocol = 6;
#if (OPENSSL_VERSION_NUMBER >= 0x10101000L) #ifdef TLS1_3_VERSION
else if (strcasecmp (optarg, "TLSv1.3") == 0 || strcasecmp (optarg, "TLSv1_3") == 0) else if (strcasecmp (optarg, "TLSv1.3") == 0 || strcasecmp (optarg, "TLSv1_3") == 0)
param.ssl_protocol = 7; param.ssl_protocol = 7;
#endif #endif
@ -1104,7 +1104,7 @@ main(int argc, char **argv)
SSL_CTX_set_options(ssl_ctx, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3 | SSL_OP_NO_TLSv1 | SSL_OP_NO_TLSv1_1); break; SSL_CTX_set_options(ssl_ctx, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3 | SSL_OP_NO_TLSv1 | SSL_OP_NO_TLSv1_1); break;
#endif #endif
#if (OPENSSL_VERSION_NUMBER >= 0x10101000L) #ifdef TLS1_3_VERSION
/* 7/TLSv1.3 */ /* 7/TLSv1.3 */
case 7: case 7:
ssl_ctx = SSL_CTX_new (TLS_client_method ()); ssl_ctx = SSL_CTX_new (TLS_client_method ());
@ -1329,7 +1329,7 @@ main(int argc, char **argv)
case 4: printf (" --ssl-protocol=TLSv1.0"); break; case 4: printf (" --ssl-protocol=TLSv1.0"); break;
case 5: printf (" --ssl-protocol=TLSv1.1"); break; case 5: printf (" --ssl-protocol=TLSv1.1"); break;
case 6: printf (" --ssl-protocol=TLSv1.2"); break; case 6: printf (" --ssl-protocol=TLSv1.2"); break;
#if (OPENSSL_VERSION_NUMBER >= 0x10101000L) #ifdef TLS1_3_VERSION
case 7: printf (" --ssl-protocol=TLSv1.3"); break; case 7: printf (" --ssl-protocol=TLSv1.3"); break;
#endif #endif
} }