summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authortb <>2024-04-14 14:14:14 +0000
committertb <>2024-04-14 14:14:14 +0000
commitb0c0dd97561b9121f099858deec62eb035794c70 (patch)
tree91cf6b2493af6c68ea2dca14087e031e88854656 /src/lib
parent2a667686dd0a84ce9249eddf1560739c48f1ed2a (diff)
downloadopenbsd-b0c0dd97561b9121f099858deec62eb035794c70.tar.gz
openbsd-b0c0dd97561b9121f099858deec62eb035794c70.tar.bz2
openbsd-b0c0dd97561b9121f099858deec62eb035794c70.zip
Delete a few more GOST remnants
When I unifdefed GOST support, the tree wasn't fully unlocked, so I didn't want to touch a public header. All this code is in #ifndef OPENSSL_NO_GOST, which we define. ok jsing
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/libcrypto/evp/evp.h22
1 files changed, 1 insertions, 21 deletions
diff --git a/src/lib/libcrypto/evp/evp.h b/src/lib/libcrypto/evp/evp.h
index 26695dc3d7..5059c0affb 100644
--- a/src/lib/libcrypto/evp/evp.h
+++ b/src/lib/libcrypto/evp/evp.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: evp.h,v 1.133 2024/04/10 15:00:38 beck Exp $ */ 1/* $OpenBSD: evp.h,v 1.134 2024/04/14 14:14:14 tb Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -330,11 +330,6 @@ typedef int EVP_PBE_KEYGEN(EVP_CIPHER_CTX *ctx, const char *pass, int passlen,
330 (char *)(eckey)) 330 (char *)(eckey))
331#endif 331#endif
332 332
333#ifndef OPENSSL_NO_GOST
334#define EVP_PKEY_assign_GOST(pkey,gostkey) EVP_PKEY_assign((pkey),EVP_PKEY_GOSTR01,\
335 (char *)(gostkey))
336#endif
337
338/* Add some extra combinations */ 333/* Add some extra combinations */
339#define EVP_get_digestbynid(a) EVP_get_digestbyname(OBJ_nid2sn(a)) 334#define EVP_get_digestbynid(a) EVP_get_digestbyname(OBJ_nid2sn(a))
340#define EVP_get_digestbyobj(a) EVP_get_digestbynid(OBJ_obj2nid(a)) 335#define EVP_get_digestbyobj(a) EVP_get_digestbynid(OBJ_obj2nid(a))
@@ -602,12 +597,6 @@ const EVP_MD *EVP_ripemd160(void);
602#ifndef OPENSSL_NO_WHIRLPOOL 597#ifndef OPENSSL_NO_WHIRLPOOL
603const EVP_MD *EVP_whirlpool(void); 598const EVP_MD *EVP_whirlpool(void);
604#endif 599#endif
605#ifndef OPENSSL_NO_GOST
606const EVP_MD *EVP_gostr341194(void);
607const EVP_MD *EVP_gost2814789imit(void);
608const EVP_MD *EVP_streebog256(void);
609const EVP_MD *EVP_streebog512(void);
610#endif
611const EVP_CIPHER *EVP_enc_null(void); /* does nothing :-) */ 600const EVP_CIPHER *EVP_enc_null(void); /* does nothing :-) */
612#ifndef OPENSSL_NO_DES 601#ifndef OPENSSL_NO_DES
613const EVP_CIPHER *EVP_des_ecb(void); 602const EVP_CIPHER *EVP_des_ecb(void);
@@ -735,12 +724,6 @@ const EVP_CIPHER *EVP_camellia_256_ofb(void);
735const EVP_CIPHER *EVP_chacha20(void); 724const EVP_CIPHER *EVP_chacha20(void);
736#endif 725#endif
737 726
738#ifndef OPENSSL_NO_GOST
739const EVP_CIPHER *EVP_gost2814789_ecb(void);
740const EVP_CIPHER *EVP_gost2814789_cfb64(void);
741const EVP_CIPHER *EVP_gost2814789_cnt(void);
742#endif
743
744#ifndef OPENSSL_NO_SM4 727#ifndef OPENSSL_NO_SM4
745const EVP_CIPHER *EVP_sm4_ecb(void); 728const EVP_CIPHER *EVP_sm4_ecb(void);
746const EVP_CIPHER *EVP_sm4_cbc(void); 729const EVP_CIPHER *EVP_sm4_cbc(void);
@@ -820,9 +803,6 @@ struct ec_key_st *EVP_PKEY_get0_EC_KEY(EVP_PKEY *pkey);
820struct ec_key_st *EVP_PKEY_get1_EC_KEY(EVP_PKEY *pkey); 803struct ec_key_st *EVP_PKEY_get1_EC_KEY(EVP_PKEY *pkey);
821int EVP_PKEY_set1_EC_KEY(EVP_PKEY *pkey, struct ec_key_st *key); 804int EVP_PKEY_set1_EC_KEY(EVP_PKEY *pkey, struct ec_key_st *key);
822#endif 805#endif
823#ifndef OPENSSL_NO_GOST
824struct gost_key_st;
825#endif
826 806
827EVP_PKEY *EVP_PKEY_new(void); 807EVP_PKEY *EVP_PKEY_new(void);
828void EVP_PKEY_free(EVP_PKEY *pkey); 808void EVP_PKEY_free(EVP_PKEY *pkey);