diff options
| author | Joel Sing <jsing@cvs.openbsd.org> | 2017-08-28 17:50:59 +0000 |
|---|---|---|
| committer | Joel Sing <jsing@cvs.openbsd.org> | 2017-08-28 17:50:59 +0000 |
| commit | f74988a92709ca38d772694c4ef2b7d6d3e4272e (patch) | |
| tree | 7acace885fca8e39c1d3e2906ab9f927eaaad7c3 /usr.bin | |
| parent | 8219930ac34b283f237878d19fa0304413e11cf1 (diff) | |
Remove SSLv23 padding mode.
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/openssl/openssl.1 | 8 | ||||
| -rw-r--r-- | usr.bin/openssl/rsautl.c | 4 |
2 files changed, 5 insertions, 7 deletions
diff --git a/usr.bin/openssl/openssl.1 b/usr.bin/openssl/openssl.1 index acefa16c93d..58f88d021f2 100644 --- a/usr.bin/openssl/openssl.1 +++ b/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/usr.bin/openssl/rsautl.c b/usr.bin/openssl/rsautl.c index 48f739135ab..1c22e5df0f2 100644 --- a/usr.bin/openssl/rsautl.c +++ b/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")) |