From 99f4bd17e99b886eacbdf9496c9fd993845bd447 Mon Sep 17 00:00:00 2001
From: tb <>
Date: Sun, 9 Apr 2023 18:33:26 +0000
Subject: 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
---
 src/usr.bin/openssl/rsautl.c | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

(limited to 'src/usr.bin/openssl/rsautl.c')

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 @@
-/* $OpenBSD: rsautl.c,v 1.21 2023/03/06 14:32:06 tb Exp $ */
+/* $OpenBSD: rsautl.c,v 1.22 2023/04/09 18:33:26 tb Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2000.
  */
@@ -206,13 +206,6 @@ static const struct option rsautl_options[] = {
 		.value = RSA_VERIFY,
 		.opt.value = &cfg.rsa_mode,
 	},
-	{
-		.name = "x931",
-		.desc = "Use ANSI X9.31 padding",
-		.type = OPTION_VALUE,
-		.value = RSA_X931_PADDING,
-		.opt.value = &cfg.pad,
-	},
 
 	{NULL},
 };
@@ -224,7 +217,7 @@ rsautl_usage()
 	    "usage: rsautl [-asn1parse] [-certin] [-decrypt] [-encrypt] "
 	    "[-hexdump]\n"
 	    "    [-in file] [-inkey file] [-keyform der | pem]\n"
-	    "    [-oaep | -pkcs | -raw | -x931] [-out file] [-passin arg]\n"
+	    "    [-oaep | -pkcs | -raw] [-out file] [-passin arg]\n"
 	    "    [-pubin] [-rev] [-sign] [-verify]\n\n");
 
 	options_usage(rsautl_options);
-- 
cgit v1.2.3-55-g6feb