From f181b64f3a3132cba59c1ed4b915a094cc7b908c Mon Sep 17 00:00:00 2001 From: tb Date: Tue, 5 Mar 2024 19:21:31 +0000 Subject: [PATCH] Remove GOST documentation --- lib/libcrypto/man/ERR_load_crypto_strings.3 | 5 ++-- lib/libcrypto/man/EVP_PKCS82PKEY.3 | 6 ++--- lib/libcrypto/man/EVP_PKEY_cmp.3 | 6 ++--- lib/libcrypto/man/EVP_PKEY_derive.3 | 5 ++-- .../man/EVP_PKEY_get_default_digest_nid.3 | 6 ++--- lib/libcrypto/man/EVP_PKEY_set1_RSA.3 | 24 +++---------------- lib/libcrypto/man/EVP_PKEY_size.3 | 7 ++---- 7 files changed, 17 insertions(+), 42 deletions(-) diff --git a/lib/libcrypto/man/ERR_load_crypto_strings.3 b/lib/libcrypto/man/ERR_load_crypto_strings.3 index 72d10b030c7..2bca8af60f7 100644 --- a/lib/libcrypto/man/ERR_load_crypto_strings.3 +++ b/lib/libcrypto/man/ERR_load_crypto_strings.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: ERR_load_crypto_strings.3,v 1.11 2023/07/21 10:45:44 tb Exp $ +.\" $OpenBSD: ERR_load_crypto_strings.3,v 1.12 2024/03/05 19:21:31 tb Exp $ .\" full merge up to: OpenSSL f672aee4 Feb 9 11:52:40 2016 -0500 .\" selective merge up to: OpenSSL b3696a55 Sep 2 09:35:50 2017 -0400 .\" @@ -66,7 +66,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED .\" OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: July 21 2023 $ +.Dd $Mdocdate: March 5 2024 $ .Dt ERR_LOAD_CRYPTO_STRINGS 3 .Os .Sh NAME @@ -89,7 +89,6 @@ .\" ERR_load_EC_strings() .\" ERR_load_ERR_strings() .\" ERR_load_EVP_strings() -.\" ERR_load_GOST_strings() .\" ERR_load_OBJ_strings() .\" ERR_load_OCSP_strings() .\" ERR_load_PEM_strings() diff --git a/lib/libcrypto/man/EVP_PKCS82PKEY.3 b/lib/libcrypto/man/EVP_PKCS82PKEY.3 index 0f66673886b..30a43b8dca1 100644 --- a/lib/libcrypto/man/EVP_PKCS82PKEY.3 +++ b/lib/libcrypto/man/EVP_PKCS82PKEY.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: EVP_PKCS82PKEY.3,v 1.2 2023/12/21 21:32:01 tb Exp $ +.\" $OpenBSD: EVP_PKCS82PKEY.3,v 1.3 2024/03/05 19:21:31 tb Exp $ .\" .\" Copyright (c) 2021 Ingo Schwarze .\" @@ -14,7 +14,7 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd $Mdocdate: December 21 2023 $ +.Dd $Mdocdate: March 5 2024 $ .Dt EVP_PKCS82PKEY 3 .Os .Sh NAME @@ -39,7 +39,7 @@ creates a PKCS#8 structure representing the private key contained in .Fa pkey . .Pp -Supported algorithms include DH, DSA, EC, GOST2001, and RSA. +Supported algorithms include DH, DSA, EC, and RSA. .Sh RETURN VALUES These functions return a newly allocated object or .Dv NULL diff --git a/lib/libcrypto/man/EVP_PKEY_cmp.3 b/lib/libcrypto/man/EVP_PKEY_cmp.3 index 42bfb6fec03..2e42a9946f1 100644 --- a/lib/libcrypto/man/EVP_PKEY_cmp.3 +++ b/lib/libcrypto/man/EVP_PKEY_cmp.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: EVP_PKEY_cmp.3,v 1.13 2023/09/08 11:37:58 schwarze Exp $ +.\" $OpenBSD: EVP_PKEY_cmp.3,v 1.14 2024/03/05 19:21:31 tb Exp $ .\" full merge up to: OpenSSL 05ea606a May 20 20:52:46 2016 -0400 .\" selective merge up to: OpenSSL 99d63d46 Oct 26 13:56:48 2016 -0400 .\" @@ -67,7 +67,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED .\" OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: September 8 2023 $ +.Dd $Mdocdate: March 5 2024 $ .Dt EVP_PKEY_CMP 3 .Os .Sh NAME @@ -77,7 +77,7 @@ .Nm EVP_PKEY_cmp .\" .Nm EVP_PKEY_save_parameters is intentionally undocumented .\" because nothing uses it according to codesearch.debian.net -.\" and it only affects X509_PUBKEY_set(3) for DSA and GOST2001 keys, +.\" and it only affects X509_PUBKEY_set(3) for DSA, .\" resulting in incomplete output without the public key parameters. .Nd public key parameter and comparison functions .Sh SYNOPSIS diff --git a/lib/libcrypto/man/EVP_PKEY_derive.3 b/lib/libcrypto/man/EVP_PKEY_derive.3 index c82018341da..8940572d1d6 100644 --- a/lib/libcrypto/man/EVP_PKEY_derive.3 +++ b/lib/libcrypto/man/EVP_PKEY_derive.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: EVP_PKEY_derive.3,v 1.9 2023/09/09 14:26:35 schwarze Exp $ +.\" $OpenBSD: EVP_PKEY_derive.3,v 1.10 2024/03/05 19:21:31 tb Exp $ .\" full merge up to: OpenSSL 48e5119a Jan 19 10:49:22 2018 +0100 .\" .\" This file is a derived work. @@ -66,7 +66,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED .\" OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: September 9 2023 $ +.Dd $Mdocdate: March 5 2024 $ .Dt EVP_PKEY_DERIVE 3 .Os .Sh NAME @@ -109,7 +109,6 @@ The library provides built-in support for keys with an of .Dv EVP_PKEY_DH , .Dv EVP_PKEY_EC , -.Dv EVP_PKEY_GOSTR01 , .Dv EVP_PKEY_HKDF , and .Dv EVP_PKEY_X25519 . diff --git a/lib/libcrypto/man/EVP_PKEY_get_default_digest_nid.3 b/lib/libcrypto/man/EVP_PKEY_get_default_digest_nid.3 index bef39987a39..50a0ddba10d 100644 --- a/lib/libcrypto/man/EVP_PKEY_get_default_digest_nid.3 +++ b/lib/libcrypto/man/EVP_PKEY_get_default_digest_nid.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: EVP_PKEY_get_default_digest_nid.3,v 1.7 2023/09/13 14:57:21 schwarze Exp $ +.\" $OpenBSD: EVP_PKEY_get_default_digest_nid.3,v 1.8 2024/03/05 19:21:31 tb Exp $ .\" full merge up to: OpenSSL df75c2bf Dec 9 01:02:36 2018 +0100 .\" .\" This file is a derived work. @@ -66,7 +66,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED .\" OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: September 13 2023 $ +.Dd $Mdocdate: March 5 2024 $ .Dt EVP_PKEY_GET_DEFAULT_DIGEST_NID 3 .Os .Sh NAME @@ -103,8 +103,6 @@ Support for the following public key algorithms is built into the library: .It Dv EVP_PKEY_DSA Ta Dv NID_sha1 Ta mandatory .It Dv EVP_PKEY_EC Ta Dv NID_sha1 Ta mandatory .It Dv EVP_PKEY_ED25519 Ta Dv NID_undef Ta mandatory -.It Dv EVP_PKEY_GOSTIMIT Ta Dv NID_id_Gost28147_89_MAC Ta mandatory -.It Dv EVP_PKEY_GOSTR01 Ta variable Ta mandatory .It Dv EVP_PKEY_HMAC Ta Dv NID_sha1 Ta advisory .It Dv EVP_PKEY_RSA Ta Dv NID_sha256 Ta advisory .El diff --git a/lib/libcrypto/man/EVP_PKEY_set1_RSA.3 b/lib/libcrypto/man/EVP_PKEY_set1_RSA.3 index 4825b6056ec..07db27003e4 100644 --- a/lib/libcrypto/man/EVP_PKEY_set1_RSA.3 +++ b/lib/libcrypto/man/EVP_PKEY_set1_RSA.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: EVP_PKEY_set1_RSA.3,v 1.21 2023/12/21 21:32:01 tb Exp $ +.\" $OpenBSD: EVP_PKEY_set1_RSA.3,v 1.22 2024/03/05 19:21:31 tb Exp $ .\" full merge up to: OpenSSL 99d63d46 Oct 26 13:56:48 2016 -0400 .\" .\" 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: December 21 2023 $ +.Dd $Mdocdate: March 5 2024 $ .Dt EVP_PKEY_SET1_RSA 3 .Os .Sh NAME @@ -87,7 +87,6 @@ .Nm EVP_PKEY_assign_DSA , .Nm EVP_PKEY_assign_DH , .Nm EVP_PKEY_assign_EC_KEY , -.Nm EVP_PKEY_assign_GOST , .Nm EVP_PKEY_assign , .Nm EVP_PKEY_base_id , .Nm EVP_PKEY_id , @@ -182,11 +181,6 @@ .Fa "EC_KEY *key" .Fc .Ft int -.Fo EVP_PKEY_assign_GOST -.Fa "EVP_PKEY *pkey" -.Fa "GOST_KEY *key" -.Fc -.Ft int .Fo EVP_PKEY_assign .Fa "EVP_PKEY *pkey" .Fa "int type" @@ -268,7 +262,6 @@ becomes unspecified. .Fn EVP_PKEY_assign_DSA , .Fn EVP_PKEY_assign_DH , .Fn EVP_PKEY_assign_EC_KEY , -.Fn EVP_PKEY_assign_GOST , and .Fn EVP_PKEY_assign also set the referenced key to @@ -292,9 +285,8 @@ The following types are supported: .Dv EVP_PKEY_RSA , .Dv EVP_PKEY_DSA , .Dv EVP_PKEY_DH , -.Dv EVP_PKEY_EC , and -.Dv EVP_PKEY_GOSTR01 . +.Dv EVP_PKEY_EC . .Pp .Fn EVP_PKEY_base_id returns the type of @@ -307,8 +299,6 @@ according to the following table: .It Dv EVP_PKEY_DH Ta = Dv NID_dhKeyAgreement Ta DH .It Dv EVP_PKEY_DSA Ta = Dv NID_dsa Ta DSA .It Dv EVP_PKEY_EC Ta = Dv NID_X9_62_id_ecPublicKey Ta EC -.It Dv EVP_PKEY_GOSTIMIT Ta = Dv NID_id_Gost28147_89_MAC Ta GOST-MAC -.It Dv EVP_PKEY_GOSTR01 Ta = Dv NID_id_GostR3410_2001 Ta GOST2001 .It Dv EVP_PKEY_HMAC Ta = Dv NID_hmac Ta HMAC .It Dv EVP_PKEY_RSA Ta = Dv NID_rsaEncryption Ta RSA .It Dv EVP_PKEY_RSA_PSS Ta = Dv NID_rsassaPss Ta RSA-PSS @@ -326,8 +316,6 @@ The following deprecated aliases are still supported: .It Dv EVP_PKEY_DSA2 Ta = Dv NID_dsaWithSHA Ta DSA .It Dv EVP_PKEY_DSA3 Ta = Dv NID_dsaWithSHA1 Ta DSA .It Dv EVP_PKEY_DSA4 Ta = Dv NID_dsaWithSHA1_2 Ta DSA -.It Dv EVP_PKEY_GOSTR12_256 Ta = Dv NID_id_tc26_gost3410_2012_256 Ta GOST2001 -.It Dv EVP_PKEY_GOSTR12_512 Ta = Dv NID_id_tc26_gost3410_2012_512 Ta GOST2001 .It Dv EVP_PKEY_RSA2 Ta = Dv NID_rsa Ta RSA .El .Pp @@ -408,7 +396,6 @@ functions must be freed as well as .Fn EVP_PKEY_assign_DSA , .Fn EVP_PKEY_assign_DH , .Fn EVP_PKEY_assign_EC_KEY , -.Fn EVP_PKEY_assign_GOST , .Fn EVP_PKEY_assign , .Fn EVP_PKEY_set_type , and @@ -436,7 +423,6 @@ the return value points to an .Vt DSA , .Vt DH , .Vt EC_KEY , -.Vt GOST_KEY , or .Vt ASN1_OCTET_STRING object depending on the type of @@ -494,10 +480,6 @@ and first appeared in OpenSSL 1.0.0 and have been available since .Ox 4.9 . .Pp -.Fn EVP_PKEY_assign_GOST -first appeared in -.Ox 5.7 . -.Pp .Fn EVP_PKEY_get0_RSA , .Fn EVP_PKEY_get0_DSA , .Fn EVP_PKEY_get0_DH , diff --git a/lib/libcrypto/man/EVP_PKEY_size.3 b/lib/libcrypto/man/EVP_PKEY_size.3 index b45cda7f91f..f49678d0a91 100644 --- a/lib/libcrypto/man/EVP_PKEY_size.3 +++ b/lib/libcrypto/man/EVP_PKEY_size.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: EVP_PKEY_size.3,v 1.2 2023/09/12 15:29:03 schwarze Exp $ +.\" $OpenBSD: EVP_PKEY_size.3,v 1.3 2024/03/05 19:21:31 tb Exp $ .\" full merge up to: OpenSSL eed9d03b Jan 8 11:04:15 2020 +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: September 12 2023 $ +.Dd $Mdocdate: March 5 2024 $ .Dt EVP_PKEY_SIZE 3 .Os .Sh NAME @@ -144,7 +144,6 @@ is supported for the following algorithms: .It DSA Ta Xr DSA_size 3 .It EC Ta Xr ECDSA_size 3 .It ED25519 Ta 64, but see below -.It GOST01 Ta 64 or 128 .It HMAC Ta Dv EVP_MAX_MD_SIZE No = 64 .It RSA Ta Xr RSA_size 3 .It X25519 Ta Dv X25519_KEYLEN No = 32 @@ -173,7 +172,6 @@ By default, the following algorithms are supported: .It DSA Ta the public domain parameter Fa p Ta Xr DSA_bits 3 .It EC Ta the order of the group Ta Xr EC_GROUP_order_bits 3 .It ED25519 Ta 253 Ta \(em -.It GOST01 Ta 256 or 512 Ta \(em .It RSA Ta the public modulus Ta Xr RSA_bits 3 .It X25519 Ta 253 Ta \(em .El @@ -192,7 +190,6 @@ By default, the following algorithms are supported: .It DSA Ta Xr DSA_security_bits 3 .It EC Ta Xr EC_GROUP_order_bits 3 divided by 2 .It ED25519 Ta 128 -.It GOST01 Ta not supported, return value is \-2 .It RSA Ta Xr RSA_security_bits 3 .It X25519 Ta 128 .El -- 2.20.1