diff options
Diffstat (limited to 'src/usr.bin/openssl/rand.c')
| -rw-r--r-- | src/usr.bin/openssl/rand.c | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/src/usr.bin/openssl/rand.c b/src/usr.bin/openssl/rand.c index b021b4ec7c..b0df4eb1b5 100644 --- a/src/usr.bin/openssl/rand.c +++ b/src/usr.bin/openssl/rand.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: rand.c,v 1.7 2015/08/22 16:36:05 jsing Exp $ */ | 1 | /* $OpenBSD: rand.c,v 1.8 2015/09/11 14:30:23 bcook Exp $ */ |
| 2 | /* ==================================================================== | 2 | /* ==================================================================== |
| 3 | * Copyright (c) 1998-2001 The OpenSSL Project. All rights reserved. | 3 | * Copyright (c) 1998-2001 The OpenSSL Project. All rights reserved. |
| 4 | * | 4 | * |
| @@ -64,7 +64,6 @@ | |||
| 64 | 64 | ||
| 65 | struct { | 65 | struct { |
| 66 | int base64; | 66 | int base64; |
| 67 | char *engine; | ||
| 68 | int hex; | 67 | int hex; |
| 69 | char *outfile; | 68 | char *outfile; |
| 70 | } rand_config; | 69 | } rand_config; |
| @@ -76,15 +75,6 @@ struct option rand_options[] = { | |||
| 76 | .type = OPTION_FLAG, | 75 | .type = OPTION_FLAG, |
| 77 | .opt.flag = &rand_config.base64, | 76 | .opt.flag = &rand_config.base64, |
| 78 | }, | 77 | }, |
| 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 = &rand_config.engine, | ||
| 86 | }, | ||
| 87 | #endif | ||
| 88 | { | 78 | { |
| 89 | .name = "hex", | 79 | .name = "hex", |
| 90 | .desc = "Hexadecimal output", | 80 | .desc = "Hexadecimal output", |
| @@ -105,7 +95,7 @@ static void | |||
| 105 | rand_usage() | 95 | rand_usage() |
| 106 | { | 96 | { |
| 107 | fprintf(stderr, | 97 | fprintf(stderr, |
| 108 | "usage: rand [-base64 | -hex] [-engine id] [-out file] num\n"); | 98 | "usage: rand [-base64 | -hex] [-out file] num\n"); |
| 109 | options_usage(rand_options); | 99 | options_usage(rand_options); |
| 110 | } | 100 | } |
| 111 | 101 | ||
| @@ -141,10 +131,6 @@ rand_main(int argc, char **argv) | |||
| 141 | goto err; | 131 | goto err; |
| 142 | } | 132 | } |
| 143 | 133 | ||
| 144 | #ifndef OPENSSL_NO_ENGINE | ||
| 145 | setup_engine(bio_err, rand_config.engine, 0); | ||
| 146 | #endif | ||
| 147 | |||
| 148 | out = BIO_new(BIO_s_file()); | 134 | out = BIO_new(BIO_s_file()); |
| 149 | if (out == NULL) | 135 | if (out == NULL) |
| 150 | goto err; | 136 | goto err; |
