From 19f9a4a6a75ddb174cd77d6e0749b6fe9979e7c0 Mon Sep 17 00:00:00 2001
From: schwarze <>
Date: Wed, 3 Jun 2020 13:41:27 +0000
Subject: Properly document PKCS7_final(3), which was already mentioned in
 passing in some other manual pages.

---
 src/lib/libcrypto/man/PKCS7_encrypt.3 | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'src/lib/libcrypto/man/PKCS7_encrypt.3')

diff --git a/src/lib/libcrypto/man/PKCS7_encrypt.3 b/src/lib/libcrypto/man/PKCS7_encrypt.3
index 4d1b435f15..700498a1de 100644
--- a/src/lib/libcrypto/man/PKCS7_encrypt.3
+++ b/src/lib/libcrypto/man/PKCS7_encrypt.3
@@ -1,5 +1,5 @@
-.\"	$OpenBSD: PKCS7_encrypt.3,v 1.10 2019/06/10 14:58:48 schwarze Exp $
-.\"	OpenSSL 99d63d46 Oct 26 13:56:48 2016 -0400
+.\" $OpenBSD: PKCS7_encrypt.3,v 1.11 2020/06/03 13:41:27 schwarze Exp $
+.\" full merge up to: OpenSSL e9b77246 Jan 20 19:58:49 2017 +0100
 .\"
 .\" This file was written by Dr. Stephen Henson <steve@openssl.org>.
 .\" Copyright (c) 2002, 2006, 2007, 2008, 2009 The OpenSSL Project.
@@ -49,7 +49,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 .\" OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: June 10 2019 $
+.Dd $Mdocdate: June 3 2020 $
 .Dt PKCS7_ENCRYPT 3
 .Os
 .Sh NAME
@@ -133,11 +133,12 @@ properly finalize the
 .Vt PKCS7
 structure will give unpredictable results.
 .Pp
-Several functions, including
+Several functions including
+.Xr PKCS7_final 3 ,
 .Xr SMIME_write_PKCS7 3 ,
-.Xr i2d_PKCS7_bio_stream 3 ,
-and
 .Xr PEM_write_bio_PKCS7_stream 3 ,
+and
+.Xr i2d_PKCS7_bio_stream 3
 finalize the structure.
 Alternatively finalization can be performed by obtaining the streaming
 ASN.1
@@ -155,6 +156,7 @@ The error can be obtained from
 .Xr ERR_get_error 3 .
 .Sh SEE ALSO
 .Xr PKCS7_decrypt 3 ,
+.Xr PKCS7_final 3 ,
 .Xr PKCS7_new 3 ,
 .Xr PKCS7_sign 3
 .Sh HISTORY
-- 
cgit v1.2.3-55-g6feb