1 files changed, 34 insertions, 26 deletions
diff --git a/secure/usr.bin/openssl/man/rsa.1 b/secure/usr.bin/openssl/man/rsa.1
index 59adddec669f4..1f1c8644f3bbb 100644
--- a/secure/usr.bin/openssl/man/rsa.1
+++ b/secure/usr.bin/openssl/man/rsa.1
@@ -129,27 +129,29 @@
 .\" ========================================================================
 .\"
 .IX Title "RSA 1"
-.TH RSA 1 "2018-08-14" "1.0.2p" "OpenSSL"
+.TH RSA 1 "2018-09-11" "1.1.1" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
 .nh
 .SH "NAME"
-openssl\-rsa,
-rsa \- RSA key processing tool
+openssl\-rsa, rsa \- RSA key processing tool
 .SH "SYNOPSIS"
 .IX Header "SYNOPSIS"
 \&\fBopenssl\fR \fBrsa\fR
+[\fB\-help\fR]
 [\fB\-inform PEM|NET|DER\fR]
 [\fB\-outform PEM|NET|DER\fR]
 [\fB\-in filename\fR]
 [\fB\-passin arg\fR]
 [\fB\-out filename\fR]
 [\fB\-passout arg\fR]
-[\fB\-sgckey\fR]
 [\fB\-aes128\fR]
 [\fB\-aes192\fR]
 [\fB\-aes256\fR]
+[\fB\-aria128\fR]
+[\fB\-aria192\fR]
+[\fB\-aria256\fR]
 [\fB\-camellia128\fR]
 [\fB\-camellia192\fR]
 [\fB\-camellia256\fR]
@@ -172,8 +174,11 @@ forms and their components printed out. \fBNote\fR this command uses the
 traditional SSLeay compatible format for private key encryption: newer
 applications should use the more secure PKCS#8 format using the \fBpkcs8\fR
 utility.
-.SH "COMMAND OPTIONS"
-.IX Header "COMMAND OPTIONS"
+.SH "OPTIONS"
+.IX Header "OPTIONS"
+.IP "\fB\-help\fR" 4
+.IX Item "-help"
+Print out a usage message.
 .IP "\fB\-inform DER|NET|PEM\fR" 4
 .IX Item "-inform DER|NET|PEM"
 This specifies the input format. The \fB\s-1DER\s0\fR option uses an \s-1ASN1 DER\s0 encoded
@@ -184,8 +189,8 @@ keys are also accepted. The \fB\s-1NET\s0\fR form is a format is described in th
 section.
 .IP "\fB\-outform DER|NET|PEM\fR" 4
 .IX Item "-outform DER|NET|PEM"
-This specifies the output format, the options have the same meaning as the 
-\&\fB\-inform\fR option.
+This specifies the output format, the options have the same meaning and default
+as the \fB\-inform\fR option.
 .IP "\fB\-in filename\fR" 4
 .IX Item "-in filename"
 This specifies the input filename to read a key from or standard input if this
@@ -193,7 +198,7 @@ option is not specified. If the key is encrypted a pass phrase will be
 prompted for.
 .IP "\fB\-passin arg\fR" 4
 .IX Item "-passin arg"
-the input file password source. For more information about the format of \fBarg\fR
+The input file password source. For more information about the format of \fBarg\fR
 see the \fB\s-1PASS PHRASE ARGUMENTS\s0\fR section in \fIopenssl\fR\|(1).
 .IP "\fB\-out filename\fR" 4
 .IX Item "-out filename"
@@ -203,14 +208,10 @@ will be prompted for. The output filename should \fBnot\fR be the same as the in
 filename.
 .IP "\fB\-passout password\fR" 4
 .IX Item "-passout password"
-the output file password source. For more information about the format of \fBarg\fR
+The output file password source. For more information about the format of \fBarg\fR
 see the \fB\s-1PASS PHRASE ARGUMENTS\s0\fR section in \fIopenssl\fR\|(1).
