From fa4841770246f820b72eeb3723d71f234eda8059 Mon Sep 17 00:00:00 2001
From: tb <>
Date: Mon, 4 Feb 2019 11:21:05 +0000
Subject: Document missing command line options for the rsautl command.
ok jsing, "looks good!" jmc
---
src/usr.bin/openssl/openssl.1 | 17 ++++++++++++-----
src/usr.bin/openssl/rsautl.c | 8 ++++----
2 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/src/usr.bin/openssl/openssl.1 b/src/usr.bin/openssl/openssl.1
index 05841e1a6a..d00d5a8e50 100644
--- a/src/usr.bin/openssl/openssl.1
+++ b/src/usr.bin/openssl/openssl.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: openssl.1,v 1.99 2019/01/28 21:17:25 jmc Exp $
+.\" $OpenBSD: openssl.1,v 1.100 2019/02/04 11:21:05 tb Exp $
.\" ====================================================================
.\" Copyright (c) 1998-2002 The OpenSSL Project. All rights reserved.
.\"
@@ -110,7 +110,7 @@
.\" copied and put under another distribution licence
.\" [including the GNU Public Licence.]
.\"
-.Dd $Mdocdate: January 28 2019 $
+.Dd $Mdocdate: February 4 2019 $
.Dt OPENSSL 1
.Os
.Sh NAME
@@ -3418,9 +3418,11 @@ 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
+.Op Fl oaep | pkcs | raw | x931
.Op Fl out Ar file
+.Op Fl passin Ar arg
.Op Fl pubin
+.Op Fl rev
.Op Fl sign
.Op Fl verify
.nr nS 0
@@ -3453,9 +3455,10 @@ The input key file; by default an RSA private key.
The private key format.
The default is
.Cm pem .
-.It Fl oaep | pkcs | raw
+.It Fl oaep | pkcs | raw | x931
The padding to use:
-PKCS#1 OAEP, PKCS#1 v1.5 (the default), or no padding, respectively.
+PKCS#1 OAEP, PKCS#1 v1.5 (the default), no padding, or ANSI X9.31,
+respectively.
For signatures, only
.Fl pkcs
and
@@ -3464,8 +3467,12 @@ can be used.
.It Fl out Ar file
The output file to write to,
or standard output if not specified.
+.It Fl passin Ar arg
+The key password source.
.It Fl pubin
The input file is an RSA public key.
+.It Fl rev
+Reverse the order of the input buffer.
.It Fl sign
Sign the input data and output the signed result.
This requires an RSA private key.
diff --git a/src/usr.bin/openssl/rsautl.c b/src/usr.bin/openssl/rsautl.c
index f61369dac2..7d7434c634 100644
--- a/src/usr.bin/openssl/rsautl.c
+++ b/src/usr.bin/openssl/rsautl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rsautl.c,v 1.16 2019/02/03 15:40:32 tb Exp $ */
+/* $OpenBSD: rsautl.c,v 1.17 2019/02/04 11:21:05 tb Exp $ */
/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
* project 2000.
*/
@@ -208,7 +208,7 @@ struct option rsautl_options[] = {
},
{
.name = "x931",
- .desc = "Use X931 padding",
+ .desc = "Use ANSI X9.31 padding",
.type = OPTION_VALUE,
.value = RSA_X931_PADDING,
.opt.value = &rsautl_config.pad,
@@ -224,8 +224,8 @@ rsautl_usage()
"usage: rsautl [-asn1parse] [-certin] [-decrypt] [-encrypt] "
"[-hexdump]\n"
" [-in file] [-inkey file] [-keyform der | pem]\n"
- " [-oaep | -pkcs | -raw] [-out file] [-pubin] [-sign]\n"
- " [-verify]\n\n");
+ " [-oaep | -pkcs | -raw | -x931] [-out file] [-passin arg]\n"
+ " [-pubin] [-rev] [-sign] [-verify]\n\n");
options_usage(rsautl_options);
}
--
cgit v1.2.3-55-g6feb