2 files changed, 8 insertions, 8 deletions
diff --git a/src/lib/libcrypto/man/CMS_add1_signer.3 b/src/lib/libcrypto/man/CMS_add1_signer.3
index 720a27f293..316d63c5ad 100644
--- a/src/lib/libcrypto/man/CMS_add1_signer.3
+++ b/src/lib/libcrypto/man/CMS_add1_signer.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: CMS_add1_signer.3,v 1.9 2024/03/29 06:43:12 tb Exp $
+.\" $OpenBSD: CMS_add1_signer.3,v 1.10 2024/04/18 16:50:22 tb Exp $
 .\" full merge up to: OpenSSL e9b77246 Jan 20 19:58:49 2017 +0100
 .\"
 .\" This file is a derived work.
@@ -65,7 +65,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 .\" OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: March 29 2024 $
+.Dd $Mdocdate: April 18 2024 $
 .Dt CMS_ADD1_SIGNER 3
 .Os
 .Sh NAME
@@ -196,8 +196,8 @@ By default, issuer name and serial number are used instead.
 If present, the
 .Vt SMIMECapabilities
 attribute indicates support for the
-following algorithms in preference order: 256-bit AES, Gost R3411-94,
+following algorithms in preference order: 256-bit AES,
-Gost 28147-89, 192-bit AES, 128-bit AES, triple DES, 128-bit RC2, 64-bit
+192-bit AES, 128-bit AES, triple DES, 128-bit RC2, 64-bit
 RC2, DES and 40-bit RC2.
 If any of these algorithms is not available then it will not be
 included.
diff --git a/src/lib/libcrypto/man/CMS_sign.3 b/src/lib/libcrypto/man/CMS_sign.3
index e2daa859d4..5261c190a6 100644
--- a/src/lib/libcrypto/man/CMS_sign.3
+++ b/src/lib/libcrypto/man/CMS_sign.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: CMS_sign.3,v 1.10 2024/03/29 06:43:12 tb Exp $
+.\" $OpenBSD: CMS_sign.3,v 1.11 2024/04/18 16:50:22 tb 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>.
@@ -48,7 +48,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 .\" OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: March 29 2024 $
+.Dd $Mdocdate: April 18 2024 $
 .Dt CMS_SIGN 3
 .Os
 .Sh NAME
@@ -127,8 +127,8 @@ attribute.
 Omit just the
 .Vt SMIMECapabilities .
 If present, the SMIMECapabilities attribute indicates support for the
-following algorithms in preference order: 256-bit AES, Gost R3411-94,
+following algorithms in preference order: 256-bit AES,
-Gost 28147-89, 192-bit AES, 128-bit AES, triple DES, 128-bit RC2, 64-bit
+192-bit AES, 128-bit AES, triple DES, 128-bit RC2, 64-bit
 RC2, DES and 40-bit RC2.
 If any of these algorithms is not available, then it will not be
 included.

diff --git a/src/lib/libcrypto/man/CMS_add1_signer.3 b/src/lib/libcrypto/man/CMS_add1_signer.3 index 720a27f293..316d63c5ad 100644 --- a/src/lib/libcrypto/man/CMS_add1_signer.3 +++ b/src/lib/libcrypto/man/CMS_add1_signer.3
@@ -1,4 +1,4 @@
1	.\" $OpenBSD: CMS_add1_signer.3,v 1.9 2024/03/29 06:43:12 tb Exp $	1	.\" $OpenBSD: CMS_add1_signer.3,v 1.10 2024/04/18 16:50:22 tb Exp $
2	.\" full merge up to: OpenSSL e9b77246 Jan 20 19:58:49 2017 +0100	2	.\" full merge up to: OpenSSL e9b77246 Jan 20 19:58:49 2017 +0100
3	.\"	3	.\"
4	.\" This file is a derived work.	4	.\" This file is a derived work.
@@ -65,7 +65,7 @@
65	.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED	65	.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
66	.\" OF THE POSSIBILITY OF SUCH DAMAGE.	66	.\" OF THE POSSIBILITY OF SUCH DAMAGE.
67	.\"	67	.\"
68	.Dd $Mdocdate: March 29 2024 $	68	.Dd $Mdocdate: April 18 2024 $
69	.Dt CMS_ADD1_SIGNER 3	69	.Dt CMS_ADD1_SIGNER 3
70	.Os	70	.Os
71	.Sh NAME	71	.Sh NAME
@@ -196,8 +196,8 @@ By default, issuer name and serial number are used instead.
196	If present, the	196	If present, the
197	.Vt SMIMECapabilities	197	.Vt SMIMECapabilities
198	attribute indicates support for the	198	attribute indicates support for the
199	following algorithms in preference order: 256-bit AES, Gost R3411-94,	199	following algorithms in preference order: 256-bit AES,
200	Gost 28147-89, 192-bit AES, 128-bit AES, triple DES, 128-bit RC2, 64-bit	200	192-bit AES, 128-bit AES, triple DES, 128-bit RC2, 64-bit
201	RC2, DES and 40-bit RC2.	201	RC2, DES and 40-bit RC2.
202	If any of these algorithms is not available then it will not be	202	If any of these algorithms is not available then it will not be
203	included.	203	included.


diff --git a/src/lib/libcrypto/man/CMS_sign.3 b/src/lib/libcrypto/man/CMS_sign.3 index e2daa859d4..5261c190a6 100644 --- a/src/lib/libcrypto/man/CMS_sign.3 +++ b/src/lib/libcrypto/man/CMS_sign.3
@@ -1,4 +1,4 @@
1	.\" $OpenBSD: CMS_sign.3,v 1.10 2024/03/29 06:43:12 tb Exp $	1	.\" $OpenBSD: CMS_sign.3,v 1.11 2024/04/18 16:50:22 tb Exp $
2	.\" full merge up to: OpenSSL e9b77246 Jan 20 19:58:49 2017 +0100	2	.\" full merge up to: OpenSSL e9b77246 Jan 20 19:58:49 2017 +0100
3	.\"	3	.\"
4	.\" This file was written by Dr. Stephen Henson <steve@openssl.org>.	4	.\" This file was written by Dr. Stephen Henson <steve@openssl.org>.
@@ -48,7 +48,7 @@
48	.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED	48	.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
49	.\" OF THE POSSIBILITY OF SUCH DAMAGE.	49	.\" OF THE POSSIBILITY OF SUCH DAMAGE.
50	.\"	50	.\"
51	.Dd $Mdocdate: March 29 2024 $	51	.Dd $Mdocdate: April 18 2024 $
52	.Dt CMS_SIGN 3	52	.Dt CMS_SIGN 3
53	.Os	53	.Os
54	.Sh NAME	54	.Sh NAME
@@ -127,8 +127,8 @@ attribute.
127	Omit just the	127	Omit just the
128	.Vt SMIMECapabilities .	128	.Vt SMIMECapabilities .
129	If present, the SMIMECapabilities attribute indicates support for the	129	If present, the SMIMECapabilities attribute indicates support for the
130	following algorithms in preference order: 256-bit AES, Gost R3411-94,	130	following algorithms in preference order: 256-bit AES,
131	Gost 28147-89, 192-bit AES, 128-bit AES, triple DES, 128-bit RC2, 64-bit	131	192-bit AES, 128-bit AES, triple DES, 128-bit RC2, 64-bit
132	RC2, DES and 40-bit RC2.	132	RC2, DES and 40-bit RC2.
133	If any of these algorithms is not available, then it will not be	133	If any of these algorithms is not available, then it will not be
134	included.	134	included.