Bye bye gost, bye, bye turdiness

ok beck

3 files changed, 3 insertions, 79 deletions

diff --git a/src/lib/libcrypto/evp/evp_local.h b/src/lib/libcrypto/evp/evp_local.h
index dad2cec81e..d0335931e5 100644
--- a/src/lib/libcrypto/evp/evp_local.h
+++ b/src/lib/libcrypto/evp/evp_local.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: evp_local.h,v 1.19 2024/03/02 10:20:27 tb Exp $ */
+/* $OpenBSD: evp_local.h,v 1.20 2024/03/24 06:05:41 tb Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2000.
  */
@@ -173,9 +173,6 @@ struct evp_pkey_st {
                 struct ec_key_st *ec;   /* ECC */
                 struct ecx_key_st *ecx; /* ECX */
 #endif
-#ifndef OPENSSL_NO_GOST
-                struct gost_key_st *gost; /* GOST */
-#endif
         } pkey;
         int save_parameters;
         STACK_OF(X509_ATTRIBUTE) *attributes; /* [ 0 ] */
diff --git a/src/lib/libcrypto/evp/evp_names.c b/src/lib/libcrypto/evp/evp_names.c
index 2936c36622..83c2f53840 100644
--- a/src/lib/libcrypto/evp/evp_names.c
+++ b/src/lib/libcrypto/evp/evp_names.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: evp_names.c,v 1.12 2024/03/02 10:13:13 tb Exp $ */
+/*      $OpenBSD: evp_names.c,v 1.13 2024/03/24 06:05:41 tb Exp $ */
 /*
  * Copyright (c) 2023 Theo Buehler <tb@openbsd.org>
  *
@@ -415,13 +415,6 @@ static const struct cipher_name cipher_names[] = {
         },
 #endif /* OPENSSL_NO_DES */
 
-#ifndef OPENSSL_NO_GOST
-        {
-                .name = LN_id_Gost28147_89,
-                .cipher = EVP_gost2814789_cfb64,
-        },
-#endif /* OPENSSL_NO_GOST */
-
 #ifndef OPENSSL_NO_IDEA
         {
                 .name = "IDEA",
@@ -917,21 +910,6 @@ static const struct cipher_name cipher_names[] = {
         },
 #endif /* OPENSSL_NO_DES */
 
-#ifndef OPENSSL_NO_GOST
-        {
-                .name = SN_id_Gost28147_89,
-                .cipher = EVP_gost2814789_cfb64,
-        },
-        {
-                .name = SN_gost89_cnt,
-                .cipher = EVP_gost2814789_cnt,
-        },
-        {
-                .name = SN_gost89_ecb,
-                .cipher = EVP_gost2814789_ecb,
-        },
-#endif /* OPENSSL_NO_GOST */
-
 #ifndef OPENSSL_NO_AES
         {
                 .name = SN_aes_128_ccm,
@@ -1087,24 +1065,6 @@ static const struct digest_name digest_names[] = {
                 .alias = SN_sha1,
         },
 #endif
-#ifndef OPENSSL_NO_GOST
-        {
-                .name = LN_id_Gost28147_89_MAC,
-                .digest = EVP_gost2814789imit,
-        },
-        {
-                .name = LN_id_tc26_gost3411_2012_512,
-                .digest = EVP_streebog512,
-        },
-        {
-                .name = LN_id_tc26_gost3411_2012_256,
-                .digest = EVP_streebog256,
-        },
-        {
-                .name = LN_id_GostR3411_94,
-                .digest = EVP_gostr341194,
-        },
-#endif /* OPENSSL_NO_GOST */
 
 #ifndef OPENSSL_NO_MD4
         {
@@ -1356,13 +1316,6 @@ static const struct digest_name digest_names[] = {
         },
 #endif /* OPENSSL_NO_SHA256 && OPENSSL_NO_EC */
 
-#ifndef OPENSSL_NO_GOST
-        {
-                .name = SN_id_Gost28147_89_MAC,
-                .digest = EVP_gost2814789imit,
-        },
-#endif /* OPENSSL_NO_GOST */
-
 #if !defined(OPENSSL_NO_DSA) && !defined(OPENSSL_NO_SHA256)
         {
                 .name = SN_dsa_with_SHA224,
@@ -1492,13 +1445,6 @@ static const struct digest_name digest_names[] = {
         },
 #endif
 
-#ifndef OPENSSL_NO_GOST
-        {
-                .name = SN_id_GostR3411_94,
-                .digest = EVP_gostr341194,
-        },
-#endif /* OPENSSL_NO_GOST */
-
 #ifndef OPENSSL_NO_RIPEMD
         {
                 .name = "ripemd",
@@ -1661,17 +1607,6 @@ static const struct digest_name digest_names[] = {
         },
 #endif /* OPENSSL_NO_SHA1 */
 
-#ifndef OPENSSL_NO_GOST
-        {
-                .name = SN_id_tc26_gost3411_2012_256,
-                .digest = EVP_streebog256,
-        },
-        {
-                .name = SN_id_tc26_gost3411_2012_512,
-                .digest = EVP_streebog512,
-        },
-#endif /* OPENSSL_NO_GOST */
-
 #ifndef OPENSSL_NO_WHIRLPOOL
         {
                 .name = SN_whirlpool,
diff --git a/src/lib/libcrypto/evp/evp_pbe.c b/src/lib/libcrypto/evp/evp_pbe.c
index 532c924a9e..9ac914b9e3 100644
--- a/src/lib/libcrypto/evp/evp_pbe.c
+++ b/src/lib/libcrypto/evp/evp_pbe.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: evp_pbe.c,v 1.46 2024/03/02 10:20:27 tb Exp $ */
+/* $OpenBSD: evp_pbe.c,v 1.47 2024/03/24 06:05:41 tb Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999.
  */
@@ -494,14 +494,6 @@ md_nid_from_prf_nid(int nid)
                 return NID_sha3_384;
         case NID_hmac_sha3_512:
                 return NID_sha3_512;
-#ifndef OPENSSL_NO_GOST
-        case NID_id_HMACGostR3411_94:
-                return NID_id_GostR3411_94;
-        case NID_id_tc26_hmac_gost_3411_12_256:
-                return NID_id_tc26_gost3411_2012_256;
-        case NID_id_tc26_hmac_gost_3411_12_512:
-                return NID_id_tc26_gost3411_2012_512;
-#endif
         default:
                 return NID_undef;
         }