Merging upstream version 4.23.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 20 insertions, 8 deletions

diff --git a/upstream/debian-unstable/man1/openssl-genpkey.1ssl b/upstream/debian-unstable/man1/openssl-genpkey.1ssl
index 162d35e2..a5438706 100644
--- a/upstream/debian-unstable/man1/openssl-genpkey.1ssl
+++ b/upstream/debian-unstable/man1/openssl-genpkey.1ssl
@@ -55,19 +55,21 @@
 .\" ========================================================================
 .\"
 .IX Title "OPENSSL-GENPKEY 1SSL"
-.TH OPENSSL-GENPKEY 1SSL 2024-02-03 3.1.5 OpenSSL
+.TH OPENSSL-GENPKEY 1SSL 2024-04-04 3.2.2-dev 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\-genpkey \- generate a private key
+openssl\-genpkey \- generate a private key or key pair
 .SH SYNOPSIS
 .IX Header "SYNOPSIS"
 \&\fBopenssl\fR \fBgenpkey\fR
 [\fB\-help\fR]
 [\fB\-out\fR \fIfilename\fR]
+[\fB\-outpubkey\fR \fIfilename\fR]
 [\fB\-outform\fR \fBDER\fR|\fBPEM\fR]
+[\fB\-verbose\fR]
 [\fB\-quiet\fR]
 [\fB\-pass\fR \fIarg\fR]
 [\fB\-\fR\f(BIcipher\fR]
@@ -83,7 +85,7 @@ openssl\-genpkey \- generate a private key
 [\fB\-config\fR \fIconfigfile\fR]
 .SH DESCRIPTION
 .IX Header "DESCRIPTION"
-This command generates a private key.
+This command generates a private key or key pair.
 .SH OPTIONS
 .IX Header "OPTIONS"
 .IP \fB\-help\fR 4
@@ -91,14 +93,21 @@ This command generates a private key.
 Print out a usage message.
 .IP "\fB\-out\fR \fIfilename\fR" 4
 .IX Item "-out filename"
-Output the key to the specified file. If this argument is not specified then
-standard output is used.
+Output the private key to the specified file. If this argument is not
+specified then standard output is used.
+.IP "\fB\-outpubkey\fR \fIfilename\fR" 4
+.IX Item "-outpubkey filename"
+Output the public key to the specified file. If this argument is not
+specified then the public key is not output.
 .IP "\fB\-outform\fR \fBDER\fR|\fBPEM\fR" 4
 .IX Item "-outform DER|PEM"
 The output format, except when \fB\-genparam\fR is given; the default is \fBPEM\fR.
 See \fBopenssl\-format\-options\fR\|(1) for details.
 .Sp
 When \fB\-genparam\fR is given, \fB\-outform\fR is ignored.
+.IP \fB\-verbose\fR 4
+.IX Item "-verbose"
+Output "status dots" while generating keys.
 .IP \fB\-quiet\fR 4
 .IX Item "-quiet"
 Do not output "status dots" while generating keys.
@@ -114,8 +123,8 @@ name accepted by \fBEVP_get_cipherbyname()\fR is acceptable such as \fBdes3\fR.
 .IX Item "-algorithm alg"
 Public key algorithm to use such as RSA, DSA, DH or DHX. If used this option must
 precede any \fB\-pkeyopt\fR options. The options \fB\-paramfile\fR and \fB\-algorithm\fR
-are mutually exclusive. Engines may add algorithms in addition to the standard
-built-in ones.
+are mutually exclusive. Engines or providers may add algorithms in addition to
+the standard built-in ones.
 .Sp
 Valid built-in algorithm names for private key generation are RSA, RSA-PSS, EC,
 X25519, X448, ED25519 and ED448.
@@ -131,6 +140,9 @@ Set the public key algorithm option \fIopt\fR to \fIvalue\fR. The precise set of
 options supported depends on the public key algorithm used and its
 implementation. See "KEY GENERATION OPTIONS" and
 "PARAMETER GENERATION OPTIONS" below for more details.
+.Sp
+To list the possible \fIopt\fR values for an algorithm use:
+\&\fBopenssl\fR \fBgenpkey\fR \-algorithm XXX \-help
 .IP \fB\-genparam\fR 4
 .IX Item "-genparam"
 Generate a set of parameters instead of a private key. If used this option must
@@ -525,7 +537,7 @@ The ability to generate X448, ED25519 and ED448 keys was added in OpenSSL 1.1.1.
 The \fB\-engine\fR option was deprecated in OpenSSL 3.0.
 .SH COPYRIGHT
 .IX Header "COPYRIGHT"
-Copyright 2006\-2022 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2006\-2023 The OpenSSL Project Authors. All Rights Reserved.
 .PP
 Licensed under the Apache License 2.0 (the "License").  You may not use
 this file except in compliance with the License.  You can obtain a copy