-.IP "\fB\-sgckey\fR" 4
-.IX Item "-sgckey"
-use the modified \s-1NET\s0 algorithm used with some versions of Microsoft \s-1IIS\s0 and \s-1SGC\s0
-keys.
-.IP "\fB\-aes128|\-aes192|\-aes256|\-camellia128|\-camellia192|\-camellia256|\-des|\-des3|\-idea\fR" 4
-.IX Item "-aes128|-aes192|-aes256|-camellia128|-camellia192|-camellia256|-des|-des3|-idea"
+.IP "\fB\-aes128\fR, \fB\-aes192\fR, \fB\-aes256\fR, \fB\-aria128\fR, \fB\-aria192\fR, \fB\-aria256\fR, \fB\-camellia128\fR, \fB\-camellia192\fR, \fB\-camellia256\fR, \fB\-des\fR, \fB\-des3\fR, \fB\-idea\fR" 4
+.IX Item "-aes128, -aes192, -aes256, -aria128, -aria192, -aria256, -camellia128, -camellia192, -camellia256, -des, -des3, -idea"
 These options encrypt the private key with the specified
 cipher before outputting it. A pass phrase is prompted for.
 If none of these options is specified the key is written in plain text. This
@@ -220,32 +221,32 @@ setting the encryption options it can be use to add or change the pass phrase.
 These options can only be used with \s-1PEM\s0 format output files.
 .IP "\fB\-text\fR" 4
 .IX Item "-text"
-prints out the various public or private key components in
+Prints out the various public or private key components in
 plain text in addition to the encoded version.
 .IP "\fB\-noout\fR" 4
 .IX Item "-noout"
-this option prevents output of the encoded version of the key.
+This option prevents output of the encoded version of the key.
 .IP "\fB\-modulus\fR" 4
 .IX Item "-modulus"
-this option prints out the value of the modulus of the key.
+This option prints out the value of the modulus of the key.
 .IP "\fB\-check\fR" 4
 .IX Item "-check"
-this option checks the consistency of an \s-1RSA\s0 private key.
+This option checks the consistency of an \s-1RSA\s0 private key.
 .IP "\fB\-pubin\fR" 4
 .IX Item "-pubin"
-by default a private key is read from the input file: with this
+By default a private key is read from the input file: with this
 option a public key is read instead.
 .IP "\fB\-pubout\fR" 4
 .IX Item "-pubout"
-by default a private key is output: with this option a public
+By default a private key is output: with this option a public
 key will be output instead. This option is automatically set if
 the input is a public key.
 .IP "\fB\-RSAPublicKey_in\fR, \fB\-RSAPublicKey_out\fR" 4
 .IX Item "-RSAPublicKey_in, -RSAPublicKey_out"
-like \fB\-pubin\fR and \fB\-pubout\fR except \fBRSAPublicKey\fR format is used instead.
+Like \fB\-pubin\fR and \fB\-pubout\fR except \fBRSAPublicKey\fR format is used instead.
 .IP "\fB\-engine id\fR" 4
 .IX Item "-engine id"
-specifying an engine (by its unique \fBid\fR string) will cause \fBrsa\fR
+Specifying an engine (by its unique \fBid\fR string) will cause \fBrsa\fR
 to attempt to obtain a functional reference to the specified engine,
 thus initialising it if needed. The engine will then be set as the default
 for all available algorithms.
@@ -281,8 +282,7 @@ files. To use these with the utility, view the file with a binary editor
 and look for the string \*(L"private-key\*(R", then trace back to the byte
 sequence 0x30, 0x82 (this is an \s-1ASN1 SEQUENCE\s0). Copy all the data
 from this point onwards to another file and use that as the input
-to the \fBrsa\fR utility with the \fB\-inform \s-1NET\s0\fR option. If you get
-an error after entering the password try the \fB\-sgckey\fR option.
+to the \fBrsa\fR utility with the \fB\-inform \s-1NET\s0\fR option.
 .SH "EXAMPLES"
 .IX Header "EXAMPLES"
 To remove the pass phrase on an \s-1RSA\s0 private key:
@@ -331,3 +331,11 @@ without having to manually edit them.
 .IX Header "SEE ALSO"
 \&\fIpkcs8\fR\|(1), \fIdsa\fR\|(1), \fIgenrsa\fR\|(1),
 \&\fIgendsa\fR\|(1)
+.SH "COPYRIGHT"
+.IX Header "COPYRIGHT"
+Copyright 2000\-2018 The OpenSSL Project Authors. All Rights Reserved.
+.PP
+Licensed under the OpenSSL license (the \*(L"License\*(R").  You may not use
+this file except in compliance with the License.  You can obtain a copy
+in the file \s-1LICENSE\s0 in the source distribution or at
+<https://www.openssl.org/source/license.html>.