diff options
Diffstat (limited to '')
-rw-r--r-- | src/usr.bin/openssl/speed.c | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/src/usr.bin/openssl/speed.c b/src/usr.bin/openssl/speed.c index 935d9556e7..2c3dd8d6c6 100644 --- a/src/usr.bin/openssl/speed.c +++ b/src/usr.bin/openssl/speed.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: speed.c,v 1.10 2015/09/11 09:38:30 deraadt Exp $ */ | 1 | /* $OpenBSD: speed.c,v 1.11 2015/09/11 14:30:23 bcook Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -538,24 +538,6 @@ speed_main(int argc, char **argv) | |||
538 | j--; /* Otherwise, -elapsed gets confused with an | 538 | j--; /* Otherwise, -elapsed gets confused with an |
539 | * algorithm. */ | 539 | * algorithm. */ |
540 | } | 540 | } |
541 | #ifndef OPENSSL_NO_ENGINE | ||
542 | else if ((argc > 0) && (strcmp(*argv, "-engine") == 0)) { | ||
543 | argc--; | ||
544 | argv++; | ||
545 | if (argc == 0) { | ||
546 | BIO_printf(bio_err, "no engine given\n"); | ||
547 | goto end; | ||
548 | } | ||
549 | setup_engine(bio_err, *argv, 0); | ||
550 | /* | ||
551 | * j will be increased again further down. We just | ||
552 | * don't want speed to confuse an engine with an | ||
553 | * algorithm, especially when none is given (which | ||
554 | * means all of them should be run) | ||
555 | */ | ||
556 | j--; | ||
557 | } | ||
558 | #endif | ||
559 | else if ((argc > 0) && (strcmp(*argv, "-multi") == 0)) { | 541 | else if ((argc > 0) && (strcmp(*argv, "-multi") == 0)) { |
560 | argc--; | 542 | argc--; |
561 | argv++; | 543 | argv++; |
@@ -933,9 +915,6 @@ speed_main(int argc, char **argv) | |||
933 | BIO_printf(bio_err, "\n"); | 915 | BIO_printf(bio_err, "\n"); |
934 | BIO_printf(bio_err, "Available options:\n"); | 916 | BIO_printf(bio_err, "Available options:\n"); |
935 | BIO_printf(bio_err, "-elapsed measure time in real time instead of CPU user time.\n"); | 917 | BIO_printf(bio_err, "-elapsed measure time in real time instead of CPU user time.\n"); |
936 | #ifndef OPENSSL_NO_ENGINE | ||
937 | BIO_printf(bio_err, "-engine e use engine e, possibly a hardware device.\n"); | ||
938 | #endif | ||
939 | BIO_printf(bio_err, "-evp e use EVP e.\n"); | 918 | BIO_printf(bio_err, "-evp e use EVP e.\n"); |
940 | BIO_printf(bio_err, "-decrypt time decryption instead of encryption (only EVP).\n"); | 919 | BIO_printf(bio_err, "-decrypt time decryption instead of encryption (only EVP).\n"); |
941 | BIO_printf(bio_err, "-mr produce machine readable output.\n"); | 920 | BIO_printf(bio_err, "-mr produce machine readable output.\n"); |