|
Lines 1283-1289
Link Here
|
| 1283 |
break; |
1283 |
break; |
| 1284 |
case 'h': |
1284 |
case 'h': |
| 1285 |
usage(argv[0]); |
1285 |
usage(argv[0]); |
| 1286 |
@@ -2221,26 +2296,33 @@ int main(int argc, const char * const ar |
1286 |
@@ -2221,26 +2296,35 @@ int main(int argc, const char * const ar |
| 1287 |
case 'V': |
1287 |
case 'V': |
| 1288 |
copyright(); |
1288 |
copyright(); |
| 1289 |
return 0; |
1289 |
return 0; |
|
Lines 1309-1316
Link Here
|
| 1309 |
meth = SSLv2_client_method(); |
1309 |
meth = SSLv2_client_method(); |
| 1310 |
#endif |
1310 |
#endif |
| 1311 |
- } else if (strncasecmp(optarg, "SSL3", 4) == 0) { |
1311 |
- } else if (strncasecmp(optarg, "SSL3", 4) == 0) { |
|
|
1312 |
+#ifndef OPENSSL_NO_SSL3 |
| 1312 |
+ } else if (strncasecmp(opt_arg, "SSL3", 4) == 0) { |
1313 |
+ } else if (strncasecmp(opt_arg, "SSL3", 4) == 0) { |
| 1313 |
meth = SSLv3_client_method(); |
1314 |
meth = SSLv3_client_method(); |
|
|
1315 |
+#endif |
| 1314 |
#ifdef HAVE_TLSV1_X |
1316 |
#ifdef HAVE_TLSV1_X |
| 1315 |
- } else if (strncasecmp(optarg, "TLS1.1", 6) == 0) { |
1317 |
- } else if (strncasecmp(optarg, "TLS1.1", 6) == 0) { |
| 1316 |
+ } else if (strncasecmp(opt_arg, "TLS1.1", 6) == 0) { |
1318 |
+ } else if (strncasecmp(opt_arg, "TLS1.1", 6) == 0) { |
|
Lines 1324-1330
Link Here
|
| 1324 |
meth = TLSv1_client_method(); |
1326 |
meth = TLSv1_client_method(); |
| 1325 |
} |
1327 |
} |
| 1326 |
break; |
1328 |
break; |
| 1327 |
@@ -2253,6 +2335,10 @@ int main(int argc, const char * const ar |
1329 |
@@ -2253,6 +2337,10 @@ int main(int argc, const char * const ar |
| 1328 |
usage(argv[0]); |
1330 |
usage(argv[0]); |
| 1329 |
} |
1331 |
} |
| 1330 |
|
1332 |
|
|
Lines 1335-1341
Link Here
|
| 1335 |
if (parse_url(apr_pstrdup(cntxt, opt->argv[opt->ind++]))) { |
1337 |
if (parse_url(apr_pstrdup(cntxt, opt->argv[opt->ind++]))) { |
| 1336 |
fprintf(stderr, "%s: invalid URL\n", argv[0]); |
1338 |
fprintf(stderr, "%s: invalid URL\n", argv[0]); |
| 1337 |
usage(argv[0]); |
1339 |
usage(argv[0]); |
| 1338 |
@@ -2296,6 +2382,10 @@ int main(int argc, const char * const ar |
1340 |
@@ -2296,6 +2384,10 @@ int main(int argc, const char * const ar |
| 1339 |
exit(1); |
1341 |
exit(1); |
| 1340 |
} |
1342 |
} |
| 1341 |
SSL_CTX_set_options(ssl_ctx, SSL_OP_ALL); |
1343 |
SSL_CTX_set_options(ssl_ctx, SSL_OP_ALL); |