diff options
Diffstat (limited to 'src/lib/libssl/src/ssl/ssltest.c')
| -rw-r--r-- | src/lib/libssl/src/ssl/ssltest.c | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/src/lib/libssl/src/ssl/ssltest.c b/src/lib/libssl/src/ssl/ssltest.c index 664147cb6a..ea236df44d 100644 --- a/src/lib/libssl/src/ssl/ssltest.c +++ b/src/lib/libssl/src/ssl/ssltest.c | |||
| @@ -299,9 +299,6 @@ sv_usage(void) | |||
| 299 | { | 299 | { |
| 300 | fprintf(stderr, "usage: ssltest [args ...]\n"); | 300 | fprintf(stderr, "usage: ssltest [args ...]\n"); |
| 301 | fprintf(stderr, "\n"); | 301 | fprintf(stderr, "\n"); |
| 302 | #ifdef OPENSSL_FIPS | ||
| 303 | fprintf(stderr, "-F - run test in FIPS mode\n"); | ||
| 304 | #endif | ||
| 305 | fprintf(stderr, " -server_auth - check server certificate\n"); | 302 | fprintf(stderr, " -server_auth - check server certificate\n"); |
| 306 | fprintf(stderr, " -client_auth - do client authentication\n"); | 303 | fprintf(stderr, " -client_auth - do client authentication\n"); |
| 307 | fprintf(stderr, " -proxy - allow proxy certificates\n"); | 304 | fprintf(stderr, " -proxy - allow proxy certificates\n"); |
| @@ -526,9 +523,6 @@ main(int argc, char *argv[]) | |||
| 526 | STACK_OF(SSL_COMP) *ssl_comp_methods = NULL; | 523 | STACK_OF(SSL_COMP) *ssl_comp_methods = NULL; |
| 527 | #endif | 524 | #endif |
| 528 | int test_cipherlist = 0; | 525 | int test_cipherlist = 0; |
| 529 | #ifdef OPENSSL_FIPS | ||
| 530 | int fips_mode = 0; | ||
| 531 | #endif | ||
| 532 | 526 | ||
| 533 | verbose = 0; | 527 | verbose = 0; |
| 534 | debug = 0; | 528 | debug = 0; |
| @@ -558,12 +552,8 @@ main(int argc, char *argv[]) | |||
| 558 | 552 | ||
| 559 | while (argc >= 1) { | 553 | while (argc >= 1) { |
| 560 | if (!strcmp(*argv, "-F")) { | 554 | if (!strcmp(*argv, "-F")) { |
| 561 | #ifdef OPENSSL_FIPS | ||
| 562 | fips_mode = 1; | ||
| 563 | #else | ||
| 564 | fprintf(stderr, "not compiled with FIPS support, so exitting without running.\n"); | 555 | fprintf(stderr, "not compiled with FIPS support, so exitting without running.\n"); |
| 565 | exit(0); | 556 | exit(0); |
| 566 | #endif | ||
| 567 | } else if (strcmp(*argv, "-server_auth") == 0) | 557 | } else if (strcmp(*argv, "-server_auth") == 0) |
| 568 | server_auth = 1; | 558 | server_auth = 1; |
| 569 | else if (strcmp(*argv, "-client_auth") == 0) | 559 | else if (strcmp(*argv, "-client_auth") == 0) |
| @@ -739,17 +729,6 @@ bad: | |||
| 739 | exit(1); | 729 | exit(1); |
| 740 | } | 730 | } |
| 741 | 731 | ||
| 742 | #ifdef OPENSSL_FIPS | ||
| 743 | if (fips_mode) { | ||
| 744 | if (!FIPS_mode_set(1)) { | ||
| 745 | ERR_load_crypto_strings(); | ||
| 746 | ERR_print_errors(BIO_new_fp(stderr, BIO_NOCLOSE)); | ||
| 747 | exit(1); | ||
| 748 | } else | ||
| 749 | fprintf(stderr, "*** IN FIPS MODE ***\n"); | ||
| 750 | } | ||
| 751 | #endif | ||
| 752 | |||
| 753 | if (print_time) { | 732 | if (print_time) { |
| 754 | if (!bio_pair) { | 733 | if (!bio_pair) { |
| 755 | fprintf(stderr, "Using BIO pair (-bio_pair)\n"); | 734 | fprintf(stderr, "Using BIO pair (-bio_pair)\n"); |
