summaryrefslogtreecommitdiff
path: root/src/usr.bin/openssl/rsautl.c
diff options
context:
space:
mode:
authortb <>2023-05-05 18:01:27 +0000
committertb <>2023-05-05 18:01:27 +0000
commit23ad392ed1bdbab23580b4ecbbc4d268cebff20b (patch)
tree996256f965ee81dd6bdd66da5e5f87c24808d916 /src/usr.bin/openssl/rsautl.c
parent207c85024ec901c74f1bc9669abb7821e3e1a41e (diff)
downloadopenbsd-23ad392ed1bdbab23580b4ecbbc4d268cebff20b.tar.gz
openbsd-23ad392ed1bdbab23580b4ecbbc4d268cebff20b.tar.bz2
openbsd-23ad392ed1bdbab23580b4ecbbc4d268cebff20b.zip
Reinstate X9.31 padding mode support in rsautl
Diffstat (limited to 'src/usr.bin/openssl/rsautl.c')
-rw-r--r--src/usr.bin/openssl/rsautl.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/src/usr.bin/openssl/rsautl.c b/src/usr.bin/openssl/rsautl.c
index 4f674b0efe..d67e78807c 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.22 2023/04/09 18:33:26 tb Exp $ */ 1/* $OpenBSD: rsautl.c,v 1.23 2023/05/05 18:01:27 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,6 +206,13 @@ 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 },
209 216
210 {NULL}, 217 {NULL},
211}; 218};
@@ -217,7 +224,7 @@ rsautl_usage()
217 "usage: rsautl [-asn1parse] [-certin] [-decrypt] [-encrypt] " 224 "usage: rsautl [-asn1parse] [-certin] [-decrypt] [-encrypt] "
218 "[-hexdump]\n" 225 "[-hexdump]\n"
219 " [-in file] [-inkey file] [-keyform der | pem]\n" 226 " [-in file] [-inkey file] [-keyform der | pem]\n"
220 " [-oaep | -pkcs | -raw] [-out file] [-passin arg]\n" 227 " [-oaep | -pkcs | -raw | -x931] [-out file] [-passin arg]\n"
221 " [-pubin] [-rev] [-sign] [-verify]\n\n"); 228 " [-pubin] [-rev] [-sign] [-verify]\n\n");
222 229
223 options_usage(rsautl_options); 230 options_usage(rsautl_options);