summaryrefslogtreecommitdiff
path: root/src/lib/libssl/src/apps/ts.c
diff options
context:
space:
mode:
authorjsing <>2014-06-02 16:23:18 +0000
committerjsing <>2014-06-02 16:23:18 +0000
commit7705ec57382540f0dc8950e5391d8084caff0cfe (patch)
treea6b3ced689315ac9ed257dceff022da124c81f44 /src/lib/libssl/src/apps/ts.c
parent5df353beff71ba1f1e84cd691ef3edf892aa5311 (diff)
downloadopenbsd-7705ec57382540f0dc8950e5391d8084caff0cfe.tar.gz
openbsd-7705ec57382540f0dc8950e5391d8084caff0cfe.tar.bz2
openbsd-7705ec57382540f0dc8950e5391d8084caff0cfe.zip
Stop pretending that openssl(1) applications support the -rand option.
The underlying code has long been removed, making this a no-op. If your random subsystem actually requires that you seed it from a file, then you really should go and buy a new random subsystem that was built after 1990. Diff from Brent Cook. ok deraadt@
Diffstat (limited to '')
-rw-r--r--src/lib/libssl/src/apps/ts.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/src/lib/libssl/src/apps/ts.c b/src/lib/libssl/src/apps/ts.c
index df2e179ce0..403e99ba73 100644
--- a/src/lib/libssl/src/apps/ts.c
+++ b/src/lib/libssl/src/apps/ts.c
@@ -133,7 +133,6 @@ ts_main(int argc, char **argv)
133 char *data = NULL; 133 char *data = NULL;
134 char *digest = NULL; 134 char *digest = NULL;
135 const EVP_MD *md = NULL; 135 const EVP_MD *md = NULL;
136 char *rnd = NULL;
137 char *policy = NULL; 136 char *policy = NULL;
138 int no_nonce = 0; 137 int no_nonce = 0;
139 int cert = 0; 138 int cert = 0;
@@ -181,10 +180,6 @@ ts_main(int argc, char **argv)
181 if (argc-- < 1) 180 if (argc-- < 1)
182 goto usage; 181 goto usage;
183 digest = *++argv; 182 digest = *++argv;
184 } else if (strcmp(*argv, "-rand") == 0) {
185 if (argc-- < 1)
186 goto usage;
187 rnd = *++argv;
188 } else if (strcmp(*argv, "-policy") == 0) { 183 } else if (strcmp(*argv, "-policy") == 0) {
189 if (argc-- < 1) 184 if (argc-- < 1)
190 goto usage; 185 goto usage;
@@ -315,7 +310,7 @@ ts_main(int argc, char **argv)
315 310
316usage: 311usage:
317 BIO_printf(bio_err, "usage:\n" 312 BIO_printf(bio_err, "usage:\n"
318 "ts -query [-rand file:file:...] [-config configfile] " 313 "ts -query [-config configfile] "
319 "[-data file_to_hash] [-digest digest_bytes]" 314 "[-data file_to_hash] [-digest digest_bytes]"
320 "[-md2|-md4|-md5|-sha|-sha1|-mdc2|-ripemd160] " 315 "[-md2|-md4|-md5|-sha|-sha1|-mdc2|-ripemd160] "
321 "[-policy object_id] [-no_nonce] [-cert] " 316 "[-policy object_id] [-no_nonce] [-cert] "