Merging upstream version 4.23.0.

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

1 files changed, 19 insertions, 5 deletions

diff --git a/upstream/debian-unstable/man3/PKCS12_SAFEBAG_get1_cert.3ssl b/upstream/debian-unstable/man3/PKCS12_SAFEBAG_get1_cert.3ssl
index 16dd7439..1f027349 100644
--- a/upstream/debian-unstable/man3/PKCS12_SAFEBAG_get1_cert.3ssl
+++ b/upstream/debian-unstable/man3/PKCS12_SAFEBAG_get1_cert.3ssl
@@ -55,7 +55,7 @@
 .\" ========================================================================
 .\"
 .IX Title "PKCS12_SAFEBAG_GET1_CERT 3SSL"
-.TH PKCS12_SAFEBAG_GET1_CERT 3SSL 2024-02-03 3.1.5 OpenSSL
+.TH PKCS12_SAFEBAG_GET1_CERT 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
@@ -64,7 +64,8 @@
 PKCS12_SAFEBAG_get0_attr, PKCS12_SAFEBAG_get0_type,
 PKCS12_SAFEBAG_get_nid, PKCS12_SAFEBAG_get_bag_nid,
 PKCS12_SAFEBAG_get0_bag_obj, PKCS12_SAFEBAG_get0_bag_type,
-PKCS12_SAFEBAG_get1_cert, PKCS12_SAFEBAG_get1_crl,
+PKCS12_SAFEBAG_get1_cert_ex, PKCS12_SAFEBAG_get1_cert,
+PKCS12_SAFEBAG_get1_crl_ex, PKCS12_SAFEBAG_get1_crl,
 PKCS12_SAFEBAG_get0_safes, PKCS12_SAFEBAG_get0_p8inf,
 PKCS12_SAFEBAG_get0_pkcs8 \- Get objects from a PKCS#12 safeBag
 .SH SYNOPSIS
@@ -79,7 +80,11 @@ PKCS12_SAFEBAG_get0_pkcs8 \- Get objects from a PKCS#12 safeBag
 \& int PKCS12_SAFEBAG_get_bag_nid(const PKCS12_SAFEBAG *bag);
 \& const ASN1_TYPE *PKCS12_SAFEBAG_get0_bag_obj(const PKCS12_SAFEBAG *bag);
 \& const ASN1_OBJECT *PKCS12_SAFEBAG_get0_bag_type(const PKCS12_SAFEBAG *bag);
+\& X509_CRL *PKCS12_SAFEBAG_get1_cert_ex(const PKCS12_SAFEBAG *bag,
+\&                                       OSSL_LIB_CTX *libctx, const char *propq);
 \& X509 *PKCS12_SAFEBAG_get1_cert(const PKCS12_SAFEBAG *bag);
+\& X509_CRL *PKCS12_SAFEBAG_get1_crl_ex(const PKCS12_SAFEBAG *bag,
+\&                                      OSSL_LIB_CTX *libctx, const char *propq);
 \& X509_CRL *PKCS12_SAFEBAG_get1_crl(const PKCS12_SAFEBAG *bag);
 \& const STACK_OF(PKCS12_SAFEBAG) *PKCS12_SAFEBAG_get0_safes(const PKCS12_SAFEBAG *bag);
 \& const PKCS8_PRIV_KEY_INFO *PKCS12_SAFEBAG_get0_p8inf(const PKCS12_SAFEBAG *bag);
@@ -100,8 +105,13 @@ arbitrary for \fBsecretBag\fRs. \fBPKCS12_SAFEBAG_get0_bag_type()\fR gets this t
 .PP
 \&\fBPKCS12_SAFEBAG_get0_bag_obj()\fR retrieves the object contained within the safeBag.
 .PP
-\&\fBPKCS12_SAFEBAG_get1_cert()\fR and \fBPKCS12_SAFEBAG_get1_crl()\fR return new \fBX509\fR or
-\&\fBX509_CRL\fR objects from the item in the safeBag.
+\&\fBPKCS12_SAFEBAG_get1_cert_ex()\fR and \fBPKCS12_SAFEBAG_get1_crl_ex()\fR return new \fBX509\fR or
+\&\fBX509_CRL\fR objects from the item in the safeBag. \fIlibctx\fR and \fIpropq\fR are used when
+fetching algorithms, and may optionally be set to NULL.
+.PP
+\&\fBPKCS12_SAFEBAG_get1_cert()\fR and \fBPKCS12_SAFEBAG_get1_crl()\fR are the same as
+\&\fBPKCS12_SAFEBAG_get1_cert_ex()\fR and \fBPKCS12_SAFEBAG_get1_crl_ex()\fR and set the \fIlibctx\fR and
+\&\fIprop\fR to NULL. This will use the default library context.
 .PP
 \&\fBPKCS12_SAFEBAG_get0_p8inf()\fR and \fBPKCS12_SAFEBAG_get0_pkcs8()\fR return the PKCS8 object
 from a PKCS8shroudedKeyBag or a keyBag.
@@ -118,9 +128,13 @@ Other functions return a valid object of the specified type or NULL if an error
 \&\fBPKCS12_create\fR\|(3),
 \&\fBPKCS12_add_safe\fR\|(3),
 \&\fBPKCS12_add_safes\fR\|(3)
+.SH HISTORY
+.IX Header "HISTORY"
+The functions \fBPKCS12_SAFEBAG_get1_cert_ex()\fR and \fBPKCS12_SAFEBAG_get1_crl_ex()\fR were
+added in OpenSSL 3.2.
 .SH COPYRIGHT
 .IX Header "COPYRIGHT"
-Copyright 2019\-2021 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2019\-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