diff options
author | tb <> | 2023-04-09 18:33:26 +0000 |
---|---|---|
committer | tb <> | 2023-04-09 18:33:26 +0000 |
commit | 99f4bd17e99b886eacbdf9496c9fd993845bd447 (patch) | |
tree | 0ccec4cc8c0ce6c1edf05bfe5ece5fc1c25504c7 /src/usr.bin/openssl/rsautl.c | |
parent | 3f534e9f9450f122637aed8d48c9f569cdcbdd94 (diff) | |
download | openbsd-99f4bd17e99b886eacbdf9496c9fd993845bd447.tar.gz openbsd-99f4bd17e99b886eacbdf9496c9fd993845bd447.tar.bz2 openbsd-99f4bd17e99b886eacbdf9496c9fd993845bd447.zip |
Remove X9.31 support from openssl(1)
The X9.31 standard has long been retired and deprecated and libcrypto will
drop support for it soon. This prepares userland.
ok jsing
Diffstat (limited to 'src/usr.bin/openssl/rsautl.c')
-rw-r--r-- | src/usr.bin/openssl/rsautl.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/src/usr.bin/openssl/rsautl.c b/src/usr.bin/openssl/rsautl.c index 9327223123..4f674b0efe 100644 --- a/src/usr.bin/openssl/rsautl.c +++ b/src/usr.bin/openssl/rsautl.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: rsautl.c,v 1.21 2023/03/06 14:32:06 tb Exp $ */ | 1 | /* $OpenBSD: rsautl.c,v 1.22 2023/04/09 18:33:26 tb 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 2000. | 3 | * project 2000. |
4 | */ | 4 | */ |
@@ -206,13 +206,6 @@ static const struct option rsautl_options[] = { | |||
206 | .value = RSA_VERIFY, | 206 | .value = RSA_VERIFY, |
207 | .opt.value = &cfg.rsa_mode, | 207 | .opt.value = &cfg.rsa_mode, |
208 | }, | 208 | }, |
209 | { | ||
210 | .name = "x931", | ||
211 | .desc = "Use ANSI X9.31 padding", | ||
212 | .type = OPTION_VALUE, | ||
213 | .value = RSA_X931_PADDING, | ||
214 | .opt.value = &cfg.pad, | ||
215 | }, | ||
216 | 209 | ||
217 | {NULL}, | 210 | {NULL}, |
218 | }; | 211 | }; |
@@ -224,7 +217,7 @@ rsautl_usage() | |||
224 | "usage: rsautl [-asn1parse] [-certin] [-decrypt] [-encrypt] " | 217 | "usage: rsautl [-asn1parse] [-certin] [-decrypt] [-encrypt] " |
225 | "[-hexdump]\n" | 218 | "[-hexdump]\n" |
226 | " [-in file] [-inkey file] [-keyform der | pem]\n" | 219 | " [-in file] [-inkey file] [-keyform der | pem]\n" |
227 | " [-oaep | -pkcs | -raw | -x931] [-out file] [-passin arg]\n" | 220 | " [-oaep | -pkcs | -raw] [-out file] [-passin arg]\n" |
228 | " [-pubin] [-rev] [-sign] [-verify]\n\n"); | 221 | " [-pubin] [-rev] [-sign] [-verify]\n\n"); |
229 | 222 | ||
230 | options_usage(rsautl_options); | 223 | options_usage(rsautl_options); |