Merging upstream version 4.23.0.

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

1 files changed, 8 insertions, 6 deletions

diff --git a/upstream/debian-unstable/man3/CMS_EnvelopedData_create.3ssl b/upstream/debian-unstable/man3/CMS_EnvelopedData_create.3ssl
index a0d36032..a801e4e4 100644
--- a/upstream/debian-unstable/man3/CMS_EnvelopedData_create.3ssl
+++ b/upstream/debian-unstable/man3/CMS_EnvelopedData_create.3ssl
@@ -55,7 +55,7 @@
 .\" ========================================================================
 .\"
 .IX Title "CMS_ENVELOPEDDATA_CREATE 3SSL"
-.TH CMS_ENVELOPEDDATA_CREATE 3SSL 2024-02-03 3.1.5 OpenSSL
+.TH CMS_ENVELOPEDDATA_CREATE 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
@@ -101,18 +101,20 @@ The recipients can be added later using \fBCMS_add1_recipient_cert\fR\|(3) or
 The \fBCMS_ContentInfo\fR structure needs to be finalized using \fBCMS_final\fR\|(3)
 and then freed using \fBCMS_ContentInfo_free\fR\|(3).
 .PP
-\&\fBCMS_EnvelopedData_create()\fR and  CMS_AuthEnvelopedData_create are similar to
-\&\fBCMS_EnvelopedData_create_ex()\fR and
-\&\fBCMS_AuthEnvelopedData_create_ex()\fR but use default values of NULL for
+\&\fBCMS_EnvelopedData_create()\fR and \fBCMS_AuthEnvelopedData_create()\fR are similar to
+\&\fBCMS_EnvelopedData_create_ex()\fR and \fBCMS_AuthEnvelopedData_create_ex()\fR
+but use default values of NULL for
 the library context \fIlibctx\fR and the property query \fIpropq\fR.
 .SH NOTES
 .IX Header "NOTES"
-Although \fBCMS_EnvelopedData_create()\fR and \fBCMS_AuthEnvelopedData_create()\fR allocate
+Although \fBCMS_EnvelopedData_create_ex()\fR, and \fBCMS_EnvelopedData_create()\fR,
+\&\fBCMS_AuthEnvelopedData_create_ex()\fR, and \fBCMS_AuthEnvelopedData_create()\fR allocate
 a new \fBCMS_ContentInfo\fR structure, they are not usually used in applications.
 The wrappers \fBCMS_encrypt\fR\|(3) and \fBCMS_decrypt\fR\|(3) are often used instead.
 .SH "RETURN VALUES"
 .IX Header "RETURN VALUES"
-If the allocation fails, \fBCMS_EnvelopedData_create()\fR and
+If the allocation fails, \fBCMS_EnvelopedData_create_ex()\fR,
+\&\fBCMS_EnvelopedData_create()\fR, \fBCMS_AuthEnvelopedData_create_ex()\fR, and
 \&\fBCMS_AuthEnvelopedData_create()\fR return NULL and set an error code that can be
 obtained by \fBERR_get_error\fR\|(3). Otherwise they return a pointer to the newly
 allocated structure.