diff options
Diffstat (limited to 'src/usr.bin/openssl/pkeyparam.c')
| -rw-r--r-- | src/usr.bin/openssl/pkeyparam.c | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/src/usr.bin/openssl/pkeyparam.c b/src/usr.bin/openssl/pkeyparam.c index e5152dfbf9..8f4d3a53f4 100644 --- a/src/usr.bin/openssl/pkeyparam.c +++ b/src/usr.bin/openssl/pkeyparam.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: pkeyparam.c,v 1.6 2015/08/22 16:36:05 jsing Exp $ */ | 1 | /* $OpenBSD: pkeyparam.c,v 1.7 2015/09/11 14:30:23 bcook Exp $ */ |
| 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
| 3 | * project 2006 | 3 | * project 2006 |
| 4 | */ | 4 | */ |
| @@ -66,9 +66,6 @@ | |||
| 66 | #include <openssl/pem.h> | 66 | #include <openssl/pem.h> |
| 67 | 67 | ||
| 68 | struct { | 68 | struct { |
| 69 | #ifndef OPENSSL_NO_ENGINE | ||
| 70 | char *engine; | ||
| 71 | #endif | ||
| 72 | char *infile; | 69 | char *infile; |
| 73 | int noout; | 70 | int noout; |
| 74 | char *outfile; | 71 | char *outfile; |
| @@ -76,15 +73,6 @@ struct { | |||
| 76 | } pkeyparam_config; | 73 | } pkeyparam_config; |
| 77 | 74 | ||
| 78 | struct option pkeyparam_options[] = { | 75 | struct option pkeyparam_options[] = { |
| 79 | #ifndef OPENSSL_NO_ENGINE | ||
| 80 | { | ||
| 81 | .name = "engine", | ||
| 82 | .argname = "id", | ||
| 83 | .desc = "Use the engine specified by the given identifier", | ||
| 84 | .type = OPTION_ARG, | ||
| 85 | .opt.arg = &pkeyparam_config.engine, | ||
| 86 | }, | ||
| 87 | #endif | ||
| 88 | { | 76 | { |
| 89 | .name = "in", | 77 | .name = "in", |
| 90 | .argname = "file", | 78 | .argname = "file", |
| @@ -118,7 +106,7 @@ static void | |||
| 118 | pkeyparam_usage() | 106 | pkeyparam_usage() |
| 119 | { | 107 | { |
| 120 | fprintf(stderr, | 108 | fprintf(stderr, |
| 121 | "usage: pkeyparam [-engine id] [-in file] [-noout] [-out file] " | 109 | "usage: pkeyparam [-in file] [-noout] [-out file] " |
| 122 | "[-text]\n"); | 110 | "[-text]\n"); |
| 123 | options_usage(pkeyparam_options); | 111 | options_usage(pkeyparam_options); |
| 124 | } | 112 | } |
| @@ -137,10 +125,6 @@ pkeyparam_main(int argc, char **argv) | |||
| 137 | return (1); | 125 | return (1); |
| 138 | } | 126 | } |
| 139 | 127 | ||
| 140 | #ifndef OPENSSL_NO_ENGINE | ||
| 141 | setup_engine(bio_err, pkeyparam_config.engine, 0); | ||
| 142 | #endif | ||
| 143 | |||
| 144 | if (pkeyparam_config.infile) { | 128 | if (pkeyparam_config.infile) { |
| 145 | if (!(in = BIO_new_file(pkeyparam_config.infile, "r"))) { | 129 | if (!(in = BIO_new_file(pkeyparam_config.infile, "r"))) { |
| 146 | BIO_printf(bio_err, "Can't open input file %s\n", | 130 | BIO_printf(bio_err, "Can't open input file %s\n", |
