Merging upstream version 4.23.0.

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

1 files changed, 12 insertions, 6 deletions

diff --git a/upstream/debian-unstable/man3/OSSL_STORE_open.3ssl b/upstream/debian-unstable/man3/OSSL_STORE_open.3ssl
index 50981a59..5dd8fdff 100644
--- a/upstream/debian-unstable/man3/OSSL_STORE_open.3ssl
+++ b/upstream/debian-unstable/man3/OSSL_STORE_open.3ssl
@@ -55,7 +55,7 @@
 .\" ========================================================================
 .\"
 .IX Title "OSSL_STORE_OPEN 3SSL"
-.TH OSSL_STORE_OPEN 3SSL 2024-02-03 3.1.5 OpenSSL
+.TH OSSL_STORE_OPEN 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,7 +63,7 @@
 .SH NAME
 OSSL_STORE_CTX, OSSL_STORE_post_process_info_fn,
 OSSL_STORE_open, OSSL_STORE_open_ex,
-OSSL_STORE_ctrl, OSSL_STORE_load, OSSL_STORE_eof,
+OSSL_STORE_ctrl, OSSL_STORE_load, OSSL_STORE_eof, OSSL_STORE_delete,
 OSSL_STORE_error, OSSL_STORE_close
 \&\- Types and functions to read objects from a URI
 .SH SYNOPSIS
@@ -89,6 +89,9 @@ OSSL_STORE_error, OSSL_STORE_close
 \&
 \& OSSL_STORE_INFO *OSSL_STORE_load(OSSL_STORE_CTX *ctx);
 \& int OSSL_STORE_eof(OSSL_STORE_CTX *ctx);
+\& int OSSL_STORE_delete(const char *uri, OSSL_LIB_CTX *libctx, const char *propq,
+\&                       const UI_METHOD *ui_method, void *ui_data,
+\&                       const OSSL_PARAM params[]);
 \& int OSSL_STORE_error(OSSL_STORE_CTX *ctx);
 \& int OSSL_STORE_close(OSSL_STORE_CTX *ctx);
 .Ve
@@ -158,6 +161,8 @@ Any other value is an error.
 \&\fBOSSL_STORE_load()\fR takes a \fBOSSL_STORE_CTX\fR and tries to load the next
 available object and return it wrapped with \fBOSSL_STORE_INFO\fR.
 .PP
+\&\fBOSSL_STORE_delete()\fR deletes the object identified by \fIuri\fR.
+.PP
 \&\fBOSSL_STORE_eof()\fR takes a \fBOSSL_STORE_CTX\fR and checks if we've reached the end
 of data.
 .PP
@@ -204,13 +209,16 @@ or an error occurred, 0 otherwise.
 \&\fBOSSL_STORE_error()\fR returns 1 if an error occurred in an \fBOSSL_STORE_load()\fR call,
 otherwise 0.
 .PP
-\&\fBOSSL_STORE_ctrl()\fR and \fBOSSL_STORE_close()\fR returns 1 on success, or 0 on failure.
+\&\fBOSSL_STORE_delete()\fR, \fBOSSL_STORE_ctrl()\fR and \fBOSSL_STORE_close()\fR return 1 on
+success, or 0 on failure.
 .SH "SEE ALSO"
 .IX Header "SEE ALSO"
 \&\fBossl_store\fR\|(7), \fBOSSL_STORE_INFO\fR\|(3), \fBOSSL_STORE_register_loader\fR\|(3),
 \&\fBpassphrase\-encoding\fR\|(7)
 .SH HISTORY
 .IX Header "HISTORY"
+\&\fBOSSL_STORE_delete()\fR was added in OpenSSL 3.2.
+.PP
 \&\fBOSSL_STORE_open_ex()\fR was added in OpenSSL 3.0.
 .PP
 \&\fBOSSL_STORE_CTX\fR, \fBOSSL_STORE_post_process_info_fn()\fR, \fBOSSL_STORE_open()\fR,
@@ -220,12 +228,10 @@ were added in OpenSSL 1.1.1.
 Handling of NULL \fIctx\fR argument for \fBOSSL_STORE_close()\fR
 was introduced in OpenSSL 1.1.1h.
 .PP
-\&\fBOSSL_STORE_open_ex()\fR was added in OpenSSL 3.0.
-.PP
 \&\fBOSSL_STORE_ctrl()\fR and \fBOSSL_STORE_vctrl()\fR were deprecated in OpenSSL 3.0.
 .SH COPYRIGHT
 .IX Header "COPYRIGHT"
-Copyright 2016\-2022 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2016\-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