Merge OpenSSL 1.0.2e.

1 files changed, 8 insertions, 9 deletions

diff --git a/secure/usr.bin/openssl/man/req.1 b/secure/usr.bin/openssl/man/req.1
index a404c1c..d173049 100644
--- a/secure/usr.bin/openssl/man/req.1
+++ b/secure/usr.bin/openssl/man/req.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.30)
+.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.28)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -133,7 +133,7 @@
 .\" ========================================================================
 .\"
 .IX Title "REQ 1"
-.TH REQ 1 "2015-07-09" "1.0.2d" "OpenSSL"
+.TH REQ 1 "2015-12-03" "1.0.2e" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -165,7 +165,6 @@ req \- PKCS#10 certificate request and certificate generating utility.
 [\fB\-keygen_engine id\fR]
 [\fB\-[digest]\fR]
 [\fB\-config filename\fR]
-[\fB\-subj arg\fR]
 [\fB\-multivalue\-rdn\fR]
 [\fB\-x509\fR]
 [\fB\-days n\fR]
@@ -564,7 +563,7 @@ be input by calling it \*(L"1.organizationName\*(R".
 The actual permitted field names are any object identifier short or
 long names. These are compiled into OpenSSL and include the usual
 values such as commonName, countryName, localityName, organizationName,
-organizationUnitName, stateOrProvinceName. Additionally emailAddress
+organizationalUnitName, stateOrProvinceName. Additionally emailAddress
 is include as well as name, surname, givenName initials and dnQualifier.
 .PP
 Additional object identifiers can be defined with the \fBoid_file\fR or
@@ -581,20 +580,20 @@ Examine and verify certificate request:
 Create a private key and then generate a certificate request from it:
 .PP
 .Vb 2
-\& openssl genrsa \-out key.pem 1024
+\& openssl genrsa \-out key.pem 2048
 \& openssl req \-new \-key key.pem \-out req.pem
 .Ve
 .PP
 The same but just using req:
 .PP
 .Vb 1
-\& openssl req \-newkey rsa:1024 \-keyout key.pem \-out req.pem
+\& openssl req \-newkey rsa:2048 \-keyout key.pem \-out req.pem
 .Ve
 .PP
 Generate a self signed root certificate:
 .PP
 .Vb 1
-\& openssl req \-x509 \-newkey rsa:1024 \-keyout key.pem \-out req.pem
+\& openssl req \-x509 \-newkey rsa:2048 \-keyout key.pem \-out req.pem
 .Ve
 .PP
 Example of a file pointed to by the \fBoid_file\fR option:
@@ -616,7 +615,7 @@ Sample configuration file prompting for field values:
 .PP
 .Vb 6
 \& [ req ]
-\& default_bits           = 1024
+\& default_bits           = 2048
 \& default_keyfile        = privkey.pem
 \& distinguished_name     = req_distinguished_name
 \& attributes             = req_attributes
@@ -658,7 +657,7 @@ Sample configuration containing all field values:
 \& RANDFILE               = $ENV::HOME/.rnd
 \&
 \& [ req ]
-\& default_bits           = 1024
+\& default_bits           = 2048
 \& default_keyfile        = keyfile.pem
 \& distinguished_name     = req_distinguished_name
 \& attributes             = req_attributes