From 40d7d7ab8de2b0401afae410d94122b16c0700c0 Mon Sep 17 00:00:00 2001
From: jsing <>
Date: Mon, 28 Aug 2017 17:50:58 +0000
Subject: Remove SSLv23 padding mode.

---
 src/usr.bin/openssl/openssl.1 | 8 ++++----
 src/usr.bin/openssl/rsautl.c  | 4 +---
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/usr.bin/openssl/openssl.1 b/src/usr.bin/openssl/openssl.1
index acefa16c93..58f88d021f 100644
--- a/src/usr.bin/openssl/openssl.1
+++ b/src/usr.bin/openssl/openssl.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: openssl.1,v 1.85 2017/05/16 04:55:27 tb Exp $
+.\" $OpenBSD: openssl.1,v 1.86 2017/08/28 17:50:58 jsing Exp $
 .\" ====================================================================
 .\" Copyright (c) 1998-2002 The OpenSSL Project.  All rights reserved.
 .\"
@@ -112,7 +112,7 @@
 .\"
 .\" OPENSSL
 .\"
-.Dd $Mdocdate: May 16 2017 $
+.Dd $Mdocdate: August 28 2017 $
 .Dt OPENSSL 1
 .Os
 .Sh NAME
@@ -3508,7 +3508,7 @@ Print the public/private key components in plain text.
 .Op Fl in Ar file
 .Op Fl inkey Ar file
 .Op Fl keyform Cm der | pem
-.Op Fl oaep | pkcs | raw | ssl
+.Op Fl oaep | pkcs | raw
 .Op Fl out Ar file
 .Op Fl pubin
 .Op Fl sign
@@ -3543,7 +3543,7 @@ The input key file; by default an RSA private key.
 The private key format.
 The default is
 .Cm pem .
-.It Fl oaep | pkcs | raw | ssl
+.It Fl oaep | pkcs | raw
 The padding to use:
 PKCS#1 OAEP, PKCS#1 v1.5 (the default), or no padding, respectively.
 For signatures, only
diff --git a/src/usr.bin/openssl/rsautl.c b/src/usr.bin/openssl/rsautl.c
index 48f739135a..1c22e5df0f 100644
--- a/src/usr.bin/openssl/rsautl.c
+++ b/src/usr.bin/openssl/rsautl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rsautl.c,v 1.11 2017/01/20 08:57:12 deraadt Exp $ */
+/* $OpenBSD: rsautl.c,v 1.12 2017/08/28 17:50:58 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2000.
  */
@@ -148,8 +148,6 @@ rsautl_main(int argc, char **argv)
 			pad = RSA_NO_PADDING;
 		else if (!strcmp(*argv, "-oaep"))
 			pad = RSA_PKCS1_OAEP_PADDING;
-		else if (!strcmp(*argv, "-ssl"))
-			pad = RSA_SSLV23_PADDING;
 		else if (!strcmp(*argv, "-pkcs"))
 			pad = RSA_PKCS1_PADDING;
 		else if (!strcmp(*argv, "-x931"))
-- 
cgit v1.2.3-55-g6feb