Unhook and remove GOST and STREEBOG

This stops compiling the GOST source. The current implementation is low
quality and got in the way, especially in libssl. While we would be open
for GOST support, it needs to be significantly better than what we have
had and it also needs a maintainer.

Add OPENSSL_NO_GOST to opensslfeatures and stop installing gost.h.
Some code wrapped in #ifndef OPENSSL_NO_GOST will be removed later.

ok jsing

5 files changed, 2 insertions, 539 deletions

diff --git a/src/lib/libcrypto/evp/e_gost2814789.c b/src/lib/libcrypto/evp/e_gost2814789.c
deleted file mode 100644
index 48619d109d..0000000000
--- a/src/lib/libcrypto/evp/e_gost2814789.c
+++ /dev/null
@@ -1,312 +0,0 @@
-/* $OpenBSD: e_gost2814789.c,v 1.14 2024/01/04 17:38:36 tb Exp $ */
-/*
- * Copyright (c) 2014 Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
- * Copyright (c) 2005-2006 Cryptocom LTD
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- */
-
-#include <string.h>
-
-#include <openssl/opensslconf.h>
-
-#ifndef OPENSSL_NO_GOST
-#include <openssl/evp.h>
-#include <openssl/err.h>
-#include <openssl/gost.h>
-
-#include "evp_local.h"
-
-typedef struct {
-        GOST2814789_KEY ks;
-        int param_nid;
-} EVP_GOST2814789_CTX;
-
-static int
-gost2814789_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
-    const unsigned char *iv, int enc)
-{
-        EVP_GOST2814789_CTX *c = ctx->cipher_data;
-
-        return Gost2814789_set_key(&c->ks, key, ctx->key_len * 8);
-}
-
-static int
-gost2814789_ctl(EVP_CIPHER_CTX *ctx, int type, int arg, void *ptr)
-{
-        EVP_GOST2814789_CTX *c = ctx->cipher_data;
-
-        switch (type) {
-        case EVP_CTRL_PBE_PRF_NID:
-                if (ptr != NULL) {
-                        *((int *)ptr) = NID_id_HMACGostR3411_94;
-                        return 1;
-                } else {
-                        return 0;
-                }
-        case EVP_CTRL_INIT:
-                /* Default value to have any s-box set at all */
-                c->param_nid = NID_id_Gost28147_89_CryptoPro_A_ParamSet;
-                return Gost2814789_set_sbox(&c->ks, c->param_nid);
-        case EVP_CTRL_GOST_SET_SBOX:
-                return Gost2814789_set_sbox(&c->ks, arg);
-        default:
-                return -1;
-        }
-}
-
-int
-gost2814789_set_asn1_params(EVP_CIPHER_CTX *ctx, ASN1_TYPE *params)
-{
-        int len = 0;
-        unsigned char *buf = NULL;
-        unsigned char *p = NULL;
-        EVP_GOST2814789_CTX *c = ctx->cipher_data;
-        ASN1_OCTET_STRING *os = NULL;
-        GOST_CIPHER_PARAMS *gcp = GOST_CIPHER_PARAMS_new();
-
-        if (gcp == NULL) {
-                GOSTerror(ERR_R_MALLOC_FAILURE);
-                return 0;
-        }
-        if (ASN1_OCTET_STRING_set(gcp->iv, ctx->iv, ctx->cipher->iv_len) == 0) {
-                GOST_CIPHER_PARAMS_free(gcp);
-                GOSTerror(ERR_R_ASN1_LIB);
-                return 0;
-        }
-        ASN1_OBJECT_free(gcp->enc_param_set);
-        gcp->enc_param_set = OBJ_nid2obj(c->param_nid);
-
-        len = i2d_GOST_CIPHER_PARAMS(gcp, NULL);
-        p = buf = malloc(len);
-        if (buf == NULL) {
-                GOST_CIPHER_PARAMS_free(gcp);
-                GOSTerror(ERR_R_MALLOC_FAILURE);
-                return 0;
-        }
-        i2d_GOST_CIPHER_PARAMS(gcp, &p);
-        GOST_CIPHER_PARAMS_free(gcp);
-
-        os = ASN1_OCTET_STRING_new();
-        if (os == NULL) {
-                free(buf);
-                GOSTerror(ERR_R_MALLOC_FAILURE);
-                return 0;
-        }
-        if (ASN1_OCTET_STRING_set(os, buf, len) == 0) {
-                ASN1_OCTET_STRING_free(os);
-                free(buf);
-                GOSTerror(ERR_R_ASN1_LIB);
-                return 0;
-        }
-        free(buf);
-
-        ASN1_TYPE_set(params, V_ASN1_SEQUENCE, os);
-        return 1;
-}
-
-int
-gost2814789_get_asn1_params(EVP_CIPHER_CTX *ctx, ASN1_TYPE *params)
-{
-        int ret = -1;
-        int len;
-        GOST_CIPHER_PARAMS *gcp = NULL;
-        EVP_GOST2814789_CTX *c = ctx->cipher_data;
-        unsigned char *p;
-
-        if (ASN1_TYPE_get(params) != V_ASN1_SEQUENCE)
-                return ret;
-
-        p = params->value.sequence->data;
-
-        gcp = d2i_GOST_CIPHER_PARAMS(NULL, (const unsigned char **)&p,
-            params->value.sequence->length);
-
-        len = gcp->iv->length;
-        if (len != ctx->cipher->iv_len) {
-                GOST_CIPHER_PARAMS_free(gcp);
-                GOSTerror(GOST_R_INVALID_IV_LENGTH);
-                return -1;
-        }
-
-        if (!Gost2814789_set_sbox(&c->ks, OBJ_obj2nid(gcp->enc_param_set))) {
-                GOST_CIPHER_PARAMS_free(gcp);
-                return -1;
-        }
-        c->param_nid = OBJ_obj2nid(gcp->enc_param_set);
-
-        memcpy(ctx->oiv, gcp->iv->data, len);
-        memcpy(ctx->iv, gcp->iv->data, len);
-
-        GOST_CIPHER_PARAMS_free(gcp);
-
-        return 1;
-}
-
-static int
-gost2814789_ecb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, const unsigned char *in, size_t inl)
-{
-        size_t i, bl;
-
-        bl = ctx->cipher->block_size;
-
-        if (inl < bl)
-                return 1;
-
-        inl -= bl;
-
-        for (i = 0; i <= inl; i += bl)
-                Gost2814789_ecb_encrypt(in + i, out + i, &((EVP_GOST2814789_CTX *)ctx->cipher_data)->ks, ctx->encrypt);
-
-        return 1;
-}
-
-static int
-gost2814789_cfb64_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, const unsigned char *in, size_t inl)
-{
-        size_t chunk = EVP_MAXCHUNK;
-
-        if (inl < chunk)
-                chunk = inl;
-
-        while (inl && inl >= chunk) {
-                Gost2814789_cfb64_encrypt(in, out, chunk, &((EVP_GOST2814789_CTX *)ctx->cipher_data)->ks, ctx->iv, &ctx->num, ctx->encrypt);
-                inl -= chunk;
-                in += chunk;
-                out += chunk;
-                if (inl < chunk)
-                        chunk = inl;
-        }
-
-        return 1;
-}
-
-static int
-gost2814789_cnt_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-    const unsigned char *in, size_t inl)
-{
-        EVP_GOST2814789_CTX *c = ctx->cipher_data;
-
-        while (inl >= EVP_MAXCHUNK) {
-                Gost2814789_cnt_encrypt(in, out, EVP_MAXCHUNK, &c->ks,
-                    ctx->iv, ctx->buf, &ctx->num);
-                inl -= EVP_MAXCHUNK;
-                in += EVP_MAXCHUNK;
-                out += EVP_MAXCHUNK;
-        }
-
-        if (inl)
-                Gost2814789_cnt_encrypt(in, out, inl, &c->ks, ctx->iv, ctx->buf,
-                    &ctx->num);
-        return 1;
-}
-
-/* gost89 is CFB-64 */
-#define NID_gost89_cfb64 NID_id_Gost28147_89
-
-static const EVP_CIPHER gost2814789_ecb = {
-        .nid = NID_gost89_ecb,
-        .block_size = 8,
-        .key_len = 32,
-        .iv_len = 0,
-        .flags = EVP_CIPH_NO_PADDING | EVP_CIPH_CTRL_INIT | EVP_CIPH_ECB_MODE,
-        .init = gost2814789_init_key,
-        .do_cipher = gost2814789_ecb_cipher,
-        .cleanup = NULL,
-        .ctx_size = sizeof(EVP_GOST2814789_CTX),
-        .set_asn1_parameters = gost2814789_set_asn1_params,
-        .get_asn1_parameters = gost2814789_get_asn1_params,
-        .ctrl = gost2814789_ctl,
-};
-
-const EVP_CIPHER *
-EVP_gost2814789_ecb(void)
-{
-        return &gost2814789_ecb;
-}
-
-static const EVP_CIPHER gost2814789_cfb64 = {
-        .nid = NID_gost89_cfb64,
-        .block_size = 1,
-        .key_len = 32,
-        .iv_len = 8,
-        .flags = EVP_CIPH_NO_PADDING | EVP_CIPH_CTRL_INIT | EVP_CIPH_CFB_MODE,
-        .init = gost2814789_init_key,
-        .do_cipher = gost2814789_cfb64_cipher,
-        .cleanup = NULL,
-        .ctx_size = sizeof(EVP_GOST2814789_CTX),
-        .set_asn1_parameters = gost2814789_set_asn1_params,
-        .get_asn1_parameters = gost2814789_get_asn1_params,
-        .ctrl = gost2814789_ctl,
-};
-
-const EVP_CIPHER *
-EVP_gost2814789_cfb64(void)
-{
-        return &gost2814789_cfb64;
-}
-
-static const EVP_CIPHER gost2814789_cnt = {
-        .nid = NID_gost89_cnt,
-        .block_size = 1,
-        .key_len = 32,
-        .iv_len = 8,
-        .flags = EVP_CIPH_NO_PADDING | EVP_CIPH_CTRL_INIT | EVP_CIPH_OFB_MODE,
-        .init = gost2814789_init_key,
-        .do_cipher = gost2814789_cnt_cipher,
-        .cleanup = NULL,
-        .ctx_size = sizeof(EVP_GOST2814789_CTX),
-        .set_asn1_parameters = gost2814789_set_asn1_params,
-        .get_asn1_parameters = gost2814789_get_asn1_params,
-        .ctrl = gost2814789_ctl,
-};
-
-const EVP_CIPHER *
-EVP_gost2814789_cnt(void)
-{
-        return &gost2814789_cnt;
-}
-#endif
diff --git a/src/lib/libcrypto/evp/m_gost2814789.c b/src/lib/libcrypto/evp/m_gost2814789.c
deleted file mode 100644
index 9b8a09e5a4..0000000000
--- a/src/lib/libcrypto/evp/m_gost2814789.c
+++ /dev/null
@@ -1,113 +0,0 @@
-/* $OpenBSD: m_gost2814789.c,v 1.6 2023/07/07 19:37:53 beck Exp $ */
-/*
- * Copyright (c) 2014 Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
- * Copyright (c) 2005-2006 Cryptocom LTD
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- */
-
-#include <openssl/opensslconf.h>
-
-#ifndef OPENSSL_NO_GOST
-
-#include <openssl/evp.h>
-#include <openssl/gost.h>
-#include <openssl/objects.h>
-
-#include "evp_local.h"
-
-static int
-gost2814789_init(EVP_MD_CTX *ctx)
-{
-        return GOST2814789IMIT_Init(ctx->md_data,
-            NID_id_Gost28147_89_CryptoPro_A_ParamSet);
-}
-
-static int
-gost2814789_update(EVP_MD_CTX *ctx, const void *data, size_t count)
-{
-        return GOST2814789IMIT_Update(ctx->md_data, data, count);
-}
-
-static int
-gost2814789_final(EVP_MD_CTX *ctx, unsigned char *md)
-{
-        return GOST2814789IMIT_Final(md, ctx->md_data);
-}
-
-static int
-gost2814789_md_ctrl(EVP_MD_CTX *ctx, int cmd, int p1, void *p2)
-{
-        GOST2814789IMIT_CTX *gctx = ctx->md_data;
-
-        switch (cmd) {
-        case EVP_MD_CTRL_SET_KEY:
-                return Gost2814789_set_key(&gctx->cipher, p2, p1);
-        case EVP_MD_CTRL_GOST_SET_SBOX:
-                return Gost2814789_set_sbox(&gctx->cipher, p1);
-        }
-        return -2;
-}
-
-static const EVP_MD gost2814789imit_md = {
-        .type = NID_id_Gost28147_89_MAC,
-        .pkey_type = NID_undef,
-        .md_size = GOST2814789IMIT_LENGTH,
-        .flags = 0,
-        .init = gost2814789_init,
-        .update = gost2814789_update,
-        .final = gost2814789_final,
-        .block_size = GOST2814789IMIT_CBLOCK,
-        .ctx_size = sizeof(EVP_MD *) + sizeof(GOST2814789IMIT_CTX),
-        .md_ctrl = gost2814789_md_ctrl,
-};
-
-const EVP_MD *
-EVP_gost2814789imit(void)
-{
-        return (&gost2814789imit_md);
-}
-#endif
diff --git a/src/lib/libcrypto/evp/m_gostr341194.c b/src/lib/libcrypto/evp/m_gostr341194.c
deleted file mode 100644
index 723349a0d8..0000000000
--- a/src/lib/libcrypto/evp/m_gostr341194.c
+++ /dev/null
@@ -1,100 +0,0 @@
-/* $OpenBSD: m_gostr341194.c,v 1.7 2023/07/07 19:37:53 beck Exp $ */
-/*
- * Copyright (c) 2014 Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
- * Copyright (c) 2005-2006 Cryptocom LTD
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- */
-
-#include <stdio.h>
-
-#include <openssl/opensslconf.h>
-
-#ifndef OPENSSL_NO_GOST
-
-#include <openssl/evp.h>
-#include <openssl/gost.h>
-#include <openssl/objects.h>
-
-#include "evp_local.h"
-
-static int
-gostr341194_init(EVP_MD_CTX *ctx)
-{
-        return GOSTR341194_Init(ctx->md_data,
-            NID_id_GostR3411_94_CryptoProParamSet);
-}
-
-static int
-gostr341194_update(EVP_MD_CTX *ctx, const void *data, size_t count)
-{
-        return GOSTR341194_Update(ctx->md_data, data, count);
-}
-
-static int
-gostr341194_final(EVP_MD_CTX *ctx, unsigned char *md)
-{
-        return GOSTR341194_Final(md, ctx->md_data);
-}
-
-static const EVP_MD gostr341194_md = {
-        .type = NID_id_GostR3411_94,
-        .pkey_type = NID_undef,
-        .md_size = GOSTR341194_LENGTH,
-        .flags = 0,
-        .init = gostr341194_init,
-        .update = gostr341194_update,
-        .final = gostr341194_final,
-        .block_size = GOSTR341194_CBLOCK,
-        .ctx_size = sizeof(EVP_MD *) + sizeof(GOSTR341194_CTX),
-};
-
-const EVP_MD *
-EVP_gostr341194(void)
-{
-        return (&gostr341194_md);
-}
-#endif
diff --git a/src/lib/libcrypto/evp/p_lib.c b/src/lib/libcrypto/evp/p_lib.c
index 558c89d427..8bf820560c 100644
--- a/src/lib/libcrypto/evp/p_lib.c
+++ b/src/lib/libcrypto/evp/p_lib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: p_lib.c,v 1.58 2024/01/05 21:22:01 tb Exp $ */
+/* $OpenBSD: p_lib.c,v 1.59 2024/03/02 11:17:27 tb Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -140,10 +140,6 @@ extern const EVP_PKEY_ASN1_METHOD dsa3_asn1_meth;
 extern const EVP_PKEY_ASN1_METHOD dsa4_asn1_meth;
 extern const EVP_PKEY_ASN1_METHOD eckey_asn1_meth;
 extern const EVP_PKEY_ASN1_METHOD ed25519_asn1_meth;
-extern const EVP_PKEY_ASN1_METHOD gostimit_asn1_meth;
-extern const EVP_PKEY_ASN1_METHOD gostr01_asn1_meth;
-extern const EVP_PKEY_ASN1_METHOD gostr12_256_asn1_meth;
-extern const EVP_PKEY_ASN1_METHOD gostr12_512_asn1_meth;
 extern const EVP_PKEY_ASN1_METHOD hmac_asn1_meth;
 extern const EVP_PKEY_ASN1_METHOD rsa_asn1_meth;
 extern const EVP_PKEY_ASN1_METHOD rsa2_asn1_meth;
@@ -160,10 +156,6 @@ static const EVP_PKEY_ASN1_METHOD *asn1_methods[] = {
         &dsa4_asn1_meth,
         &eckey_asn1_meth,
         &ed25519_asn1_meth,
-        &gostimit_asn1_meth,
-        &gostr01_asn1_meth,
-        &gostr12_256_asn1_meth,
-        &gostr12_512_asn1_meth,
         &hmac_asn1_meth,
         &rsa_asn1_meth,
         &rsa2_asn1_meth,
diff --git a/src/lib/libcrypto/evp/pmeth_lib.c b/src/lib/libcrypto/evp/pmeth_lib.c
index a0d57594d8..a2a9ad9c7b 100644
--- a/src/lib/libcrypto/evp/pmeth_lib.c
+++ b/src/lib/libcrypto/evp/pmeth_lib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pmeth_lib.c,v 1.38 2024/03/02 10:04:40 tb Exp $ */
+/* $OpenBSD: pmeth_lib.c,v 1.39 2024/03/02 11:17:27 tb Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2006.
  */
@@ -76,8 +76,6 @@ extern const EVP_PKEY_METHOD dh_pkey_meth;
 extern const EVP_PKEY_METHOD dsa_pkey_meth;
 extern const EVP_PKEY_METHOD ec_pkey_meth;
 extern const EVP_PKEY_METHOD ed25519_pkey_meth;
-extern const EVP_PKEY_METHOD gostimit_pkey_meth;
-extern const EVP_PKEY_METHOD gostr01_pkey_meth;
 extern const EVP_PKEY_METHOD hkdf_pkey_meth;
 extern const EVP_PKEY_METHOD hmac_pkey_meth;
 extern const EVP_PKEY_METHOD rsa_pkey_meth;
@@ -90,8 +88,6 @@ static const EVP_PKEY_METHOD *pkey_methods[] = {
         &dsa_pkey_meth,
         &ec_pkey_meth,
         &ed25519_pkey_meth,
-        &gostimit_pkey_meth,
-        &gostr01_pkey_meth,
         &hkdf_pkey_meth,
         &hmac_pkey_meth,
         &rsa_pkey_meth,