Merging upstream version 4.23.0.

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

1 files changed, 42 insertions, 12 deletions

diff --git a/upstream/debian-unstable/man3/X509_PUBKEY_new.3ssl b/upstream/debian-unstable/man3/X509_PUBKEY_new.3ssl
index cb40e2c3..d27cf10b 100644
--- a/upstream/debian-unstable/man3/X509_PUBKEY_new.3ssl
+++ b/upstream/debian-unstable/man3/X509_PUBKEY_new.3ssl
@@ -55,7 +55,7 @@
 .\" ========================================================================
 .\"
 .IX Title "X509_PUBKEY_NEW 3SSL"
-.TH X509_PUBKEY_NEW 3SSL 2024-02-03 3.1.5 OpenSSL
+.TH X509_PUBKEY_NEW 3SSL 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
@@ -63,8 +63,9 @@
 .SH NAME
 X509_PUBKEY_new_ex, X509_PUBKEY_new, X509_PUBKEY_free, X509_PUBKEY_dup,
 X509_PUBKEY_set, X509_PUBKEY_get0, X509_PUBKEY_get,
-d2i_PUBKEY_ex, d2i_PUBKEY, i2d_PUBKEY, d2i_PUBKEY_bio, d2i_PUBKEY_fp,
-i2d_PUBKEY_fp, i2d_PUBKEY_bio, X509_PUBKEY_set0_param, X509_PUBKEY_get0_param,
+d2i_PUBKEY_ex, d2i_PUBKEY, i2d_PUBKEY, d2i_PUBKEY_ex_bio, d2i_PUBKEY_bio,
+d2i_PUBKEY_ex_fp, d2i_PUBKEY_fp, i2d_PUBKEY_fp, i2d_PUBKEY_bio,
+X509_PUBKEY_set0_public_key, X509_PUBKEY_set0_param, X509_PUBKEY_get0_param,
 X509_PUBKEY_eq \- SubjectPublicKeyInfo public key functions
 .SH SYNOPSIS
 .IX Header "SYNOPSIS"
@@ -85,12 +86,19 @@ X509_PUBKEY_eq \- SubjectPublicKeyInfo public key functions
 \& EVP_PKEY *d2i_PUBKEY(EVP_PKEY **a, const unsigned char **pp, long length);
 \& int i2d_PUBKEY(const EVP_PKEY *a, unsigned char **pp);
 \&
+\& EVP_PKEY *d2i_PUBKEY_ex_bio(BIO *bp, EVP_PKEY **a, OSSL_LIB_CTX *libctx,
+\&                             const char *propq);
 \& EVP_PKEY *d2i_PUBKEY_bio(BIO *bp, EVP_PKEY **a);
+\&
+\& EVP_PKEY *d2i_PUBKEY_ex_fp(FILE *fp, EVP_PKEY **a, OSSL_LIB_CTX *libctx,
+\&                            const char *propq);
 \& EVP_PKEY *d2i_PUBKEY_fp(FILE *fp, EVP_PKEY **a);
 \&
 \& int i2d_PUBKEY_fp(const FILE *fp, EVP_PKEY *pkey);
 \& int i2d_PUBKEY_bio(BIO *bp, const EVP_PKEY *pkey);
 \&
+\& void X509_PUBKEY_set0_public_key(X509_PUBKEY *pub,
+\&                                  unsigned char *penc, int penclen);
 \& int X509_PUBKEY_set0_param(X509_PUBKEY *pub, ASN1_OBJECT *aobj,
 \&                            int ptype, void *pval,
 \&                            unsigned char *penc, int penclen);
@@ -144,13 +152,23 @@ format.
 similar to \fBd2i_PUBKEY()\fR and \fBi2d_PUBKEY()\fR except they decode or encode using a
 \&\fBBIO\fR or \fBFILE\fR pointer.
 .PP
-\&\fBX509_PUBKEY_set0_param()\fR sets the public key parameters of \fIpub\fR. The
-OID associated with the algorithm is set to \fIaobj\fR. The type of the
+\&\fBd2i_PUBKEY_ex_bio()\fR and \fBd2i_PUBKEY_ex_fp()\fR are similar to \fBd2i_PUBKEY_ex()\fR except
+they decode using a \fBBIO\fR or \fBFILE\fR pointer.
+.PP
+\&\fBX509_PUBKEY_set0_public_key()\fR sets the public-key encoding of \fIpub\fR
+to the \fIpenclen\fR bytes contained in buffer \fIpenc\fR.
+Any earlier public-key encoding in \fIpub\fR is freed.
+\&\fIpenc\fR may be NULL to indicate that there is no actual public key data.
+Ownership of the \fIpenc\fR argument is passed to \fIpub\fR.
+.PP
+\&\fBX509_PUBKEY_set0_param()\fR sets the public-key parameters of \fIpub\fR.
+The OID associated with the algorithm is set to \fIaobj\fR. The type of the
 algorithm parameters is set to \fItype\fR using the structure \fIpval\fR.
-The encoding of the public key itself is set to the \fIpenclen\fR
-bytes contained in buffer \fIpenc\fR. On success ownership of all the supplied
-parameters is passed to \fIpub\fR so they must not be freed after the
-call.
+If \fIpenc\fR is not NULL the encoding of the public key itself is set
+to the \fIpenclen\fR bytes contained in buffer \fIpenc\fR and
+any earlier public-key encoding in \fIpub\fR is freed.
+On success ownership of all the supplied arguments is passed to \fIpub\fR
+so they must not be freed after the call.
 .PP
 \&\fBX509_PUBKEY_get0_param()\fR retrieves the public key parameters from \fIpub\fR,
 \&\fI*ppkalg\fR is set to the associated OID and the encoding consists of
@@ -176,8 +194,17 @@ Otherwise they return a pointer to the newly allocated structure.
 .PP
 \&\fBX509_PUBKEY_free()\fR does not return a value.
 .PP
-\&\fBX509_PUBKEY_get0()\fR and \fBX509_PUBKEY_get()\fR return a pointer to an \fBEVP_PKEY\fR
-structure or NULL if an error occurs.
+\&\fBX509_PUBKEY_get0()\fR, \fBX509_PUBKEY_get()\fR, \fBd2i_PUBKEY_ex()\fR, \fBd2i_PUBKEY()\fR,
+\&\fBd2i_PUBKEY_ex_bio()\fR, \fBd2i_PUBKEY_bio()\fR, \fBd2i_PUBKEY_ex_fp()\fR and \fBd2i_PUBKEY_fp()\fR
+return a pointer to an \fBEVP_PKEY\fR structure or NULL if an error occurs.
+.PP
+\&\fBi2d_PUBKEY()\fR returns the number of bytes successfully encoded or a
+negative value if an error occurs.
+.PP
+\&\fBi2d_PUBKEY_fp()\fR and \fBi2d_PUBKEY_bio()\fR return 1 if successfully
+encoded or 0 if an error occurs.
+.PP
+\&\fBX509_PUBKEY_set0_public_key()\fR does not return a value.
 .PP
 \&\fBX509_PUBKEY_set()\fR, \fBX509_PUBKEY_set0_param()\fR and \fBX509_PUBKEY_get0_param()\fR
 return 1 for success and 0 if an error occurred.
@@ -192,9 +219,12 @@ return 1 for success and 0 if an error occurred.
 .IX Header "HISTORY"
 The \fBX509_PUBKEY_new_ex()\fR and \fBX509_PUBKEY_eq()\fR functions were added in OpenSSL
 3.0.
+.PP
+The \fBX509_PUBKEY_set0_public_key()\fR, \fBd2i_PUBKEY_ex_bio()\fR and \fBd2i_PUBKEY_ex_fp()\fR
+functions were added in OpenSSL 3.2.
 .SH COPYRIGHT
 .IX Header "COPYRIGHT"
-Copyright 2016\-2021 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2016\-2022 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