summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/evp
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/libcrypto/evp')
-rw-r--r--src/lib/libcrypto/evp/bio_b64.c3
-rw-r--r--src/lib/libcrypto/evp/bio_enc.c4
-rw-r--r--src/lib/libcrypto/evp/bio_md.c3
-rw-r--r--src/lib/libcrypto/evp/c_all.c6
-rw-r--r--src/lib/libcrypto/evp/cipher_method_lib.c14
-rw-r--r--src/lib/libcrypto/evp/digest.c18
-rw-r--r--src/lib/libcrypto/evp/e_aes.c33
-rw-r--r--src/lib/libcrypto/evp/e_aes_cbc_hmac_sha1.c6
-rw-r--r--src/lib/libcrypto/evp/e_bf.c6
-rw-r--r--src/lib/libcrypto/evp/e_camellia.c20
-rw-r--r--src/lib/libcrypto/evp/e_cast.c6
-rw-r--r--src/lib/libcrypto/evp/e_chacha.c3
-rw-r--r--src/lib/libcrypto/evp/e_chacha20poly1305.c5
-rw-r--r--src/lib/libcrypto/evp/e_des.c8
-rw-r--r--src/lib/libcrypto/evp/e_des3.c14
-rw-r--r--src/lib/libcrypto/evp/e_gost2814789.c5
-rw-r--r--src/lib/libcrypto/evp/e_idea.c6
-rw-r--r--src/lib/libcrypto/evp/e_null.c3
-rw-r--r--src/lib/libcrypto/evp/e_rc2.c8
-rw-r--r--src/lib/libcrypto/evp/e_rc4.c4
-rw-r--r--src/lib/libcrypto/evp/e_rc4_hmac_md5.c3
-rw-r--r--src/lib/libcrypto/evp/e_sm4.c7
-rw-r--r--src/lib/libcrypto/evp/e_xcbc_d.c3
-rw-r--r--src/lib/libcrypto/evp/encode.c12
-rw-r--r--src/lib/libcrypto/evp/evp_aead.c12
-rw-r--r--src/lib/libcrypto/evp/evp_enc.c27
-rw-r--r--src/lib/libcrypto/evp/evp_err.c3
-rw-r--r--src/lib/libcrypto/evp/evp_key.c7
-rw-r--r--src/lib/libcrypto/evp/evp_lib.c55
-rw-r--r--src/lib/libcrypto/evp/evp_pbe.c7
-rw-r--r--src/lib/libcrypto/evp/evp_pkey.c13
-rw-r--r--src/lib/libcrypto/evp/m_gost2814789.c3
-rw-r--r--src/lib/libcrypto/evp/m_gostr341194.c3
-rw-r--r--src/lib/libcrypto/evp/m_md4.c3
-rw-r--r--src/lib/libcrypto/evp/m_md5.c3
-rw-r--r--src/lib/libcrypto/evp/m_md5_sha1.c3
-rw-r--r--src/lib/libcrypto/evp/m_null.c3
-rw-r--r--src/lib/libcrypto/evp/m_ripemd.c3
-rw-r--r--src/lib/libcrypto/evp/m_sha1.c9
-rw-r--r--src/lib/libcrypto/evp/m_sha3.c6
-rw-r--r--src/lib/libcrypto/evp/m_sigver.c8
-rw-r--r--src/lib/libcrypto/evp/m_sm3.c3
-rw-r--r--src/lib/libcrypto/evp/m_streebog.c4
-rw-r--r--src/lib/libcrypto/evp/m_wp.c3
-rw-r--r--src/lib/libcrypto/evp/names.c11
-rw-r--r--src/lib/libcrypto/evp/p5_crpt.c4
-rw-r--r--src/lib/libcrypto/evp/p5_crpt2.c5
-rw-r--r--src/lib/libcrypto/evp/p_dec.c3
-rw-r--r--src/lib/libcrypto/evp/p_enc.c3
-rw-r--r--src/lib/libcrypto/evp/p_lib.c42
-rw-r--r--src/lib/libcrypto/evp/p_open.c4
-rw-r--r--src/lib/libcrypto/evp/p_seal.c4
-rw-r--r--src/lib/libcrypto/evp/p_sign.c3
-rw-r--r--src/lib/libcrypto/evp/p_verify.c3
-rw-r--r--src/lib/libcrypto/evp/pmeth_fn.c15
-rw-r--r--src/lib/libcrypto/evp/pmeth_gn.c13
-rw-r--r--src/lib/libcrypto/evp/pmeth_lib.c39
57 files changed, 57 insertions, 470 deletions
diff --git a/src/lib/libcrypto/evp/bio_b64.c b/src/lib/libcrypto/evp/bio_b64.c
index 5eceda0993..3c47628f54 100644
--- a/src/lib/libcrypto/evp/bio_b64.c
+++ b/src/lib/libcrypto/evp/bio_b64.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: bio_b64.c,v 1.27 2023/07/07 13:54:45 beck Exp $ */ 1/* $OpenBSD: bio_b64.c,v 1.28 2023/07/07 19:37:53 beck 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 *
@@ -111,7 +111,6 @@ BIO_f_base64(void)
111{ 111{
112 return (&methods_b64); 112 return (&methods_b64);
113} 113}
114LCRYPTO_ALIAS(BIO_f_base64);
115 114
116static int 115static int
117b64_new(BIO *bi) 116b64_new(BIO *bi)
diff --git a/src/lib/libcrypto/evp/bio_enc.c b/src/lib/libcrypto/evp/bio_enc.c
index 747e64ed7f..d2132adb4e 100644
--- a/src/lib/libcrypto/evp/bio_enc.c
+++ b/src/lib/libcrypto/evp/bio_enc.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: bio_enc.c,v 1.28 2023/07/07 13:54:45 beck Exp $ */ 1/* $OpenBSD: bio_enc.c,v 1.29 2023/07/07 19:37:53 beck 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 *
@@ -106,7 +106,6 @@ BIO_f_cipher(void)
106{ 106{
107 return (&methods_enc); 107 return (&methods_enc);
108} 108}
109LCRYPTO_ALIAS(BIO_f_cipher);
110 109
111static int 110static int
112enc_new(BIO *bi) 111enc_new(BIO *bi)
@@ -417,4 +416,3 @@ BIO_set_cipher(BIO *b, const EVP_CIPHER *c, const unsigned char *k,
417 416
418 return 1; 417 return 1;
419} 418}
420LCRYPTO_ALIAS(BIO_set_cipher);
diff --git a/src/lib/libcrypto/evp/bio_md.c b/src/lib/libcrypto/evp/bio_md.c
index 83d6c3732c..ccfcd1ea1d 100644
--- a/src/lib/libcrypto/evp/bio_md.c
+++ b/src/lib/libcrypto/evp/bio_md.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: bio_md.c,v 1.20 2023/07/07 13:54:45 beck Exp $ */ 1/* $OpenBSD: bio_md.c,v 1.21 2023/07/07 19:37:53 beck 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 *
@@ -94,7 +94,6 @@ BIO_f_md(void)
94{ 94{
95 return (&methods_md); 95 return (&methods_md);
96} 96}
97LCRYPTO_ALIAS(BIO_f_md);
98 97
99static int 98static int
100md_new(BIO *bi) 99md_new(BIO *bi)
diff --git a/src/lib/libcrypto/evp/c_all.c b/src/lib/libcrypto/evp/c_all.c
index 5efcd5f237..10e35dd7ab 100644
--- a/src/lib/libcrypto/evp/c_all.c
+++ b/src/lib/libcrypto/evp/c_all.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: c_all.c,v 1.30 2023/07/07 13:54:45 beck Exp $ */ 1/* $OpenBSD: c_all.c,v 1.31 2023/07/07 19:37:53 beck 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 *
@@ -251,7 +251,6 @@ OpenSSL_add_all_ciphers(void)
251 static pthread_once_t add_all_ciphers_once = PTHREAD_ONCE_INIT; 251 static pthread_once_t add_all_ciphers_once = PTHREAD_ONCE_INIT;
252 (void) pthread_once(&add_all_ciphers_once, OpenSSL_add_all_ciphers_internal); 252 (void) pthread_once(&add_all_ciphers_once, OpenSSL_add_all_ciphers_internal);
253} 253}
254LCRYPTO_ALIAS(OpenSSL_add_all_ciphers);
255 254
256static void 255static void
257OpenSSL_add_all_digests_internal(void) 256OpenSSL_add_all_digests_internal(void)
@@ -314,7 +313,6 @@ OpenSSL_add_all_digests(void)
314 static pthread_once_t add_all_digests_once = PTHREAD_ONCE_INIT; 313 static pthread_once_t add_all_digests_once = PTHREAD_ONCE_INIT;
315 (void) pthread_once(&add_all_digests_once, OpenSSL_add_all_digests_internal); 314 (void) pthread_once(&add_all_digests_once, OpenSSL_add_all_digests_internal);
316} 315}
317LCRYPTO_ALIAS(OpenSSL_add_all_digests);
318 316
319void 317void
320OPENSSL_add_all_algorithms_noconf(void) 318OPENSSL_add_all_algorithms_noconf(void)
@@ -323,7 +321,6 @@ OPENSSL_add_all_algorithms_noconf(void)
323 OpenSSL_add_all_ciphers(); 321 OpenSSL_add_all_ciphers();
324 OpenSSL_add_all_digests(); 322 OpenSSL_add_all_digests();
325} 323}
326LCRYPTO_ALIAS(OPENSSL_add_all_algorithms_noconf);
327 324
328void 325void
329OPENSSL_add_all_algorithms_conf(void) 326OPENSSL_add_all_algorithms_conf(void)
@@ -331,4 +328,3 @@ OPENSSL_add_all_algorithms_conf(void)
331 OPENSSL_add_all_algorithms_noconf(); 328 OPENSSL_add_all_algorithms_noconf();
332 OPENSSL_config(NULL); 329 OPENSSL_config(NULL);
333} 330}
334LCRYPTO_ALIAS(OPENSSL_add_all_algorithms_conf);
diff --git a/src/lib/libcrypto/evp/cipher_method_lib.c b/src/lib/libcrypto/evp/cipher_method_lib.c
index 9e4fd483a3..c3f510fcc7 100644
--- a/src/lib/libcrypto/evp/cipher_method_lib.c
+++ b/src/lib/libcrypto/evp/cipher_method_lib.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: cipher_method_lib.c,v 1.9 2023/07/07 13:54:45 beck Exp $ */ 1/* $OpenBSD: cipher_method_lib.c,v 1.10 2023/07/07 19:37:53 beck Exp $ */
2/* 2/*
3 * Written by Richard Levitte (levitte@openssl.org) for the OpenSSL project 3 * Written by Richard Levitte (levitte@openssl.org) for the OpenSSL project
4 * 2015. 4 * 2015.
@@ -77,7 +77,6 @@ EVP_CIPHER_meth_new(int cipher_type, int block_size, int key_len)
77 77
78 return cipher; 78 return cipher;
79} 79}
80LCRYPTO_ALIAS(EVP_CIPHER_meth_new);
81 80
82EVP_CIPHER * 81EVP_CIPHER *
83EVP_CIPHER_meth_dup(const EVP_CIPHER *cipher) 82EVP_CIPHER_meth_dup(const EVP_CIPHER *cipher)
@@ -91,14 +90,12 @@ EVP_CIPHER_meth_dup(const EVP_CIPHER *cipher)
91 90
92 return copy; 91 return copy;
93} 92}
94LCRYPTO_ALIAS(EVP_CIPHER_meth_dup);
95 93
96void 94void
97EVP_CIPHER_meth_free(EVP_CIPHER *cipher) 95EVP_CIPHER_meth_free(EVP_CIPHER *cipher)
98{ 96{
99 free(cipher); 97 free(cipher);
100} 98}
101LCRYPTO_ALIAS(EVP_CIPHER_meth_free);
102 99
103int 100int
104EVP_CIPHER_meth_set_iv_length(EVP_CIPHER *cipher, int iv_len) 101EVP_CIPHER_meth_set_iv_length(EVP_CIPHER *cipher, int iv_len)
@@ -107,7 +104,6 @@ EVP_CIPHER_meth_set_iv_length(EVP_CIPHER *cipher, int iv_len)
107 104
108 return 1; 105 return 1;
109} 106}
110LCRYPTO_ALIAS(EVP_CIPHER_meth_set_iv_length);
111 107
112int 108int
113EVP_CIPHER_meth_set_flags(EVP_CIPHER *cipher, unsigned long flags) 109EVP_CIPHER_meth_set_flags(EVP_CIPHER *cipher, unsigned long flags)
@@ -116,7 +112,6 @@ EVP_CIPHER_meth_set_flags(EVP_CIPHER *cipher, unsigned long flags)
116 112
117 return 1; 113 return 1;
118} 114}
119LCRYPTO_ALIAS(EVP_CIPHER_meth_set_flags);
120 115
121int 116int
122EVP_CIPHER_meth_set_impl_ctx_size(EVP_CIPHER *cipher, int ctx_size) 117EVP_CIPHER_meth_set_impl_ctx_size(EVP_CIPHER *cipher, int ctx_size)
@@ -125,7 +120,6 @@ EVP_CIPHER_meth_set_impl_ctx_size(EVP_CIPHER *cipher, int ctx_size)
125 120
126 return 1; 121 return 1;
127} 122}
128LCRYPTO_ALIAS(EVP_CIPHER_meth_set_impl_ctx_size);
129 123
130int 124int
131EVP_CIPHER_meth_set_init(EVP_CIPHER *cipher, 125EVP_CIPHER_meth_set_init(EVP_CIPHER *cipher,
@@ -136,7 +130,6 @@ EVP_CIPHER_meth_set_init(EVP_CIPHER *cipher,
136 130
137 return 1; 131 return 1;
138} 132}
139LCRYPTO_ALIAS(EVP_CIPHER_meth_set_init);
140 133
141int 134int
142EVP_CIPHER_meth_set_do_cipher(EVP_CIPHER *cipher, 135EVP_CIPHER_meth_set_do_cipher(EVP_CIPHER *cipher,
@@ -147,7 +140,6 @@ EVP_CIPHER_meth_set_do_cipher(EVP_CIPHER *cipher,
147 140
148 return 1; 141 return 1;
149} 142}
150LCRYPTO_ALIAS(EVP_CIPHER_meth_set_do_cipher);
151 143
152int 144int
153EVP_CIPHER_meth_set_cleanup(EVP_CIPHER *cipher, 145EVP_CIPHER_meth_set_cleanup(EVP_CIPHER *cipher,
@@ -157,7 +149,6 @@ EVP_CIPHER_meth_set_cleanup(EVP_CIPHER *cipher,
157 149
158 return 1; 150 return 1;
159} 151}
160LCRYPTO_ALIAS(EVP_CIPHER_meth_set_cleanup);
161 152
162int 153int
163EVP_CIPHER_meth_set_set_asn1_params(EVP_CIPHER *cipher, 154EVP_CIPHER_meth_set_set_asn1_params(EVP_CIPHER *cipher,
@@ -167,7 +158,6 @@ EVP_CIPHER_meth_set_set_asn1_params(EVP_CIPHER *cipher,
167 158
168 return 1; 159 return 1;
169} 160}
170LCRYPTO_ALIAS(EVP_CIPHER_meth_set_set_asn1_params);
171 161
172int 162int
173EVP_CIPHER_meth_set_get_asn1_params(EVP_CIPHER *cipher, 163EVP_CIPHER_meth_set_get_asn1_params(EVP_CIPHER *cipher,
@@ -177,7 +167,6 @@ EVP_CIPHER_meth_set_get_asn1_params(EVP_CIPHER *cipher,
177 167
178 return 1; 168 return 1;
179} 169}
180LCRYPTO_ALIAS(EVP_CIPHER_meth_set_get_asn1_params);
181 170
182int 171int
183EVP_CIPHER_meth_set_ctrl(EVP_CIPHER *cipher, 172EVP_CIPHER_meth_set_ctrl(EVP_CIPHER *cipher,
@@ -187,4 +176,3 @@ EVP_CIPHER_meth_set_ctrl(EVP_CIPHER *cipher,
187 176
188 return 1; 177 return 1;
189} 178}
190LCRYPTO_ALIAS(EVP_CIPHER_meth_set_ctrl);
diff --git a/src/lib/libcrypto/evp/digest.c b/src/lib/libcrypto/evp/digest.c
index 6615aa4a35..ca3fb219cd 100644
--- a/src/lib/libcrypto/evp/digest.c
+++ b/src/lib/libcrypto/evp/digest.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: digest.c,v 1.37 2023/07/07 13:54:45 beck Exp $ */ 1/* $OpenBSD: digest.c,v 1.38 2023/07/07 19:37:53 beck 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 *
@@ -130,7 +130,6 @@ EVP_DigestInit(EVP_MD_CTX *ctx, const EVP_MD *type)
130 EVP_MD_CTX_init(ctx); 130 EVP_MD_CTX_init(ctx);
131 return EVP_DigestInit_ex(ctx, type, NULL); 131 return EVP_DigestInit_ex(ctx, type, NULL);
132} 132}
133LCRYPTO_ALIAS(EVP_DigestInit);
134 133
135int 134int
136EVP_DigestInit_ex(EVP_MD_CTX *ctx, const EVP_MD *type, ENGINE *impl) 135EVP_DigestInit_ex(EVP_MD_CTX *ctx, const EVP_MD *type, ENGINE *impl)
@@ -212,14 +211,12 @@ skip_to_init:
212 return 1; 211 return 1;
213 return ctx->digest->init(ctx); 212 return ctx->digest->init(ctx);
214} 213}
215LCRYPTO_ALIAS(EVP_DigestInit_ex);
216 214
217int 215int
218EVP_DigestUpdate(EVP_MD_CTX *ctx, const void *data, size_t count) 216EVP_DigestUpdate(EVP_MD_CTX *ctx, const void *data, size_t count)
219{ 217{
220 return ctx->update(ctx, data, count); 218 return ctx->update(ctx, data, count);
221} 219}
222LCRYPTO_ALIAS(EVP_DigestUpdate);
223 220
224/* The caller can assume that this removes any secret data from the context */ 221/* The caller can assume that this removes any secret data from the context */
225int 222int
@@ -231,7 +228,6 @@ EVP_DigestFinal(EVP_MD_CTX *ctx, unsigned char *md, unsigned int *size)
231 EVP_MD_CTX_cleanup(ctx); 228 EVP_MD_CTX_cleanup(ctx);
232 return ret; 229 return ret;
233} 230}
234LCRYPTO_ALIAS(EVP_DigestFinal);
235 231
236/* The caller can assume that this removes any secret data from the context */ 232/* The caller can assume that this removes any secret data from the context */
237int 233int
@@ -253,7 +249,6 @@ EVP_DigestFinal_ex(EVP_MD_CTX *ctx, unsigned char *md, unsigned int *size)
253 memset(ctx->md_data, 0, ctx->digest->ctx_size); 249 memset(ctx->md_data, 0, ctx->digest->ctx_size);
254 return ret; 250 return ret;
255} 251}
256LCRYPTO_ALIAS(EVP_DigestFinal_ex);
257 252
258int 253int
259EVP_MD_CTX_copy(EVP_MD_CTX *out, const EVP_MD_CTX *in) 254EVP_MD_CTX_copy(EVP_MD_CTX *out, const EVP_MD_CTX *in)
@@ -261,7 +256,6 @@ EVP_MD_CTX_copy(EVP_MD_CTX *out, const EVP_MD_CTX *in)
261 EVP_MD_CTX_init(out); 256 EVP_MD_CTX_init(out);
262 return EVP_MD_CTX_copy_ex(out, in); 257 return EVP_MD_CTX_copy_ex(out, in);
263} 258}
264LCRYPTO_ALIAS(EVP_MD_CTX_copy);
265 259
266int 260int
267EVP_MD_CTX_copy_ex(EVP_MD_CTX *out, const EVP_MD_CTX *in) 261EVP_MD_CTX_copy_ex(EVP_MD_CTX *out, const EVP_MD_CTX *in)
@@ -324,7 +318,6 @@ EVP_MD_CTX_copy_ex(EVP_MD_CTX *out, const EVP_MD_CTX *in)
324 318
325 return 1; 319 return 1;
326} 320}
327LCRYPTO_ALIAS(EVP_MD_CTX_copy_ex);
328 321
329int 322int
330EVP_Digest(const void *data, size_t count, 323EVP_Digest(const void *data, size_t count,
@@ -342,14 +335,12 @@ EVP_Digest(const void *data, size_t count,
342 335
343 return ret; 336 return ret;
344} 337}
345LCRYPTO_ALIAS(EVP_Digest);
346 338
347EVP_MD_CTX * 339EVP_MD_CTX *
348EVP_MD_CTX_new(void) 340EVP_MD_CTX_new(void)
349{ 341{
350 return calloc(1, sizeof(EVP_MD_CTX)); 342 return calloc(1, sizeof(EVP_MD_CTX));
351} 343}
352LCRYPTO_ALIAS(EVP_MD_CTX_new);
353 344
354void 345void
355EVP_MD_CTX_free(EVP_MD_CTX *ctx) 346EVP_MD_CTX_free(EVP_MD_CTX *ctx)
@@ -361,35 +352,30 @@ EVP_MD_CTX_free(EVP_MD_CTX *ctx)
361 352
362 free(ctx); 353 free(ctx);
363} 354}
364LCRYPTO_ALIAS(EVP_MD_CTX_free);
365 355
366void 356void
367EVP_MD_CTX_init(EVP_MD_CTX *ctx) 357EVP_MD_CTX_init(EVP_MD_CTX *ctx)
368{ 358{
369 memset(ctx, 0, sizeof(*ctx)); 359 memset(ctx, 0, sizeof(*ctx));
370} 360}
371LCRYPTO_ALIAS(EVP_MD_CTX_init);
372 361
373int 362int
374EVP_MD_CTX_reset(EVP_MD_CTX *ctx) 363EVP_MD_CTX_reset(EVP_MD_CTX *ctx)
375{ 364{
376 return EVP_MD_CTX_cleanup(ctx); 365 return EVP_MD_CTX_cleanup(ctx);
377} 366}
378LCRYPTO_ALIAS(EVP_MD_CTX_reset);
379 367
380EVP_MD_CTX * 368EVP_MD_CTX *
381EVP_MD_CTX_create(void) 369EVP_MD_CTX_create(void)
382{ 370{
383 return EVP_MD_CTX_new(); 371 return EVP_MD_CTX_new();
384} 372}
385LCRYPTO_ALIAS(EVP_MD_CTX_create);
386 373
387void 374void
388EVP_MD_CTX_destroy(EVP_MD_CTX *ctx) 375EVP_MD_CTX_destroy(EVP_MD_CTX *ctx)
389{ 376{
390 EVP_MD_CTX_free(ctx); 377 EVP_MD_CTX_free(ctx);
391} 378}
392LCRYPTO_ALIAS(EVP_MD_CTX_destroy);
393 379
394/* This call frees resources associated with the context */ 380/* This call frees resources associated with the context */
395int 381int
@@ -418,7 +404,6 @@ EVP_MD_CTX_cleanup(EVP_MD_CTX *ctx)
418 404
419 return 1; 405 return 1;
420} 406}
421LCRYPTO_ALIAS(EVP_MD_CTX_cleanup);
422 407
423int 408int
424EVP_MD_CTX_ctrl(EVP_MD_CTX *ctx, int type, int arg, void *ptr) 409EVP_MD_CTX_ctrl(EVP_MD_CTX *ctx, int type, int arg, void *ptr)
@@ -442,4 +427,3 @@ EVP_MD_CTX_ctrl(EVP_MD_CTX *ctx, int type, int arg, void *ptr)
442 } 427 }
443 return ret; 428 return ret;
444} 429}
445LCRYPTO_ALIAS(EVP_MD_CTX_ctrl);
diff --git a/src/lib/libcrypto/evp/e_aes.c b/src/lib/libcrypto/evp/e_aes.c
index 35c8d944ed..3d3b1a9d6c 100644
--- a/src/lib/libcrypto/evp/e_aes.c
+++ b/src/lib/libcrypto/evp/e_aes.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: e_aes.c,v 1.52 2023/07/07 13:54:45 beck Exp $ */ 1/* $OpenBSD: e_aes.c,v 1.53 2023/07/07 19:37:53 beck Exp $ */
2/* ==================================================================== 2/* ====================================================================
3 * Copyright (c) 2001-2011 The OpenSSL Project. All rights reserved. 3 * Copyright (c) 2001-2011 The OpenSSL Project. All rights reserved.
4 * 4 *
@@ -572,7 +572,6 @@ EVP_aes_128_cbc(void)
572 return &aes_128_cbc; 572 return &aes_128_cbc;
573#endif 573#endif
574} 574}
575LCRYPTO_ALIAS(EVP_aes_128_cbc);
576 575
577#ifdef AESNI_CAPABLE 576#ifdef AESNI_CAPABLE
578static const EVP_CIPHER aesni_128_ecb = { 577static const EVP_CIPHER aesni_128_ecb = {
@@ -607,7 +606,6 @@ EVP_aes_128_ecb(void)
607 return &aes_128_ecb; 606 return &aes_128_ecb;
608#endif 607#endif
609} 608}
610LCRYPTO_ALIAS(EVP_aes_128_ecb);
611 609
612#ifdef AESNI_CAPABLE 610#ifdef AESNI_CAPABLE
613static const EVP_CIPHER aesni_128_ofb = { 611static const EVP_CIPHER aesni_128_ofb = {
@@ -642,7 +640,6 @@ EVP_aes_128_ofb(void)
642 return &aes_128_ofb; 640 return &aes_128_ofb;
643#endif 641#endif
644} 642}
645LCRYPTO_ALIAS(EVP_aes_128_ofb);
646 643
647#ifdef AESNI_CAPABLE 644#ifdef AESNI_CAPABLE
648static const EVP_CIPHER aesni_128_cfb = { 645static const EVP_CIPHER aesni_128_cfb = {
@@ -711,7 +708,6 @@ EVP_aes_128_cfb1(void)
711 return &aes_128_cfb1; 708 return &aes_128_cfb1;
712#endif 709#endif
713} 710}
714LCRYPTO_ALIAS(EVP_aes_128_cfb1);
715 711
716#ifdef AESNI_CAPABLE 712#ifdef AESNI_CAPABLE
717static const EVP_CIPHER aesni_128_cfb8 = { 713static const EVP_CIPHER aesni_128_cfb8 = {
@@ -746,7 +742,6 @@ EVP_aes_128_cfb8(void)
746 return &aes_128_cfb8; 742 return &aes_128_cfb8;
747#endif 743#endif
748} 744}
749LCRYPTO_ALIAS(EVP_aes_128_cfb8);
750 745
751#ifdef AESNI_CAPABLE 746#ifdef AESNI_CAPABLE
752static const EVP_CIPHER aesni_128_ctr = { 747static const EVP_CIPHER aesni_128_ctr = {
@@ -781,7 +776,6 @@ EVP_aes_128_ctr(void)
781 return &aes_128_ctr; 776 return &aes_128_ctr;
782#endif 777#endif
783} 778}
784LCRYPTO_ALIAS(EVP_aes_128_ctr);
785 779
786 780
787#ifdef AESNI_CAPABLE 781#ifdef AESNI_CAPABLE
@@ -817,7 +811,6 @@ EVP_aes_192_cbc(void)
817 return &aes_192_cbc; 811 return &aes_192_cbc;
818#endif 812#endif
819} 813}
820LCRYPTO_ALIAS(EVP_aes_192_cbc);
821 814
822#ifdef AESNI_CAPABLE 815#ifdef AESNI_CAPABLE
823static const EVP_CIPHER aesni_192_ecb = { 816static const EVP_CIPHER aesni_192_ecb = {
@@ -852,7 +845,6 @@ EVP_aes_192_ecb(void)
852 return &aes_192_ecb; 845 return &aes_192_ecb;
853#endif 846#endif
854} 847}
855LCRYPTO_ALIAS(EVP_aes_192_ecb);
856 848
857#ifdef AESNI_CAPABLE 849#ifdef AESNI_CAPABLE
858static const EVP_CIPHER aesni_192_ofb = { 850static const EVP_CIPHER aesni_192_ofb = {
@@ -887,7 +879,6 @@ EVP_aes_192_ofb(void)
887 return &aes_192_ofb; 879 return &aes_192_ofb;
888#endif 880#endif
889} 881}
890LCRYPTO_ALIAS(EVP_aes_192_ofb);
891 882
892#ifdef AESNI_CAPABLE 883#ifdef AESNI_CAPABLE
893static const EVP_CIPHER aesni_192_cfb = { 884static const EVP_CIPHER aesni_192_cfb = {
@@ -956,7 +947,6 @@ EVP_aes_192_cfb1(void)
956 return &aes_192_cfb1; 947 return &aes_192_cfb1;
957#endif 948#endif
958} 949}
959LCRYPTO_ALIAS(EVP_aes_192_cfb1);
960 950
961#ifdef AESNI_CAPABLE 951#ifdef AESNI_CAPABLE
962static const EVP_CIPHER aesni_192_cfb8 = { 952static const EVP_CIPHER aesni_192_cfb8 = {
@@ -991,7 +981,6 @@ EVP_aes_192_cfb8(void)
991 return &aes_192_cfb8; 981 return &aes_192_cfb8;
992#endif 982#endif
993} 983}
994LCRYPTO_ALIAS(EVP_aes_192_cfb8);
995 984
996#ifdef AESNI_CAPABLE 985#ifdef AESNI_CAPABLE
997static const EVP_CIPHER aesni_192_ctr = { 986static const EVP_CIPHER aesni_192_ctr = {
@@ -1026,7 +1015,6 @@ EVP_aes_192_ctr(void)
1026 return &aes_192_ctr; 1015 return &aes_192_ctr;
1027#endif 1016#endif
1028} 1017}
1029LCRYPTO_ALIAS(EVP_aes_192_ctr);
1030 1018
1031 1019
1032#ifdef AESNI_CAPABLE 1020#ifdef AESNI_CAPABLE
@@ -1062,7 +1050,6 @@ EVP_aes_256_cbc(void)
1062 return &aes_256_cbc; 1050 return &aes_256_cbc;
1063#endif 1051#endif
1064} 1052}
1065LCRYPTO_ALIAS(EVP_aes_256_cbc);
1066 1053
1067#ifdef AESNI_CAPABLE 1054#ifdef AESNI_CAPABLE
1068static const EVP_CIPHER aesni_256_ecb = { 1055static const EVP_CIPHER aesni_256_ecb = {
@@ -1097,7 +1084,6 @@ EVP_aes_256_ecb(void)
1097 return &aes_256_ecb; 1084 return &aes_256_ecb;
1098#endif 1085#endif
1099} 1086}
1100LCRYPTO_ALIAS(EVP_aes_256_ecb);
1101 1087
1102#ifdef AESNI_CAPABLE 1088#ifdef AESNI_CAPABLE
1103static const EVP_CIPHER aesni_256_ofb = { 1089static const EVP_CIPHER aesni_256_ofb = {
@@ -1132,7 +1118,6 @@ EVP_aes_256_ofb(void)
1132 return &aes_256_ofb; 1118 return &aes_256_ofb;
1133#endif 1119#endif
1134} 1120}
1135LCRYPTO_ALIAS(EVP_aes_256_ofb);
1136 1121
1137#ifdef AESNI_CAPABLE 1122#ifdef AESNI_CAPABLE
1138static const EVP_CIPHER aesni_256_cfb = { 1123static const EVP_CIPHER aesni_256_cfb = {
@@ -1201,7 +1186,6 @@ EVP_aes_256_cfb1(void)
1201 return &aes_256_cfb1; 1186 return &aes_256_cfb1;
1202#endif 1187#endif
1203} 1188}
1204LCRYPTO_ALIAS(EVP_aes_256_cfb1);
1205 1189
1206#ifdef AESNI_CAPABLE 1190#ifdef AESNI_CAPABLE
1207static const EVP_CIPHER aesni_256_cfb8 = { 1191static const EVP_CIPHER aesni_256_cfb8 = {
@@ -1236,7 +1220,6 @@ EVP_aes_256_cfb8(void)
1236 return &aes_256_cfb8; 1220 return &aes_256_cfb8;
1237#endif 1221#endif
1238} 1222}
1239LCRYPTO_ALIAS(EVP_aes_256_cfb8);
1240 1223
1241#ifdef AESNI_CAPABLE 1224#ifdef AESNI_CAPABLE
1242static const EVP_CIPHER aesni_256_ctr = { 1225static const EVP_CIPHER aesni_256_ctr = {
@@ -1271,7 +1254,6 @@ EVP_aes_256_ctr(void)
1271 return &aes_256_ctr; 1254 return &aes_256_ctr;
1272#endif 1255#endif
1273} 1256}
1274LCRYPTO_ALIAS(EVP_aes_256_ctr);
1275 1257
1276static int 1258static int
1277aes_gcm_cleanup(EVP_CIPHER_CTX *c) 1259aes_gcm_cleanup(EVP_CIPHER_CTX *c)
@@ -1690,7 +1672,6 @@ EVP_aes_128_gcm(void)
1690 return &aes_128_gcm; 1672 return &aes_128_gcm;
1691#endif 1673#endif
1692} 1674}
1693LCRYPTO_ALIAS(EVP_aes_128_gcm);
1694 1675
1695#ifdef AESNI_CAPABLE 1676#ifdef AESNI_CAPABLE
1696static const EVP_CIPHER aesni_192_gcm = { 1677static const EVP_CIPHER aesni_192_gcm = {
@@ -1729,7 +1710,6 @@ EVP_aes_192_gcm(void)
1729 return &aes_192_gcm; 1710 return &aes_192_gcm;
1730#endif 1711#endif
1731} 1712}
1732LCRYPTO_ALIAS(EVP_aes_192_gcm);
1733 1713
1734#ifdef AESNI_CAPABLE 1714#ifdef AESNI_CAPABLE
1735static const EVP_CIPHER aesni_256_gcm = { 1715static const EVP_CIPHER aesni_256_gcm = {
@@ -1768,7 +1748,6 @@ EVP_aes_256_gcm(void)
1768 return &aes_256_gcm; 1748 return &aes_256_gcm;
1769#endif 1749#endif
1770} 1750}
1771LCRYPTO_ALIAS(EVP_aes_256_gcm);
1772 1751
1773static int 1752static int
1774aes_xts_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr) 1753aes_xts_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr)
@@ -1935,7 +1914,6 @@ EVP_aes_128_xts(void)
1935 return &aes_128_xts; 1914 return &aes_128_xts;
1936#endif 1915#endif
1937} 1916}
1938LCRYPTO_ALIAS(EVP_aes_128_xts);
1939 1917
1940#ifdef AESNI_CAPABLE 1918#ifdef AESNI_CAPABLE
1941static const EVP_CIPHER aesni_256_xts = { 1919static const EVP_CIPHER aesni_256_xts = {
@@ -1974,7 +1952,6 @@ EVP_aes_256_xts(void)
1974 return &aes_256_xts; 1952 return &aes_256_xts;
1975#endif 1953#endif
1976} 1954}
1977LCRYPTO_ALIAS(EVP_aes_256_xts);
1978 1955
1979static int 1956static int
1980aes_ccm_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr) 1957aes_ccm_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr)
@@ -2171,7 +2148,6 @@ EVP_aes_128_ccm(void)
2171 return &aes_128_ccm; 2148 return &aes_128_ccm;
2172#endif 2149#endif
2173} 2150}
2174LCRYPTO_ALIAS(EVP_aes_128_ccm);
2175 2151
2176#ifdef AESNI_CAPABLE 2152#ifdef AESNI_CAPABLE
2177static const EVP_CIPHER aesni_192_ccm = { 2153static const EVP_CIPHER aesni_192_ccm = {
@@ -2210,7 +2186,6 @@ EVP_aes_192_ccm(void)
2210 return &aes_192_ccm; 2186 return &aes_192_ccm;
2211#endif 2187#endif
2212} 2188}
2213LCRYPTO_ALIAS(EVP_aes_192_ccm);
2214 2189
2215#ifdef AESNI_CAPABLE 2190#ifdef AESNI_CAPABLE
2216static const EVP_CIPHER aesni_256_ccm = { 2191static const EVP_CIPHER aesni_256_ccm = {
@@ -2249,7 +2224,6 @@ EVP_aes_256_ccm(void)
2249 return &aes_256_ccm; 2224 return &aes_256_ccm;
2250#endif 2225#endif
2251} 2226}
2252LCRYPTO_ALIAS(EVP_aes_256_ccm);
2253 2227
2254#define EVP_AEAD_AES_GCM_TAG_LEN 16 2228#define EVP_AEAD_AES_GCM_TAG_LEN 16
2255 2229
@@ -2440,14 +2414,12 @@ EVP_aead_aes_128_gcm(void)
2440{ 2414{
2441 return &aead_aes_128_gcm; 2415 return &aead_aes_128_gcm;
2442} 2416}
2443LCRYPTO_ALIAS(EVP_aead_aes_128_gcm);
2444 2417
2445const EVP_AEAD * 2418const EVP_AEAD *
2446EVP_aead_aes_256_gcm(void) 2419EVP_aead_aes_256_gcm(void)
2447{ 2420{
2448 return &aead_aes_256_gcm; 2421 return &aead_aes_256_gcm;
2449} 2422}
2450LCRYPTO_ALIAS(EVP_aead_aes_256_gcm);
2451 2423
2452typedef struct { 2424typedef struct {
2453 union { 2425 union {
@@ -2573,7 +2545,6 @@ EVP_aes_128_wrap(void)
2573{ 2545{
2574 return &aes_128_wrap; 2546 return &aes_128_wrap;
2575} 2547}
2576LCRYPTO_ALIAS(EVP_aes_128_wrap);
2577 2548
2578static const EVP_CIPHER aes_192_wrap = { 2549static const EVP_CIPHER aes_192_wrap = {
2579 .nid = NID_id_aes192_wrap, 2550 .nid = NID_id_aes192_wrap,
@@ -2596,7 +2567,6 @@ EVP_aes_192_wrap(void)
2596{ 2567{
2597 return &aes_192_wrap; 2568 return &aes_192_wrap;
2598} 2569}
2599LCRYPTO_ALIAS(EVP_aes_192_wrap);
2600 2570
2601static const EVP_CIPHER aes_256_wrap = { 2571static const EVP_CIPHER aes_256_wrap = {
2602 .nid = NID_id_aes256_wrap, 2572 .nid = NID_id_aes256_wrap,
@@ -2619,6 +2589,5 @@ EVP_aes_256_wrap(void)
2619{ 2589{
2620 return &aes_256_wrap; 2590 return &aes_256_wrap;
2621} 2591}
2622LCRYPTO_ALIAS(EVP_aes_256_wrap);
2623 2592
2624#endif 2593#endif
diff --git a/src/lib/libcrypto/evp/e_aes_cbc_hmac_sha1.c b/src/lib/libcrypto/evp/e_aes_cbc_hmac_sha1.c
index b905b359c9..09a73da748 100644
--- a/src/lib/libcrypto/evp/e_aes_cbc_hmac_sha1.c
+++ b/src/lib/libcrypto/evp/e_aes_cbc_hmac_sha1.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: e_aes_cbc_hmac_sha1.c,v 1.18 2023/07/07 13:54:45 beck Exp $ */ 1/* $OpenBSD: e_aes_cbc_hmac_sha1.c,v 1.19 2023/07/07 19:37:53 beck Exp $ */
2/* ==================================================================== 2/* ====================================================================
3 * Copyright (c) 2011-2013 The OpenSSL Project. All rights reserved. 3 * Copyright (c) 2011-2013 The OpenSSL Project. All rights reserved.
4 * 4 *
@@ -581,7 +581,6 @@ EVP_aes_128_cbc_hmac_sha1(void)
581 return (OPENSSL_cpu_caps() & CPUCAP_MASK_AESNI) ? 581 return (OPENSSL_cpu_caps() & CPUCAP_MASK_AESNI) ?
582 &aesni_128_cbc_hmac_sha1_cipher : NULL; 582 &aesni_128_cbc_hmac_sha1_cipher : NULL;
583} 583}
584LCRYPTO_ALIAS(EVP_aes_128_cbc_hmac_sha1);
585 584
586const EVP_CIPHER * 585const EVP_CIPHER *
587EVP_aes_256_cbc_hmac_sha1(void) 586EVP_aes_256_cbc_hmac_sha1(void)
@@ -589,20 +588,17 @@ EVP_aes_256_cbc_hmac_sha1(void)
589 return (OPENSSL_cpu_caps() & CPUCAP_MASK_AESNI) ? 588 return (OPENSSL_cpu_caps() & CPUCAP_MASK_AESNI) ?
590 &aesni_256_cbc_hmac_sha1_cipher : NULL; 589 &aesni_256_cbc_hmac_sha1_cipher : NULL;
591} 590}
592LCRYPTO_ALIAS(EVP_aes_256_cbc_hmac_sha1);
593#else 591#else
594const EVP_CIPHER * 592const EVP_CIPHER *
595EVP_aes_128_cbc_hmac_sha1(void) 593EVP_aes_128_cbc_hmac_sha1(void)
596{ 594{
597 return NULL; 595 return NULL;
598} 596}
599LCRYPTO_ALIAS(EVP_aes_128_cbc_hmac_sha1);
600 597
601const EVP_CIPHER * 598const EVP_CIPHER *
602EVP_aes_256_cbc_hmac_sha1(void) 599EVP_aes_256_cbc_hmac_sha1(void)
603{ 600{
604 return NULL; 601 return NULL;
605} 602}
606LCRYPTO_ALIAS(EVP_aes_256_cbc_hmac_sha1);
607#endif 603#endif
608#endif 604#endif
diff --git a/src/lib/libcrypto/evp/e_bf.c b/src/lib/libcrypto/evp/e_bf.c
index 4e671fab3e..9146a531e4 100644
--- a/src/lib/libcrypto/evp/e_bf.c
+++ b/src/lib/libcrypto/evp/e_bf.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: e_bf.c,v 1.16 2023/07/07 13:54:45 beck Exp $ */ 1/* $OpenBSD: e_bf.c,v 1.17 2023/07/07 19:37:53 beck 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 *
@@ -178,7 +178,6 @@ EVP_bf_cbc(void)
178{ 178{
179 return &bf_cbc; 179 return &bf_cbc;
180} 180}
181LCRYPTO_ALIAS(EVP_bf_cbc);
182 181
183static const EVP_CIPHER bf_cfb64 = { 182static const EVP_CIPHER bf_cfb64 = {
184 .nid = NID_bf_cfb64, 183 .nid = NID_bf_cfb64,
@@ -201,7 +200,6 @@ EVP_bf_cfb64(void)
201{ 200{
202 return &bf_cfb64; 201 return &bf_cfb64;
203} 202}
204LCRYPTO_ALIAS(EVP_bf_cfb64);
205 203
206static const EVP_CIPHER bf_ofb = { 204static const EVP_CIPHER bf_ofb = {
207 .nid = NID_bf_ofb64, 205 .nid = NID_bf_ofb64,
@@ -224,7 +222,6 @@ EVP_bf_ofb(void)
224{ 222{
225 return &bf_ofb; 223 return &bf_ofb;
226} 224}
227LCRYPTO_ALIAS(EVP_bf_ofb);
228 225
229static const EVP_CIPHER bf_ecb = { 226static const EVP_CIPHER bf_ecb = {
230 .nid = NID_bf_ecb, 227 .nid = NID_bf_ecb,
@@ -247,5 +244,4 @@ EVP_bf_ecb(void)
247{ 244{
248 return &bf_ecb; 245 return &bf_ecb;
249} 246}
250LCRYPTO_ALIAS(EVP_bf_ecb);
251#endif 247#endif
diff --git a/src/lib/libcrypto/evp/e_camellia.c b/src/lib/libcrypto/evp/e_camellia.c
index 0ab6e9ca60..cec7649e3f 100644
--- a/src/lib/libcrypto/evp/e_camellia.c
+++ b/src/lib/libcrypto/evp/e_camellia.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: e_camellia.c,v 1.17 2023/07/07 13:54:45 beck Exp $ */ 1/* $OpenBSD: e_camellia.c,v 1.18 2023/07/07 19:37:53 beck Exp $ */
2/* ==================================================================== 2/* ====================================================================
3 * Copyright (c) 2006 The OpenSSL Project. All rights reserved. 3 * Copyright (c) 2006 The OpenSSL Project. All rights reserved.
4 * 4 *
@@ -179,7 +179,6 @@ EVP_camellia_128_cbc(void)
179{ 179{
180 return &camellia_128_cbc; 180 return &camellia_128_cbc;
181} 181}
182LCRYPTO_ALIAS(EVP_camellia_128_cbc);
183 182
184static const EVP_CIPHER camellia_128_cfb128 = { 183static const EVP_CIPHER camellia_128_cfb128 = {
185 .nid = NID_camellia_128_cfb128, 184 .nid = NID_camellia_128_cfb128,
@@ -202,7 +201,6 @@ EVP_camellia_128_cfb128(void)
202{ 201{
203 return &camellia_128_cfb128; 202 return &camellia_128_cfb128;
204} 203}
205LCRYPTO_ALIAS(EVP_camellia_128_cfb128);
206 204
207static const EVP_CIPHER camellia_128_ofb = { 205static const EVP_CIPHER camellia_128_ofb = {
208 .nid = NID_camellia_128_ofb128, 206 .nid = NID_camellia_128_ofb128,
@@ -225,7 +223,6 @@ EVP_camellia_128_ofb(void)
225{ 223{
226 return &camellia_128_ofb; 224 return &camellia_128_ofb;
227} 225}
228LCRYPTO_ALIAS(EVP_camellia_128_ofb);
229 226
230static const EVP_CIPHER camellia_128_ecb = { 227static const EVP_CIPHER camellia_128_ecb = {
231 .nid = NID_camellia_128_ecb, 228 .nid = NID_camellia_128_ecb,
@@ -248,7 +245,6 @@ EVP_camellia_128_ecb(void)
248{ 245{
249 return &camellia_128_ecb; 246 return &camellia_128_ecb;
250} 247}
251LCRYPTO_ALIAS(EVP_camellia_128_ecb);
252 248
253static int 249static int
254camellia_192_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, const unsigned char *in, size_t inl) 250camellia_192_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, const unsigned char *in, size_t inl)
@@ -341,7 +337,6 @@ EVP_camellia_192_cbc(void)
341{ 337{
342 return &camellia_192_cbc; 338 return &camellia_192_cbc;
343} 339}
344LCRYPTO_ALIAS(EVP_camellia_192_cbc);
345 340
346static const EVP_CIPHER camellia_192_cfb128 = { 341static const EVP_CIPHER camellia_192_cfb128 = {
347 .nid = NID_camellia_192_cfb128, 342 .nid = NID_camellia_192_cfb128,
@@ -364,7 +359,6 @@ EVP_camellia_192_cfb128(void)
364{ 359{
365 return &camellia_192_cfb128; 360 return &camellia_192_cfb128;
366} 361}
367LCRYPTO_ALIAS(EVP_camellia_192_cfb128);
368 362
369static const EVP_CIPHER camellia_192_ofb = { 363static const EVP_CIPHER camellia_192_ofb = {
370 .nid = NID_camellia_192_ofb128, 364 .nid = NID_camellia_192_ofb128,
@@ -387,7 +381,6 @@ EVP_camellia_192_ofb(void)
387{ 381{
388 return &camellia_192_ofb; 382 return &camellia_192_ofb;
389} 383}
390LCRYPTO_ALIAS(EVP_camellia_192_ofb);
391 384
392static const EVP_CIPHER camellia_192_ecb = { 385static const EVP_CIPHER camellia_192_ecb = {
393 .nid = NID_camellia_192_ecb, 386 .nid = NID_camellia_192_ecb,
@@ -410,7 +403,6 @@ EVP_camellia_192_ecb(void)
410{ 403{
411 return &camellia_192_ecb; 404 return &camellia_192_ecb;
412} 405}
413LCRYPTO_ALIAS(EVP_camellia_192_ecb);
414 406
415static int 407static int
416camellia_256_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, const unsigned char *in, size_t inl) 408camellia_256_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, const unsigned char *in, size_t inl)
@@ -503,7 +495,6 @@ EVP_camellia_256_cbc(void)
503{ 495{
504 return &camellia_256_cbc; 496 return &camellia_256_cbc;
505} 497}
506LCRYPTO_ALIAS(EVP_camellia_256_cbc);
507 498
508static const EVP_CIPHER camellia_256_cfb128 = { 499static const EVP_CIPHER camellia_256_cfb128 = {
509 .nid = NID_camellia_256_cfb128, 500 .nid = NID_camellia_256_cfb128,
@@ -526,7 +517,6 @@ EVP_camellia_256_cfb128(void)
526{ 517{
527 return &camellia_256_cfb128; 518 return &camellia_256_cfb128;
528} 519}
529LCRYPTO_ALIAS(EVP_camellia_256_cfb128);
530 520
531static const EVP_CIPHER camellia_256_ofb = { 521static const EVP_CIPHER camellia_256_ofb = {
532 .nid = NID_camellia_256_ofb128, 522 .nid = NID_camellia_256_ofb128,
@@ -549,7 +539,6 @@ EVP_camellia_256_ofb(void)
549{ 539{
550 return &camellia_256_ofb; 540 return &camellia_256_ofb;
551} 541}
552LCRYPTO_ALIAS(EVP_camellia_256_ofb);
553 542
554static const EVP_CIPHER camellia_256_ecb = { 543static const EVP_CIPHER camellia_256_ecb = {
555 .nid = NID_camellia_256_ecb, 544 .nid = NID_camellia_256_ecb,
@@ -572,7 +561,6 @@ EVP_camellia_256_ecb(void)
572{ 561{
573 return &camellia_256_ecb; 562 return &camellia_256_ecb;
574} 563}
575LCRYPTO_ALIAS(EVP_camellia_256_ecb);
576 564
577static int 565static int
578camellia_128_cfb1_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, const unsigned char *in, size_t inl) 566camellia_128_cfb1_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, const unsigned char *in, size_t inl)
@@ -617,7 +605,6 @@ EVP_camellia_128_cfb1(void)
617{ 605{
618 return &camellia_128_cfb1; 606 return &camellia_128_cfb1;
619} 607}
620LCRYPTO_ALIAS(EVP_camellia_128_cfb1);
621 608
622static int 609static int
623camellia_192_cfb1_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, const unsigned char *in, size_t inl) 610camellia_192_cfb1_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, const unsigned char *in, size_t inl)
@@ -662,7 +649,6 @@ EVP_camellia_192_cfb1(void)
662{ 649{
663 return &camellia_192_cfb1; 650 return &camellia_192_cfb1;
664} 651}
665LCRYPTO_ALIAS(EVP_camellia_192_cfb1);
666 652
667static int 653static int
668camellia_256_cfb1_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, const unsigned char *in, size_t inl) 654camellia_256_cfb1_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, const unsigned char *in, size_t inl)
@@ -707,7 +693,6 @@ EVP_camellia_256_cfb1(void)
707{ 693{
708 return &camellia_256_cfb1; 694 return &camellia_256_cfb1;
709} 695}
710LCRYPTO_ALIAS(EVP_camellia_256_cfb1);
711 696
712 697
713static int 698static int
@@ -751,7 +736,6 @@ EVP_camellia_128_cfb8(void)
751{ 736{
752 return &camellia_128_cfb8; 737 return &camellia_128_cfb8;
753} 738}
754LCRYPTO_ALIAS(EVP_camellia_128_cfb8);
755 739
756static int 740static int
757camellia_192_cfb8_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, const unsigned char *in, size_t inl) 741camellia_192_cfb8_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, const unsigned char *in, size_t inl)
@@ -794,7 +778,6 @@ EVP_camellia_192_cfb8(void)
794{ 778{
795 return &camellia_192_cfb8; 779 return &camellia_192_cfb8;
796} 780}
797LCRYPTO_ALIAS(EVP_camellia_192_cfb8);
798 781
799static int 782static int
800camellia_256_cfb8_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, const unsigned char *in, size_t inl) 783camellia_256_cfb8_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, const unsigned char *in, size_t inl)
@@ -837,5 +820,4 @@ EVP_camellia_256_cfb8(void)
837{ 820{
838 return &camellia_256_cfb8; 821 return &camellia_256_cfb8;
839} 822}
840LCRYPTO_ALIAS(EVP_camellia_256_cfb8);
841#endif 823#endif
diff --git a/src/lib/libcrypto/evp/e_cast.c b/src/lib/libcrypto/evp/e_cast.c
index 8f62ba6f29..a0e52dfdf4 100644
--- a/src/lib/libcrypto/evp/e_cast.c
+++ b/src/lib/libcrypto/evp/e_cast.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: e_cast.c,v 1.15 2023/07/07 13:54:45 beck Exp $ */ 1/* $OpenBSD: e_cast.c,v 1.16 2023/07/07 19:37:53 beck 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 *
@@ -178,7 +178,6 @@ EVP_cast5_cbc(void)
178{ 178{
179 return &cast5_cbc; 179 return &cast5_cbc;
180} 180}
181LCRYPTO_ALIAS(EVP_cast5_cbc);
182 181
183static const EVP_CIPHER cast5_cfb64 = { 182static const EVP_CIPHER cast5_cfb64 = {
184 .nid = NID_cast5_cfb64, 183 .nid = NID_cast5_cfb64,
@@ -201,7 +200,6 @@ EVP_cast5_cfb64(void)
201{ 200{
202 return &cast5_cfb64; 201 return &cast5_cfb64;
203} 202}
204LCRYPTO_ALIAS(EVP_cast5_cfb64);
205 203
206static const EVP_CIPHER cast5_ofb = { 204static const EVP_CIPHER cast5_ofb = {
207 .nid = NID_cast5_ofb64, 205 .nid = NID_cast5_ofb64,
@@ -224,7 +222,6 @@ EVP_cast5_ofb(void)
224{ 222{
225 return &cast5_ofb; 223 return &cast5_ofb;
226} 224}
227LCRYPTO_ALIAS(EVP_cast5_ofb);
228 225
229static const EVP_CIPHER cast5_ecb = { 226static const EVP_CIPHER cast5_ecb = {
230 .nid = NID_cast5_ecb, 227 .nid = NID_cast5_ecb,
@@ -247,5 +244,4 @@ EVP_cast5_ecb(void)
247{ 244{
248 return &cast5_ecb; 245 return &cast5_ecb;
249} 246}
250LCRYPTO_ALIAS(EVP_cast5_ecb);
251#endif 247#endif
diff --git a/src/lib/libcrypto/evp/e_chacha.c b/src/lib/libcrypto/evp/e_chacha.c
index f781d66339..add0488477 100644
--- a/src/lib/libcrypto/evp/e_chacha.c
+++ b/src/lib/libcrypto/evp/e_chacha.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: e_chacha.c,v 1.11 2023/07/07 13:54:45 beck Exp $ */ 1/* $OpenBSD: e_chacha.c,v 1.12 2023/07/07 19:37:53 beck Exp $ */
2/* 2/*
3 * Copyright (c) 2014 Joel Sing <jsing@openbsd.org> 3 * Copyright (c) 2014 Joel Sing <jsing@openbsd.org>
4 * 4 *
@@ -74,6 +74,5 @@ EVP_chacha20(void)
74{ 74{
75 return (&chacha20_cipher); 75 return (&chacha20_cipher);
76} 76}
77LCRYPTO_ALIAS(EVP_chacha20);
78 77
79#endif 78#endif
diff --git a/src/lib/libcrypto/evp/e_chacha20poly1305.c b/src/lib/libcrypto/evp/e_chacha20poly1305.c
index 4b8f47cefc..a17657899b 100644
--- a/src/lib/libcrypto/evp/e_chacha20poly1305.c
+++ b/src/lib/libcrypto/evp/e_chacha20poly1305.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: e_chacha20poly1305.c,v 1.29 2023/07/07 13:54:45 beck Exp $ */ 1/* $OpenBSD: e_chacha20poly1305.c,v 1.30 2023/07/07 19:37:53 beck Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2022 Joel Sing <jsing@openbsd.org> 4 * Copyright (c) 2022 Joel Sing <jsing@openbsd.org>
@@ -348,7 +348,6 @@ EVP_aead_chacha20_poly1305()
348{ 348{
349 return &aead_chacha20_poly1305; 349 return &aead_chacha20_poly1305;
350} 350}
351LCRYPTO_ALIAS(EVP_aead_chacha20_poly1305);
352 351
353static const EVP_AEAD aead_xchacha20_poly1305 = { 352static const EVP_AEAD aead_xchacha20_poly1305 = {
354 .key_len = 32, 353 .key_len = 32,
@@ -367,7 +366,6 @@ EVP_aead_xchacha20_poly1305()
367{ 366{
368 return &aead_xchacha20_poly1305; 367 return &aead_xchacha20_poly1305;
369} 368}
370LCRYPTO_ALIAS(EVP_aead_xchacha20_poly1305);
371 369
372struct chacha20_poly1305_ctx { 370struct chacha20_poly1305_ctx {
373 ChaCha_ctx chacha; 371 ChaCha_ctx chacha;
@@ -608,6 +606,5 @@ EVP_chacha20_poly1305(void)
608{ 606{
609 return &cipher_chacha20_poly1305; 607 return &cipher_chacha20_poly1305;
610} 608}
611LCRYPTO_ALIAS(EVP_chacha20_poly1305);
612 609
613#endif /* !OPENSSL_NO_CHACHA && !OPENSSL_NO_POLY1305 */ 610#endif /* !OPENSSL_NO_CHACHA && !OPENSSL_NO_POLY1305 */
diff --git a/src/lib/libcrypto/evp/e_des.c b/src/lib/libcrypto/evp/e_des.c
index c87de1a690..64d098ca14 100644
--- a/src/lib/libcrypto/evp/e_des.c
+++ b/src/lib/libcrypto/evp/e_des.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: e_des.c,v 1.21 2023/07/07 13:54:45 beck Exp $ */ 1/* $OpenBSD: e_des.c,v 1.22 2023/07/07 19:37:53 beck 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 *
@@ -242,7 +242,6 @@ EVP_des_cbc(void)
242{ 242{
243 return &des_cbc; 243 return &des_cbc;
244} 244}
245LCRYPTO_ALIAS(EVP_des_cbc);
246 245
247static const EVP_CIPHER des_cfb64 = { 246static const EVP_CIPHER des_cfb64 = {
248 .nid = NID_des_cfb64, 247 .nid = NID_des_cfb64,
@@ -265,7 +264,6 @@ EVP_des_cfb64(void)
265{ 264{
266 return &des_cfb64; 265 return &des_cfb64;
267} 266}
268LCRYPTO_ALIAS(EVP_des_cfb64);
269 267
270static const EVP_CIPHER des_ofb = { 268static const EVP_CIPHER des_ofb = {
271 .nid = NID_des_ofb64, 269 .nid = NID_des_ofb64,
@@ -288,7 +286,6 @@ EVP_des_ofb(void)
288{ 286{
289 return &des_ofb; 287 return &des_ofb;
290} 288}
291LCRYPTO_ALIAS(EVP_des_ofb);
292 289
293static const EVP_CIPHER des_ecb = { 290static const EVP_CIPHER des_ecb = {
294 .nid = NID_des_ecb, 291 .nid = NID_des_ecb,
@@ -311,7 +308,6 @@ EVP_des_ecb(void)
311{ 308{
312 return &des_ecb; 309 return &des_ecb;
313} 310}
314LCRYPTO_ALIAS(EVP_des_ecb);
315 311
316static const EVP_CIPHER des_cfb1 = { 312static const EVP_CIPHER des_cfb1 = {
317 .nid = NID_des_cfb1, 313 .nid = NID_des_cfb1,
@@ -334,7 +330,6 @@ EVP_des_cfb1(void)
334{ 330{
335 return &des_cfb1; 331 return &des_cfb1;
336} 332}
337LCRYPTO_ALIAS(EVP_des_cfb1);
338 333
339static const EVP_CIPHER des_cfb8 = { 334static const EVP_CIPHER des_cfb8 = {
340 .nid = NID_des_cfb8, 335 .nid = NID_des_cfb8,
@@ -357,5 +352,4 @@ EVP_des_cfb8(void)
357{ 352{
358 return &des_cfb8; 353 return &des_cfb8;
359} 354}
360LCRYPTO_ALIAS(EVP_des_cfb8);
361#endif 355#endif
diff --git a/src/lib/libcrypto/evp/e_des3.c b/src/lib/libcrypto/evp/e_des3.c
index d345c354c0..3e6c5234cb 100644
--- a/src/lib/libcrypto/evp/e_des3.c
+++ b/src/lib/libcrypto/evp/e_des3.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: e_des3.c,v 1.27 2023/07/07 13:54:45 beck Exp $ */ 1/* $OpenBSD: e_des3.c,v 1.28 2023/07/07 19:37:53 beck 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 *
@@ -274,7 +274,6 @@ EVP_des_ede_cbc(void)
274{ 274{
275 return &des_ede_cbc; 275 return &des_ede_cbc;
276} 276}
277LCRYPTO_ALIAS(EVP_des_ede_cbc);
278 277
279static const EVP_CIPHER des_ede_cfb64 = { 278static const EVP_CIPHER des_ede_cfb64 = {
280 .nid = NID_des_ede_cfb64, 279 .nid = NID_des_ede_cfb64,
@@ -297,7 +296,6 @@ EVP_des_ede_cfb64(void)
297{ 296{
298 return &des_ede_cfb64; 297 return &des_ede_cfb64;
299} 298}
300LCRYPTO_ALIAS(EVP_des_ede_cfb64);
301 299
302static const EVP_CIPHER des_ede_ofb = { 300static const EVP_CIPHER des_ede_ofb = {
303 .nid = NID_des_ede_ofb64, 301 .nid = NID_des_ede_ofb64,
@@ -320,7 +318,6 @@ EVP_des_ede_ofb(void)
320{ 318{
321 return &des_ede_ofb; 319 return &des_ede_ofb;
322} 320}
323LCRYPTO_ALIAS(EVP_des_ede_ofb);
324 321
325static const EVP_CIPHER des_ede_ecb = { 322static const EVP_CIPHER des_ede_ecb = {
326 .nid = NID_des_ede_ecb, 323 .nid = NID_des_ede_ecb,
@@ -343,7 +340,6 @@ EVP_des_ede_ecb(void)
343{ 340{
344 return &des_ede_ecb; 341 return &des_ede_ecb;
345} 342}
346LCRYPTO_ALIAS(EVP_des_ede_ecb);
347 343
348 344
349#define des_ede3_cfb64_cipher des_ede_cfb64_cipher 345#define des_ede3_cfb64_cipher des_ede_cfb64_cipher
@@ -372,7 +368,6 @@ EVP_des_ede3_cbc(void)
372{ 368{
373 return &des_ede3_cbc; 369 return &des_ede3_cbc;
374} 370}
375LCRYPTO_ALIAS(EVP_des_ede3_cbc);
376 371
377static const EVP_CIPHER des_ede3_cfb64 = { 372static const EVP_CIPHER des_ede3_cfb64 = {
378 .nid = NID_des_ede3_cfb64, 373 .nid = NID_des_ede3_cfb64,
@@ -395,7 +390,6 @@ EVP_des_ede3_cfb64(void)
395{ 390{
396 return &des_ede3_cfb64; 391 return &des_ede3_cfb64;
397} 392}
398LCRYPTO_ALIAS(EVP_des_ede3_cfb64);
399 393
400static const EVP_CIPHER des_ede3_ofb = { 394static const EVP_CIPHER des_ede3_ofb = {
401 .nid = NID_des_ede3_ofb64, 395 .nid = NID_des_ede3_ofb64,
@@ -418,7 +412,6 @@ EVP_des_ede3_ofb(void)
418{ 412{
419 return &des_ede3_ofb; 413 return &des_ede3_ofb;
420} 414}
421LCRYPTO_ALIAS(EVP_des_ede3_ofb);
422 415
423static const EVP_CIPHER des_ede3_ecb = { 416static const EVP_CIPHER des_ede3_ecb = {
424 .nid = NID_des_ede3_ecb, 417 .nid = NID_des_ede3_ecb,
@@ -441,7 +434,6 @@ EVP_des_ede3_ecb(void)
441{ 434{
442 return &des_ede3_ecb; 435 return &des_ede3_ecb;
443} 436}
444LCRYPTO_ALIAS(EVP_des_ede3_ecb);
445 437
446 438
447static const EVP_CIPHER des_ede3_cfb1 = { 439static const EVP_CIPHER des_ede3_cfb1 = {
@@ -465,7 +457,6 @@ EVP_des_ede3_cfb1(void)
465{ 457{
466 return &des_ede3_cfb1; 458 return &des_ede3_cfb1;
467} 459}
468LCRYPTO_ALIAS(EVP_des_ede3_cfb1);
469 460
470 461
471static const EVP_CIPHER des_ede3_cfb8 = { 462static const EVP_CIPHER des_ede3_cfb8 = {
@@ -489,19 +480,16 @@ EVP_des_ede3_cfb8(void)
489{ 480{
490 return &des_ede3_cfb8; 481 return &des_ede3_cfb8;
491} 482}
492LCRYPTO_ALIAS(EVP_des_ede3_cfb8);
493 483
494const EVP_CIPHER * 484const EVP_CIPHER *
495EVP_des_ede(void) 485EVP_des_ede(void)
496{ 486{
497 return &des_ede_ecb; 487 return &des_ede_ecb;
498} 488}
499LCRYPTO_ALIAS(EVP_des_ede);
500 489
501const EVP_CIPHER * 490const EVP_CIPHER *
502EVP_des_ede3(void) 491EVP_des_ede3(void)
503{ 492{
504 return &des_ede3_ecb; 493 return &des_ede3_ecb;
505} 494}
506LCRYPTO_ALIAS(EVP_des_ede3);
507#endif 495#endif
diff --git a/src/lib/libcrypto/evp/e_gost2814789.c b/src/lib/libcrypto/evp/e_gost2814789.c
index fdbc662810..359cf5e4ca 100644
--- a/src/lib/libcrypto/evp/e_gost2814789.c
+++ b/src/lib/libcrypto/evp/e_gost2814789.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: e_gost2814789.c,v 1.12 2023/07/07 13:54:45 beck Exp $ */ 1/* $OpenBSD: e_gost2814789.c,v 1.13 2023/07/07 19:37:53 beck Exp $ */
2/* 2/*
3 * Copyright (c) 2014 Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> 3 * Copyright (c) 2014 Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
4 * Copyright (c) 2005-2006 Cryptocom LTD 4 * Copyright (c) 2005-2006 Cryptocom LTD
@@ -268,7 +268,6 @@ EVP_gost2814789_ecb(void)
268{ 268{
269 return &gost2814789_ecb; 269 return &gost2814789_ecb;
270} 270}
271LCRYPTO_ALIAS(EVP_gost2814789_ecb);
272 271
273static const EVP_CIPHER gost2814789_cfb64 = { 272static const EVP_CIPHER gost2814789_cfb64 = {
274 .nid = NID_gost89_cfb64, 273 .nid = NID_gost89_cfb64,
@@ -291,7 +290,6 @@ EVP_gost2814789_cfb64(void)
291{ 290{
292 return &gost2814789_cfb64; 291 return &gost2814789_cfb64;
293} 292}
294LCRYPTO_ALIAS(EVP_gost2814789_cfb64);
295 293
296static const EVP_CIPHER gost2814789_cnt = { 294static const EVP_CIPHER gost2814789_cnt = {
297 .nid = NID_gost89_cnt, 295 .nid = NID_gost89_cnt,
@@ -314,5 +312,4 @@ EVP_gost2814789_cnt(void)
314{ 312{
315 return &gost2814789_cnt; 313 return &gost2814789_cnt;
316} 314}
317LCRYPTO_ALIAS(EVP_gost2814789_cnt);
318#endif 315#endif
diff --git a/src/lib/libcrypto/evp/e_idea.c b/src/lib/libcrypto/evp/e_idea.c
index e330888ba6..b2129dc990 100644
--- a/src/lib/libcrypto/evp/e_idea.c
+++ b/src/lib/libcrypto/evp/e_idea.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: e_idea.c,v 1.19 2023/07/07 13:54:45 beck Exp $ */ 1/* $OpenBSD: e_idea.c,v 1.20 2023/07/07 19:37:53 beck 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 *
@@ -197,7 +197,6 @@ EVP_idea_cbc(void)
197{ 197{
198 return &idea_cbc; 198 return &idea_cbc;
199} 199}
200LCRYPTO_ALIAS(EVP_idea_cbc);
201 200
202static const EVP_CIPHER idea_cfb64 = { 201static const EVP_CIPHER idea_cfb64 = {
203 .nid = NID_idea_cfb64, 202 .nid = NID_idea_cfb64,
@@ -220,7 +219,6 @@ EVP_idea_cfb64(void)
220{ 219{
221 return &idea_cfb64; 220 return &idea_cfb64;
222} 221}
223LCRYPTO_ALIAS(EVP_idea_cfb64);
224 222
225static const EVP_CIPHER idea_ofb = { 223static const EVP_CIPHER idea_ofb = {
226 .nid = NID_idea_ofb64, 224 .nid = NID_idea_ofb64,
@@ -243,7 +241,6 @@ EVP_idea_ofb(void)
243{ 241{
244 return &idea_ofb; 242 return &idea_ofb;
245} 243}
246LCRYPTO_ALIAS(EVP_idea_ofb);
247 244
248static const EVP_CIPHER idea_ecb = { 245static const EVP_CIPHER idea_ecb = {
249 .nid = NID_idea_ecb, 246 .nid = NID_idea_ecb,
@@ -266,5 +263,4 @@ EVP_idea_ecb(void)
266{ 263{
267 return &idea_ecb; 264 return &idea_ecb;
268} 265}
269LCRYPTO_ALIAS(EVP_idea_ecb);
270#endif 266#endif
diff --git a/src/lib/libcrypto/evp/e_null.c b/src/lib/libcrypto/evp/e_null.c
index 3daadb1479..f30c207ff6 100644
--- a/src/lib/libcrypto/evp/e_null.c
+++ b/src/lib/libcrypto/evp/e_null.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: e_null.c,v 1.17 2023/07/07 13:54:45 beck Exp $ */ 1/* $OpenBSD: e_null.c,v 1.18 2023/07/07 19:37:53 beck 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 *
@@ -88,7 +88,6 @@ EVP_enc_null(void)
88{ 88{
89 return (&n_cipher); 89 return (&n_cipher);
90} 90}
91LCRYPTO_ALIAS(EVP_enc_null);
92 91
93static int 92static int
94null_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, 93null_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
diff --git a/src/lib/libcrypto/evp/e_rc2.c b/src/lib/libcrypto/evp/e_rc2.c
index 540c94cdfd..32559e223f 100644
--- a/src/lib/libcrypto/evp/e_rc2.c
+++ b/src/lib/libcrypto/evp/e_rc2.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: e_rc2.c,v 1.21 2023/07/07 13:54:45 beck Exp $ */ 1/* $OpenBSD: e_rc2.c,v 1.22 2023/07/07 19:37:53 beck 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 *
@@ -180,7 +180,6 @@ EVP_rc2_cbc(void)
180{ 180{
181 return &rc2_cbc; 181 return &rc2_cbc;
182} 182}
183LCRYPTO_ALIAS(EVP_rc2_cbc);
184 183
185static const EVP_CIPHER rc2_cfb64 = { 184static const EVP_CIPHER rc2_cfb64 = {
186 .nid = NID_rc2_cfb64, 185 .nid = NID_rc2_cfb64,
@@ -203,7 +202,6 @@ EVP_rc2_cfb64(void)
203{ 202{
204 return &rc2_cfb64; 203 return &rc2_cfb64;
205} 204}
206LCRYPTO_ALIAS(EVP_rc2_cfb64);
207 205
208static const EVP_CIPHER rc2_ofb = { 206static const EVP_CIPHER rc2_ofb = {
209 .nid = NID_rc2_ofb64, 207 .nid = NID_rc2_ofb64,
@@ -226,7 +224,6 @@ EVP_rc2_ofb(void)
226{ 224{
227 return &rc2_ofb; 225 return &rc2_ofb;
228} 226}
229LCRYPTO_ALIAS(EVP_rc2_ofb);
230 227
231static const EVP_CIPHER rc2_ecb = { 228static const EVP_CIPHER rc2_ecb = {
232 .nid = NID_rc2_ecb, 229 .nid = NID_rc2_ecb,
@@ -249,7 +246,6 @@ EVP_rc2_ecb(void)
249{ 246{
250 return &rc2_ecb; 247 return &rc2_ecb;
251} 248}
252LCRYPTO_ALIAS(EVP_rc2_ecb);
253 249
254#define RC2_40_MAGIC 0xa0 250#define RC2_40_MAGIC 0xa0
255#define RC2_64_MAGIC 0x78 251#define RC2_64_MAGIC 0x78
@@ -288,14 +284,12 @@ EVP_rc2_64_cbc(void)
288{ 284{
289 return (&r2_64_cbc_cipher); 285 return (&r2_64_cbc_cipher);
290} 286}
291LCRYPTO_ALIAS(EVP_rc2_64_cbc);
292 287
293const EVP_CIPHER * 288const EVP_CIPHER *
294EVP_rc2_40_cbc(void) 289EVP_rc2_40_cbc(void)
295{ 290{
296 return (&r2_40_cbc_cipher); 291 return (&r2_40_cbc_cipher);
297} 292}
298LCRYPTO_ALIAS(EVP_rc2_40_cbc);
299 293
300static int 294static int
301rc2_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, 295rc2_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
diff --git a/src/lib/libcrypto/evp/e_rc4.c b/src/lib/libcrypto/evp/e_rc4.c
index d79bfa729a..2503d37049 100644
--- a/src/lib/libcrypto/evp/e_rc4.c
+++ b/src/lib/libcrypto/evp/e_rc4.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: e_rc4.c,v 1.16 2023/07/07 13:54:45 beck Exp $ */ 1/* $OpenBSD: e_rc4.c,v 1.17 2023/07/07 19:37:53 beck 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 *
@@ -115,14 +115,12 @@ EVP_rc4(void)
115{ 115{
116 return (&r4_cipher); 116 return (&r4_cipher);
117} 117}
118LCRYPTO_ALIAS(EVP_rc4);
119 118
120const EVP_CIPHER * 119const EVP_CIPHER *
121EVP_rc4_40(void) 120EVP_rc4_40(void)
122{ 121{
123 return (&r4_40_cipher); 122 return (&r4_40_cipher);
124} 123}
125LCRYPTO_ALIAS(EVP_rc4_40);
126 124
127static int 125static int
128rc4_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, 126rc4_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
diff --git a/src/lib/libcrypto/evp/e_rc4_hmac_md5.c b/src/lib/libcrypto/evp/e_rc4_hmac_md5.c
index 1d0bced2df..bcf8daea60 100644
--- a/src/lib/libcrypto/evp/e_rc4_hmac_md5.c
+++ b/src/lib/libcrypto/evp/e_rc4_hmac_md5.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: e_rc4_hmac_md5.c,v 1.11 2023/07/07 13:54:45 beck Exp $ */ 1/* $OpenBSD: e_rc4_hmac_md5.c,v 1.12 2023/07/07 19:37:53 beck Exp $ */
2/* ==================================================================== 2/* ====================================================================
3 * Copyright (c) 2011 The OpenSSL Project. All rights reserved. 3 * Copyright (c) 2011 The OpenSSL Project. All rights reserved.
4 * 4 *
@@ -304,5 +304,4 @@ EVP_rc4_hmac_md5(void)
304{ 304{
305 return (&r4_hmac_md5_cipher); 305 return (&r4_hmac_md5_cipher);
306} 306}
307LCRYPTO_ALIAS(EVP_rc4_hmac_md5);
308#endif 307#endif
diff --git a/src/lib/libcrypto/evp/e_sm4.c b/src/lib/libcrypto/evp/e_sm4.c
index 705a914821..c1664db398 100644
--- a/src/lib/libcrypto/evp/e_sm4.c
+++ b/src/lib/libcrypto/evp/e_sm4.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: e_sm4.c,v 1.8 2023/07/07 13:54:45 beck Exp $ */ 1/* $OpenBSD: e_sm4.c,v 1.9 2023/07/07 19:37:53 beck Exp $ */
2/* 2/*
3 * Copyright (c) 2017, 2019 Ribose Inc 3 * Copyright (c) 2017, 2019 Ribose Inc
4 * 4 *
@@ -165,7 +165,6 @@ EVP_sm4_cbc(void)
165{ 165{
166 return &sm4_cbc; 166 return &sm4_cbc;
167} 167}
168LCRYPTO_ALIAS(EVP_sm4_cbc);
169 168
170static const EVP_CIPHER sm4_cfb128 = { 169static const EVP_CIPHER sm4_cfb128 = {
171 .nid = NID_sm4_cfb128, 170 .nid = NID_sm4_cfb128,
@@ -188,7 +187,6 @@ EVP_sm4_cfb128(void)
188{ 187{
189 return &sm4_cfb128; 188 return &sm4_cfb128;
190} 189}
191LCRYPTO_ALIAS(EVP_sm4_cfb128);
192 190
193static const EVP_CIPHER sm4_ofb = { 191static const EVP_CIPHER sm4_ofb = {
194 .nid = NID_sm4_ofb128, 192 .nid = NID_sm4_ofb128,
@@ -211,7 +209,6 @@ EVP_sm4_ofb(void)
211{ 209{
212 return &sm4_ofb; 210 return &sm4_ofb;
213} 211}
214LCRYPTO_ALIAS(EVP_sm4_ofb);
215 212
216static const EVP_CIPHER sm4_ecb = { 213static const EVP_CIPHER sm4_ecb = {
217 .nid = NID_sm4_ecb, 214 .nid = NID_sm4_ecb,
@@ -234,7 +231,6 @@ EVP_sm4_ecb(void)
234{ 231{
235 return &sm4_ecb; 232 return &sm4_ecb;
236} 233}
237LCRYPTO_ALIAS(EVP_sm4_ecb);
238 234
239static int 235static int
240sm4_ctr_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, const unsigned char *in, 236sm4_ctr_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, const unsigned char *in,
@@ -268,5 +264,4 @@ EVP_sm4_ctr(void)
268{ 264{
269 return &sm4_ctr_mode; 265 return &sm4_ctr_mode;
270} 266}
271LCRYPTO_ALIAS(EVP_sm4_ctr);
272#endif 267#endif
diff --git a/src/lib/libcrypto/evp/e_xcbc_d.c b/src/lib/libcrypto/evp/e_xcbc_d.c
index c7810a2c22..32f9f2eaa8 100644
--- a/src/lib/libcrypto/evp/e_xcbc_d.c
+++ b/src/lib/libcrypto/evp/e_xcbc_d.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: e_xcbc_d.c,v 1.14 2023/07/07 13:54:45 beck Exp $ */ 1/* $OpenBSD: e_xcbc_d.c,v 1.15 2023/07/07 19:37:53 beck 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 *
@@ -102,7 +102,6 @@ EVP_desx_cbc(void)
102{ 102{
103 return (&d_xcbc_cipher); 103 return (&d_xcbc_cipher);
104} 104}
105LCRYPTO_ALIAS(EVP_desx_cbc);
106 105
107static int 106static int
108desx_cbc_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, 107desx_cbc_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
diff --git a/src/lib/libcrypto/evp/encode.c b/src/lib/libcrypto/evp/encode.c
index 10cb51217a..c62a1dea8f 100644
--- a/src/lib/libcrypto/evp/encode.c
+++ b/src/lib/libcrypto/evp/encode.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: encode.c,v 1.31 2023/07/07 13:54:45 beck Exp $ */ 1/* $OpenBSD: encode.c,v 1.32 2023/07/07 19:37:53 beck 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 *
@@ -128,14 +128,12 @@ EVP_ENCODE_CTX_new(void)
128{ 128{
129 return calloc(1, sizeof(EVP_ENCODE_CTX)); 129 return calloc(1, sizeof(EVP_ENCODE_CTX));
130} 130}
131LCRYPTO_ALIAS(EVP_ENCODE_CTX_new);
132 131
133void 132void
134EVP_ENCODE_CTX_free(EVP_ENCODE_CTX *ctx) 133EVP_ENCODE_CTX_free(EVP_ENCODE_CTX *ctx)
135{ 134{
136 free(ctx); 135 free(ctx);
137} 136}
138LCRYPTO_ALIAS(EVP_ENCODE_CTX_free);
139 137
140void 138void
141EVP_EncodeInit(EVP_ENCODE_CTX *ctx) 139EVP_EncodeInit(EVP_ENCODE_CTX *ctx)
@@ -144,7 +142,6 @@ EVP_EncodeInit(EVP_ENCODE_CTX *ctx)
144 ctx->num = 0; 142 ctx->num = 0;
145 ctx->line_num = 0; 143 ctx->line_num = 0;
146} 144}
147LCRYPTO_ALIAS(EVP_EncodeInit);
148 145
149int 146int
150EVP_EncodeUpdate(EVP_ENCODE_CTX *ctx, unsigned char *out, int *outl, 147EVP_EncodeUpdate(EVP_ENCODE_CTX *ctx, unsigned char *out, int *outl,
@@ -195,7 +192,6 @@ EVP_EncodeUpdate(EVP_ENCODE_CTX *ctx, unsigned char *out, int *outl,
195 192
196 return 1; 193 return 1;
197} 194}
198LCRYPTO_ALIAS(EVP_EncodeUpdate);
199 195
200void 196void
201EVP_EncodeFinal(EVP_ENCODE_CTX *ctx, unsigned char *out, int *outl) 197EVP_EncodeFinal(EVP_ENCODE_CTX *ctx, unsigned char *out, int *outl)
@@ -210,7 +206,6 @@ EVP_EncodeFinal(EVP_ENCODE_CTX *ctx, unsigned char *out, int *outl)
210 } 206 }
211 *outl = ret; 207 *outl = ret;
212} 208}
213LCRYPTO_ALIAS(EVP_EncodeFinal);
214 209
215int 210int
216EVP_EncodeBlock(unsigned char *t, const unsigned char *f, int dlen) 211EVP_EncodeBlock(unsigned char *t, const unsigned char *f, int dlen)
@@ -243,7 +238,6 @@ EVP_EncodeBlock(unsigned char *t, const unsigned char *f, int dlen)
243 *t = '\0'; 238 *t = '\0';
244 return (ret); 239 return (ret);
245} 240}
246LCRYPTO_ALIAS(EVP_EncodeBlock);
247 241
248void 242void
249EVP_DecodeInit(EVP_ENCODE_CTX *ctx) 243EVP_DecodeInit(EVP_ENCODE_CTX *ctx)
@@ -253,7 +247,6 @@ EVP_DecodeInit(EVP_ENCODE_CTX *ctx)
253 ctx->line_num = 0; 247 ctx->line_num = 0;
254 ctx->expect_nl = 0; 248 ctx->expect_nl = 0;
255} 249}
256LCRYPTO_ALIAS(EVP_DecodeInit);
257 250
258int 251int
259EVP_DecodeUpdate(EVP_ENCODE_CTX *ctx, unsigned char *out, int *outl, 252EVP_DecodeUpdate(EVP_ENCODE_CTX *ctx, unsigned char *out, int *outl,
@@ -362,7 +355,6 @@ EVP_DecodeUpdate(EVP_ENCODE_CTX *ctx, unsigned char *out, int *outl,
362 ctx->num = n; 355 ctx->num = n;
363 return (rv); 356 return (rv);
364} 357}
365LCRYPTO_ALIAS(EVP_DecodeUpdate);
366 358
367int 359int
368EVP_DecodeBlock(unsigned char *t, const unsigned char *f, int n) 360EVP_DecodeBlock(unsigned char *t, const unsigned char *f, int n)
@@ -403,7 +395,6 @@ EVP_DecodeBlock(unsigned char *t, const unsigned char *f, int n)
403 } 395 }
404 return (ret); 396 return (ret);
405} 397}
406LCRYPTO_ALIAS(EVP_DecodeBlock);
407 398
408int 399int
409EVP_DecodeFinal(EVP_ENCODE_CTX *ctx, unsigned char *out, int *outl) 400EVP_DecodeFinal(EVP_ENCODE_CTX *ctx, unsigned char *out, int *outl)
@@ -421,4 +412,3 @@ EVP_DecodeFinal(EVP_ENCODE_CTX *ctx, unsigned char *out, int *outl)
421 } else 412 } else
422 return (1); 413 return (1);
423} 414}
424LCRYPTO_ALIAS(EVP_DecodeFinal);
diff --git a/src/lib/libcrypto/evp/evp_aead.c b/src/lib/libcrypto/evp/evp_aead.c
index 8b39c7f923..3579533e5b 100644
--- a/src/lib/libcrypto/evp/evp_aead.c
+++ b/src/lib/libcrypto/evp/evp_aead.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: evp_aead.c,v 1.9 2023/07/07 13:54:45 beck Exp $ */ 1/* $OpenBSD: evp_aead.c,v 1.10 2023/07/07 19:37:53 beck Exp $ */
2/* 2/*
3 * Copyright (c) 2014, Google Inc. 3 * Copyright (c) 2014, Google Inc.
4 * 4 *
@@ -28,28 +28,24 @@ EVP_AEAD_key_length(const EVP_AEAD *aead)
28{ 28{
29 return aead->key_len; 29 return aead->key_len;
30} 30}
31LCRYPTO_ALIAS(EVP_AEAD_key_length);
32 31
33size_t 32size_t
34EVP_AEAD_nonce_length(const EVP_AEAD *aead) 33EVP_AEAD_nonce_length(const EVP_AEAD *aead)
35{ 34{
36 return aead->nonce_len; 35 return aead->nonce_len;
37} 36}
38LCRYPTO_ALIAS(EVP_AEAD_nonce_length);
39 37
40size_t 38size_t
41EVP_AEAD_max_overhead(const EVP_AEAD *aead) 39EVP_AEAD_max_overhead(const EVP_AEAD *aead)
42{ 40{
43 return aead->overhead; 41 return aead->overhead;
44} 42}
45LCRYPTO_ALIAS(EVP_AEAD_max_overhead);
46 43
47size_t 44size_t
48EVP_AEAD_max_tag_len(const EVP_AEAD *aead) 45EVP_AEAD_max_tag_len(const EVP_AEAD *aead)
49{ 46{
50 return aead->max_tag_len; 47 return aead->max_tag_len;
51} 48}
52LCRYPTO_ALIAS(EVP_AEAD_max_tag_len);
53 49
54int 50int
55EVP_AEAD_CTX_init(EVP_AEAD_CTX *ctx, const EVP_AEAD *aead, 51EVP_AEAD_CTX_init(EVP_AEAD_CTX *ctx, const EVP_AEAD *aead,
@@ -62,7 +58,6 @@ EVP_AEAD_CTX_init(EVP_AEAD_CTX *ctx, const EVP_AEAD *aead,
62 } 58 }
63 return aead->init(ctx, key, key_len, tag_len); 59 return aead->init(ctx, key, key_len, tag_len);
64} 60}
65LCRYPTO_ALIAS(EVP_AEAD_CTX_init);
66 61
67void 62void
68EVP_AEAD_CTX_cleanup(EVP_AEAD_CTX *ctx) 63EVP_AEAD_CTX_cleanup(EVP_AEAD_CTX *ctx)
@@ -72,14 +67,12 @@ EVP_AEAD_CTX_cleanup(EVP_AEAD_CTX *ctx)
72 ctx->aead->cleanup(ctx); 67 ctx->aead->cleanup(ctx);
73 ctx->aead = NULL; 68 ctx->aead = NULL;
74} 69}
75LCRYPTO_ALIAS(EVP_AEAD_CTX_cleanup);
76 70
77EVP_AEAD_CTX * 71EVP_AEAD_CTX *
78EVP_AEAD_CTX_new(void) 72EVP_AEAD_CTX_new(void)
79{ 73{
80 return calloc(1, sizeof(EVP_AEAD_CTX)); 74 return calloc(1, sizeof(EVP_AEAD_CTX));
81} 75}
82LCRYPTO_ALIAS(EVP_AEAD_CTX_new);
83 76
84void 77void
85EVP_AEAD_CTX_free(EVP_AEAD_CTX *ctx) 78EVP_AEAD_CTX_free(EVP_AEAD_CTX *ctx)
@@ -90,7 +83,6 @@ EVP_AEAD_CTX_free(EVP_AEAD_CTX *ctx)
90 EVP_AEAD_CTX_cleanup(ctx); 83 EVP_AEAD_CTX_cleanup(ctx);
91 free(ctx); 84 free(ctx);
92} 85}
93LCRYPTO_ALIAS(EVP_AEAD_CTX_free);
94 86
95/* check_alias returns 0 if out points within the buffer determined by in 87/* check_alias returns 0 if out points within the buffer determined by in
96 * and in_len and 1 otherwise. 88 * and in_len and 1 otherwise.
@@ -141,7 +133,6 @@ error:
141 *out_len = 0; 133 *out_len = 0;
142 return 0; 134 return 0;
143} 135}
144LCRYPTO_ALIAS(EVP_AEAD_CTX_seal);
145 136
146int 137int
147EVP_AEAD_CTX_open(const EVP_AEAD_CTX *ctx, unsigned char *out, size_t *out_len, 138EVP_AEAD_CTX_open(const EVP_AEAD_CTX *ctx, unsigned char *out, size_t *out_len,
@@ -167,4 +158,3 @@ error:
167 *out_len = 0; 158 *out_len = 0;
168 return 0; 159 return 0;
169} 160}
170LCRYPTO_ALIAS(EVP_AEAD_CTX_open);
diff --git a/src/lib/libcrypto/evp/evp_enc.c b/src/lib/libcrypto/evp/evp_enc.c
index f9b8deddf5..27f753baa0 100644
--- a/src/lib/libcrypto/evp/evp_enc.c
+++ b/src/lib/libcrypto/evp/evp_enc.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: evp_enc.c,v 1.51 2023/07/07 13:54:45 beck Exp $ */ 1/* $OpenBSD: evp_enc.c,v 1.52 2023/07/07 19:37:53 beck 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 *
@@ -82,7 +82,6 @@ EVP_CipherInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher,
82 EVP_CIPHER_CTX_init(ctx); 82 EVP_CIPHER_CTX_init(ctx);
83 return EVP_CipherInit_ex(ctx, cipher, NULL, key, iv, enc); 83 return EVP_CipherInit_ex(ctx, cipher, NULL, key, iv, enc);
84} 84}
85LCRYPTO_ALIAS(EVP_CipherInit);
86 85
87int 86int
88EVP_CipherInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher, ENGINE *impl, 87EVP_CipherInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher, ENGINE *impl,
@@ -231,7 +230,6 @@ skip_to_init:
231 ctx->block_mask = ctx->cipher->block_size - 1; 230 ctx->block_mask = ctx->cipher->block_size - 1;
232 return 1; 231 return 1;
233} 232}
234LCRYPTO_ALIAS(EVP_CipherInit_ex);
235 233
236int 234int
237EVP_CipherUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl, 235EVP_CipherUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl,
@@ -242,7 +240,6 @@ EVP_CipherUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl,
242 else 240 else
243 return EVP_DecryptUpdate(ctx, out, outl, in, inl); 241 return EVP_DecryptUpdate(ctx, out, outl, in, inl);
244} 242}
245LCRYPTO_ALIAS(EVP_CipherUpdate);
246 243
247int 244int
248EVP_CipherFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl) 245EVP_CipherFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl)
@@ -252,7 +249,6 @@ EVP_CipherFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl)
252 else 249 else
253 return EVP_DecryptFinal_ex(ctx, out, outl); 250 return EVP_DecryptFinal_ex(ctx, out, outl);
254} 251}
255LCRYPTO_ALIAS(EVP_CipherFinal_ex);
256 252
257__warn_references(EVP_CipherFinal, 253__warn_references(EVP_CipherFinal,
258 "EVP_CipherFinal is often misused, please use EVP_CipherFinal_ex and EVP_CIPHER_CTX_cleanup"); 254 "EVP_CipherFinal is often misused, please use EVP_CipherFinal_ex and EVP_CIPHER_CTX_cleanup");
@@ -267,7 +263,6 @@ EVP_CipherFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl)
267 ret = EVP_DecryptFinal_ex(ctx, out, outl); 263 ret = EVP_DecryptFinal_ex(ctx, out, outl);
268 return ret; 264 return ret;
269} 265}
270LCRYPTO_ALIAS(EVP_CipherFinal);
271 266
272int 267int
273EVP_EncryptInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher, 268EVP_EncryptInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher,
@@ -275,7 +270,6 @@ EVP_EncryptInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher,
275{ 270{
276 return EVP_CipherInit(ctx, cipher, key, iv, 1); 271 return EVP_CipherInit(ctx, cipher, key, iv, 1);
277} 272}
278LCRYPTO_ALIAS(EVP_EncryptInit);
279 273
280int 274int
281EVP_EncryptInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher, ENGINE *impl, 275EVP_EncryptInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher, ENGINE *impl,
@@ -283,7 +277,6 @@ EVP_EncryptInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher, ENGINE *impl,
283{ 277{
284 return EVP_CipherInit_ex(ctx, cipher, impl, key, iv, 1); 278 return EVP_CipherInit_ex(ctx, cipher, impl, key, iv, 1);
285} 279}
286LCRYPTO_ALIAS(EVP_EncryptInit_ex);
287 280
288int 281int
289EVP_DecryptInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher, 282EVP_DecryptInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher,
@@ -291,7 +284,6 @@ EVP_DecryptInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher,
291{ 284{
292 return EVP_CipherInit(ctx, cipher, key, iv, 0); 285 return EVP_CipherInit(ctx, cipher, key, iv, 0);
293} 286}
294LCRYPTO_ALIAS(EVP_DecryptInit);
295 287
296int 288int
297EVP_DecryptInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher, ENGINE *impl, 289EVP_DecryptInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher, ENGINE *impl,
@@ -299,7 +291,6 @@ EVP_DecryptInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher, ENGINE *impl,
299{ 291{
300 return EVP_CipherInit_ex(ctx, cipher, impl, key, iv, 0); 292 return EVP_CipherInit_ex(ctx, cipher, impl, key, iv, 0);
301} 293}
302LCRYPTO_ALIAS(EVP_DecryptInit_ex);
303 294
304int 295int
305EVP_EncryptUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl, 296EVP_EncryptUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl,
@@ -382,7 +373,6 @@ EVP_EncryptUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl,
382 ctx->buf_len = i; 373 ctx->buf_len = i;
383 return 1; 374 return 1;
384} 375}
385LCRYPTO_ALIAS(EVP_EncryptUpdate);
386 376
387__warn_references(EVP_EncryptFinal, 377__warn_references(EVP_EncryptFinal,
388 "EVP_EncryptFinal is often misused, please use EVP_EncryptFinal_ex and EVP_CIPHER_CTX_cleanup"); 378 "EVP_EncryptFinal is often misused, please use EVP_EncryptFinal_ex and EVP_CIPHER_CTX_cleanup");
@@ -395,7 +385,6 @@ EVP_EncryptFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl)
395 ret = EVP_EncryptFinal_ex(ctx, out, outl); 385 ret = EVP_EncryptFinal_ex(ctx, out, outl);
396 return ret; 386 return ret;
397} 387}
398LCRYPTO_ALIAS(EVP_EncryptFinal);
399 388
400int 389int
401EVP_EncryptFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl) 390EVP_EncryptFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl)
@@ -442,7 +431,6 @@ EVP_EncryptFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl)
442 431
443 return ret; 432 return ret;
444} 433}
445LCRYPTO_ALIAS(EVP_EncryptFinal_ex);
446 434
447int 435int
448EVP_DecryptUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl, 436EVP_DecryptUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl,
@@ -513,7 +501,6 @@ EVP_DecryptUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl,
513 501
514 return 1; 502 return 1;
515} 503}
516LCRYPTO_ALIAS(EVP_DecryptUpdate);
517 504
518__warn_references(EVP_DecryptFinal, 505__warn_references(EVP_DecryptFinal,
519 "EVP_DecryptFinal is often misused, please use EVP_DecryptFinal_ex and EVP_CIPHER_CTX_cleanup"); 506 "EVP_DecryptFinal is often misused, please use EVP_DecryptFinal_ex and EVP_CIPHER_CTX_cleanup");
@@ -526,7 +513,6 @@ EVP_DecryptFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl)
526 ret = EVP_DecryptFinal_ex(ctx, out, outl); 513 ret = EVP_DecryptFinal_ex(ctx, out, outl);
527 return ret; 514 return ret;
528} 515}
529LCRYPTO_ALIAS(EVP_DecryptFinal);
530 516
531int 517int
532EVP_DecryptFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl) 518EVP_DecryptFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl)
@@ -581,14 +567,12 @@ EVP_DecryptFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl)
581 *outl = 0; 567 *outl = 0;
582 return (1); 568 return (1);
583} 569}
584LCRYPTO_ALIAS(EVP_DecryptFinal_ex);
585 570
586EVP_CIPHER_CTX * 571EVP_CIPHER_CTX *
587EVP_CIPHER_CTX_new(void) 572EVP_CIPHER_CTX_new(void)
588{ 573{
589 return calloc(1, sizeof(EVP_CIPHER_CTX)); 574 return calloc(1, sizeof(EVP_CIPHER_CTX));
590} 575}
591LCRYPTO_ALIAS(EVP_CIPHER_CTX_new);
592 576
593void 577void
594EVP_CIPHER_CTX_free(EVP_CIPHER_CTX *ctx) 578EVP_CIPHER_CTX_free(EVP_CIPHER_CTX *ctx)
@@ -600,21 +584,18 @@ EVP_CIPHER_CTX_free(EVP_CIPHER_CTX *ctx)
600 584
601 free(ctx); 585 free(ctx);
602} 586}
603LCRYPTO_ALIAS(EVP_CIPHER_CTX_free);
604 587
605void 588void
606EVP_CIPHER_CTX_init(EVP_CIPHER_CTX *ctx) 589EVP_CIPHER_CTX_init(EVP_CIPHER_CTX *ctx)
607{ 590{
608 memset(ctx, 0, sizeof(EVP_CIPHER_CTX)); 591 memset(ctx, 0, sizeof(EVP_CIPHER_CTX));
609} 592}
610LCRYPTO_ALIAS(EVP_CIPHER_CTX_init);
611 593
612int 594int
613EVP_CIPHER_CTX_reset(EVP_CIPHER_CTX *a) 595EVP_CIPHER_CTX_reset(EVP_CIPHER_CTX *a)
614{ 596{
615 return EVP_CIPHER_CTX_cleanup(a); 597 return EVP_CIPHER_CTX_cleanup(a);
616} 598}
617LCRYPTO_ALIAS(EVP_CIPHER_CTX_reset);
618 599
619int 600int
620EVP_CIPHER_CTX_cleanup(EVP_CIPHER_CTX *c) 601EVP_CIPHER_CTX_cleanup(EVP_CIPHER_CTX *c)
@@ -638,7 +619,6 @@ EVP_CIPHER_CTX_cleanup(EVP_CIPHER_CTX *c)
638 619
639 return 1; 620 return 1;
640} 621}
641LCRYPTO_ALIAS(EVP_CIPHER_CTX_cleanup);
642 622
643int 623int
644EVP_CIPHER_CTX_set_key_length(EVP_CIPHER_CTX *c, int keylen) 624EVP_CIPHER_CTX_set_key_length(EVP_CIPHER_CTX *c, int keylen)
@@ -655,7 +635,6 @@ EVP_CIPHER_CTX_set_key_length(EVP_CIPHER_CTX *c, int keylen)
655 EVPerror(EVP_R_INVALID_KEY_LENGTH); 635 EVPerror(EVP_R_INVALID_KEY_LENGTH);
656 return 0; 636 return 0;
657} 637}
658LCRYPTO_ALIAS(EVP_CIPHER_CTX_set_key_length);
659 638
660int 639int
661EVP_CIPHER_CTX_set_padding(EVP_CIPHER_CTX *ctx, int pad) 640EVP_CIPHER_CTX_set_padding(EVP_CIPHER_CTX *ctx, int pad)
@@ -666,7 +645,6 @@ EVP_CIPHER_CTX_set_padding(EVP_CIPHER_CTX *ctx, int pad)
666 ctx->flags |= EVP_CIPH_NO_PADDING; 645 ctx->flags |= EVP_CIPH_NO_PADDING;
667 return 1; 646 return 1;
668} 647}
669LCRYPTO_ALIAS(EVP_CIPHER_CTX_set_padding);
670 648
671int 649int
672EVP_CIPHER_CTX_ctrl(EVP_CIPHER_CTX *ctx, int type, int arg, void *ptr) 650EVP_CIPHER_CTX_ctrl(EVP_CIPHER_CTX *ctx, int type, int arg, void *ptr)
@@ -690,7 +668,6 @@ EVP_CIPHER_CTX_ctrl(EVP_CIPHER_CTX *ctx, int type, int arg, void *ptr)
690 } 668 }
691 return ret; 669 return ret;
692} 670}
693LCRYPTO_ALIAS(EVP_CIPHER_CTX_ctrl);
694 671
695int 672int
696EVP_CIPHER_CTX_rand_key(EVP_CIPHER_CTX *ctx, unsigned char *key) 673EVP_CIPHER_CTX_rand_key(EVP_CIPHER_CTX *ctx, unsigned char *key)
@@ -700,7 +677,6 @@ EVP_CIPHER_CTX_rand_key(EVP_CIPHER_CTX *ctx, unsigned char *key)
700 arc4random_buf(key, ctx->key_len); 677 arc4random_buf(key, ctx->key_len);
701 return 1; 678 return 1;
702} 679}
703LCRYPTO_ALIAS(EVP_CIPHER_CTX_rand_key);
704 680
705int 681int
706EVP_CIPHER_CTX_copy(EVP_CIPHER_CTX *out, const EVP_CIPHER_CTX *in) 682EVP_CIPHER_CTX_copy(EVP_CIPHER_CTX *out, const EVP_CIPHER_CTX *in)
@@ -747,4 +723,3 @@ EVP_CIPHER_CTX_copy(EVP_CIPHER_CTX *out, const EVP_CIPHER_CTX *in)
747 723
748 return 1; 724 return 1;
749} 725}
750LCRYPTO_ALIAS(EVP_CIPHER_CTX_copy);
diff --git a/src/lib/libcrypto/evp/evp_err.c b/src/lib/libcrypto/evp/evp_err.c
index 8835215c14..039e17e6cf 100644
--- a/src/lib/libcrypto/evp/evp_err.c
+++ b/src/lib/libcrypto/evp/evp_err.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: evp_err.c,v 1.31 2023/07/07 13:54:45 beck Exp $ */ 1/* $OpenBSD: evp_err.c,v 1.32 2023/07/07 19:37:53 beck Exp $ */
2/* ==================================================================== 2/* ====================================================================
3 * Copyright (c) 1999-2011 The OpenSSL Project. All rights reserved. 3 * Copyright (c) 1999-2011 The OpenSSL Project. All rights reserved.
4 * 4 *
@@ -164,4 +164,3 @@ ERR_load_EVP_strings(void)
164 } 164 }
165#endif 165#endif
166} 166}
167LCRYPTO_ALIAS(ERR_load_EVP_strings);
diff --git a/src/lib/libcrypto/evp/evp_key.c b/src/lib/libcrypto/evp/evp_key.c
index 148fd2fe92..2f6e7e70cc 100644
--- a/src/lib/libcrypto/evp/evp_key.c
+++ b/src/lib/libcrypto/evp/evp_key.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: evp_key.c,v 1.29 2023/07/07 13:54:45 beck Exp $ */ 1/* $OpenBSD: evp_key.c,v 1.30 2023/07/07 19:37:53 beck 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 *
@@ -79,7 +79,6 @@ EVP_set_pw_prompt(const char *prompt)
79 strlcpy(prompt_string, prompt, sizeof(prompt_string)); 79 strlcpy(prompt_string, prompt, sizeof(prompt_string));
80 } 80 }
81} 81}
82LCRYPTO_ALIAS(EVP_set_pw_prompt);
83 82
84char * 83char *
85EVP_get_pw_prompt(void) 84EVP_get_pw_prompt(void)
@@ -89,14 +88,12 @@ EVP_get_pw_prompt(void)
89 else 88 else
90 return (prompt_string); 89 return (prompt_string);
91} 90}
92LCRYPTO_ALIAS(EVP_get_pw_prompt);
93 91
94int 92int
95EVP_read_pw_string(char *buf, int len, const char *prompt, int verify) 93EVP_read_pw_string(char *buf, int len, const char *prompt, int verify)
96{ 94{
97 return EVP_read_pw_string_min(buf, 0, len, prompt, verify); 95 return EVP_read_pw_string_min(buf, 0, len, prompt, verify);
98} 96}
99LCRYPTO_ALIAS(EVP_read_pw_string);
100 97
101int 98int
102EVP_read_pw_string_min(char *buf, int min, int len, const char *prompt, 99EVP_read_pw_string_min(char *buf, int min, int len, const char *prompt,
@@ -128,7 +125,6 @@ EVP_read_pw_string_min(char *buf, int min, int len, const char *prompt,
128 explicit_bzero(buff, BUFSIZ); 125 explicit_bzero(buff, BUFSIZ);
129 return ret; 126 return ret;
130} 127}
131LCRYPTO_ALIAS(EVP_read_pw_string_min);
132 128
133int 129int
134EVP_BytesToKey(const EVP_CIPHER *type, const EVP_MD *md, 130EVP_BytesToKey(const EVP_CIPHER *type, const EVP_MD *md,
@@ -214,4 +210,3 @@ err:
214 explicit_bzero(md_buf, sizeof md_buf); 210 explicit_bzero(md_buf, sizeof md_buf);
215 return rv; 211 return rv;
216} 212}
217LCRYPTO_ALIAS(EVP_BytesToKey);
diff --git a/src/lib/libcrypto/evp/evp_lib.c b/src/lib/libcrypto/evp/evp_lib.c
index d6b929c0e3..24ce1963df 100644
--- a/src/lib/libcrypto/evp/evp_lib.c
+++ b/src/lib/libcrypto/evp/evp_lib.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: evp_lib.c,v 1.26 2023/07/07 13:54:45 beck Exp $ */ 1/* $OpenBSD: evp_lib.c,v 1.27 2023/07/07 19:37:53 beck 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 *
@@ -79,7 +79,6 @@ EVP_CIPHER_param_to_asn1(EVP_CIPHER_CTX *c, ASN1_TYPE *type)
79 ret = -1; 79 ret = -1;
80 return (ret); 80 return (ret);
81} 81}
82LCRYPTO_ALIAS(EVP_CIPHER_param_to_asn1);
83 82
84int 83int
85EVP_CIPHER_asn1_to_param(EVP_CIPHER_CTX *c, ASN1_TYPE *type) 84EVP_CIPHER_asn1_to_param(EVP_CIPHER_CTX *c, ASN1_TYPE *type)
@@ -94,7 +93,6 @@ EVP_CIPHER_asn1_to_param(EVP_CIPHER_CTX *c, ASN1_TYPE *type)
94 ret = -1; 93 ret = -1;
95 return (ret); 94 return (ret);
96} 95}
97LCRYPTO_ALIAS(EVP_CIPHER_asn1_to_param);
98 96
99int 97int
100EVP_CIPHER_get_asn1_iv(EVP_CIPHER_CTX *c, ASN1_TYPE *type) 98EVP_CIPHER_get_asn1_iv(EVP_CIPHER_CTX *c, ASN1_TYPE *type)
@@ -116,7 +114,6 @@ EVP_CIPHER_get_asn1_iv(EVP_CIPHER_CTX *c, ASN1_TYPE *type)
116 } 114 }
117 return (i); 115 return (i);
118} 116}
119LCRYPTO_ALIAS(EVP_CIPHER_get_asn1_iv);
120 117
121int 118int
122EVP_CIPHER_set_asn1_iv(EVP_CIPHER_CTX *c, ASN1_TYPE *type) 119EVP_CIPHER_set_asn1_iv(EVP_CIPHER_CTX *c, ASN1_TYPE *type)
@@ -134,7 +131,6 @@ EVP_CIPHER_set_asn1_iv(EVP_CIPHER_CTX *c, ASN1_TYPE *type)
134 } 131 }
135 return (i); 132 return (i);
136} 133}
137LCRYPTO_ALIAS(EVP_CIPHER_set_asn1_iv);
138 134
139/* Convert the various cipher NIDs and dummies to a proper OID NID */ 135/* Convert the various cipher NIDs and dummies to a proper OID NID */
140int 136int
@@ -188,21 +184,18 @@ EVP_CIPHER_type(const EVP_CIPHER *ctx)
188 return nid; 184 return nid;
189 } 185 }
190} 186}
191LCRYPTO_ALIAS(EVP_CIPHER_type);
192 187
193int 188int
194EVP_CIPHER_block_size(const EVP_CIPHER *e) 189EVP_CIPHER_block_size(const EVP_CIPHER *e)
195{ 190{
196 return e->block_size; 191 return e->block_size;
197} 192}
198LCRYPTO_ALIAS(EVP_CIPHER_block_size);
199 193
200int 194int
201EVP_CIPHER_CTX_block_size(const EVP_CIPHER_CTX *ctx) 195EVP_CIPHER_CTX_block_size(const EVP_CIPHER_CTX *ctx)
202{ 196{
203 return ctx->cipher->block_size; 197 return ctx->cipher->block_size;
204} 198}
205LCRYPTO_ALIAS(EVP_CIPHER_CTX_block_size);
206 199
207int 200int
208EVP_Cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, const unsigned char *in, 201EVP_Cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, const unsigned char *in,
@@ -210,56 +203,48 @@ EVP_Cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, const unsigned char *in,
210{ 203{
211 return ctx->cipher->do_cipher(ctx, out, in, inl); 204 return ctx->cipher->do_cipher(ctx, out, in, inl);
212} 205}
213LCRYPTO_ALIAS(EVP_Cipher);
214 206
215const EVP_CIPHER * 207const EVP_CIPHER *
216EVP_CIPHER_CTX_cipher(const EVP_CIPHER_CTX *ctx) 208EVP_CIPHER_CTX_cipher(const EVP_CIPHER_CTX *ctx)
217{ 209{
218 return ctx->cipher; 210 return ctx->cipher;
219} 211}
220LCRYPTO_ALIAS(EVP_CIPHER_CTX_cipher);
221 212
222int 213int
223EVP_CIPHER_CTX_encrypting(const EVP_CIPHER_CTX *ctx) 214EVP_CIPHER_CTX_encrypting(const EVP_CIPHER_CTX *ctx)
224{ 215{
225 return ctx->encrypt; 216 return ctx->encrypt;
226} 217}
227LCRYPTO_ALIAS(EVP_CIPHER_CTX_encrypting);
228 218
229unsigned long 219unsigned long
230EVP_CIPHER_flags(const EVP_CIPHER *cipher) 220EVP_CIPHER_flags(const EVP_CIPHER *cipher)
231{ 221{
232 return cipher->flags; 222 return cipher->flags;
233} 223}
234LCRYPTO_ALIAS(EVP_CIPHER_flags);
235 224
236unsigned long 225unsigned long
237EVP_CIPHER_CTX_flags(const EVP_CIPHER_CTX *ctx) 226EVP_CIPHER_CTX_flags(const EVP_CIPHER_CTX *ctx)
238{ 227{
239 return ctx->cipher->flags; 228 return ctx->cipher->flags;
240} 229}
241LCRYPTO_ALIAS(EVP_CIPHER_CTX_flags);
242 230
243void * 231void *
244EVP_CIPHER_CTX_get_app_data(const EVP_CIPHER_CTX *ctx) 232EVP_CIPHER_CTX_get_app_data(const EVP_CIPHER_CTX *ctx)
245{ 233{
246 return ctx->app_data; 234 return ctx->app_data;
247} 235}
248LCRYPTO_ALIAS(EVP_CIPHER_CTX_get_app_data);
249 236
250void 237void
251EVP_CIPHER_CTX_set_app_data(EVP_CIPHER_CTX *ctx, void *data) 238EVP_CIPHER_CTX_set_app_data(EVP_CIPHER_CTX *ctx, void *data)
252{ 239{
253 ctx->app_data = data; 240 ctx->app_data = data;
254} 241}
255LCRYPTO_ALIAS(EVP_CIPHER_CTX_set_app_data);
256 242
257void * 243void *
258EVP_CIPHER_CTX_get_cipher_data(const EVP_CIPHER_CTX *ctx) 244EVP_CIPHER_CTX_get_cipher_data(const EVP_CIPHER_CTX *ctx)
259{ 245{
260 return ctx->cipher_data; 246 return ctx->cipher_data;
261} 247}
262LCRYPTO_ALIAS(EVP_CIPHER_CTX_get_cipher_data);
263 248
264void * 249void *
265EVP_CIPHER_CTX_set_cipher_data(EVP_CIPHER_CTX *ctx, void *cipher_data) 250EVP_CIPHER_CTX_set_cipher_data(EVP_CIPHER_CTX *ctx, void *cipher_data)
@@ -271,56 +256,48 @@ EVP_CIPHER_CTX_set_cipher_data(EVP_CIPHER_CTX *ctx, void *cipher_data)
271 256
272 return old_cipher_data; 257 return old_cipher_data;
273} 258}
274LCRYPTO_ALIAS(EVP_CIPHER_CTX_set_cipher_data);
275 259
276int 260int
277EVP_CIPHER_iv_length(const EVP_CIPHER *cipher) 261EVP_CIPHER_iv_length(const EVP_CIPHER *cipher)
278{ 262{
279 return cipher->iv_len; 263 return cipher->iv_len;
280} 264}
281LCRYPTO_ALIAS(EVP_CIPHER_iv_length);
282 265
283int 266int
284EVP_CIPHER_CTX_iv_length(const EVP_CIPHER_CTX *ctx) 267EVP_CIPHER_CTX_iv_length(const EVP_CIPHER_CTX *ctx)
285{ 268{
286 return ctx->cipher->iv_len; 269 return ctx->cipher->iv_len;
287} 270}
288LCRYPTO_ALIAS(EVP_CIPHER_CTX_iv_length);
289 271
290unsigned char * 272unsigned char *
291EVP_CIPHER_CTX_buf_noconst(EVP_CIPHER_CTX *ctx) 273EVP_CIPHER_CTX_buf_noconst(EVP_CIPHER_CTX *ctx)
292{ 274{
293 return ctx->buf; 275 return ctx->buf;
294} 276}
295LCRYPTO_ALIAS(EVP_CIPHER_CTX_buf_noconst);
296 277
297int 278int
298EVP_CIPHER_key_length(const EVP_CIPHER *cipher) 279EVP_CIPHER_key_length(const EVP_CIPHER *cipher)
299{ 280{
300 return cipher->key_len; 281 return cipher->key_len;
301} 282}
302LCRYPTO_ALIAS(EVP_CIPHER_key_length);
303 283
304int 284int
305EVP_CIPHER_CTX_key_length(const EVP_CIPHER_CTX *ctx) 285EVP_CIPHER_CTX_key_length(const EVP_CIPHER_CTX *ctx)
306{ 286{
307 return ctx->key_len; 287 return ctx->key_len;
308} 288}
309LCRYPTO_ALIAS(EVP_CIPHER_CTX_key_length);
310 289
311int 290int
312EVP_CIPHER_nid(const EVP_CIPHER *cipher) 291EVP_CIPHER_nid(const EVP_CIPHER *cipher)
313{ 292{
314 return cipher->nid; 293 return cipher->nid;
315} 294}
316LCRYPTO_ALIAS(EVP_CIPHER_nid);
317 295
318int 296int
319EVP_CIPHER_CTX_nid(const EVP_CIPHER_CTX *ctx) 297EVP_CIPHER_CTX_nid(const EVP_CIPHER_CTX *ctx)
320{ 298{
321 return ctx->cipher->nid; 299 return ctx->cipher->nid;
322} 300}
323LCRYPTO_ALIAS(EVP_CIPHER_CTX_nid);
324 301
325int 302int
326EVP_CIPHER_CTX_get_iv(const EVP_CIPHER_CTX *ctx, unsigned char *iv, size_t len) 303EVP_CIPHER_CTX_get_iv(const EVP_CIPHER_CTX *ctx, unsigned char *iv, size_t len)
@@ -340,7 +317,6 @@ EVP_CIPHER_CTX_get_iv(const EVP_CIPHER_CTX *ctx, unsigned char *iv, size_t len)
340 } 317 }
341 return 1; 318 return 1;
342} 319}
343LCRYPTO_ALIAS(EVP_CIPHER_CTX_get_iv);
344 320
345int 321int
346EVP_CIPHER_CTX_set_iv(EVP_CIPHER_CTX *ctx, const unsigned char *iv, size_t len) 322EVP_CIPHER_CTX_set_iv(EVP_CIPHER_CTX *ctx, const unsigned char *iv, size_t len)
@@ -360,28 +336,24 @@ EVP_CIPHER_CTX_set_iv(EVP_CIPHER_CTX *ctx, const unsigned char *iv, size_t len)
360 } 336 }
361 return 1; 337 return 1;
362} 338}
363LCRYPTO_ALIAS(EVP_CIPHER_CTX_set_iv);
364 339
365int 340int
366EVP_MD_block_size(const EVP_MD *md) 341EVP_MD_block_size(const EVP_MD *md)
367{ 342{
368 return md->block_size; 343 return md->block_size;
369} 344}
370LCRYPTO_ALIAS(EVP_MD_block_size);
371 345
372int 346int
373EVP_MD_type(const EVP_MD *md) 347EVP_MD_type(const EVP_MD *md)
374{ 348{
375 return md->type; 349 return md->type;
376} 350}
377LCRYPTO_ALIAS(EVP_MD_type);
378 351
379int 352int
380EVP_MD_pkey_type(const EVP_MD *md) 353EVP_MD_pkey_type(const EVP_MD *md)
381{ 354{
382 return md->pkey_type; 355 return md->pkey_type;
383} 356}
384LCRYPTO_ALIAS(EVP_MD_pkey_type);
385 357
386int 358int
387EVP_MD_size(const EVP_MD *md) 359EVP_MD_size(const EVP_MD *md)
@@ -392,14 +364,12 @@ EVP_MD_size(const EVP_MD *md)
392 } 364 }
393 return md->md_size; 365 return md->md_size;
394} 366}
395LCRYPTO_ALIAS(EVP_MD_size);
396 367
397unsigned long 368unsigned long
398EVP_MD_flags(const EVP_MD *md) 369EVP_MD_flags(const EVP_MD *md)
399{ 370{
400 return md->flags; 371 return md->flags;
401} 372}
402LCRYPTO_ALIAS(EVP_MD_flags);
403 373
404EVP_MD * 374EVP_MD *
405EVP_MD_meth_new(int md_type, int pkey_type) 375EVP_MD_meth_new(int md_type, int pkey_type)
@@ -414,7 +384,6 @@ EVP_MD_meth_new(int md_type, int pkey_type)
414 384
415 return md; 385 return md;
416} 386}
417LCRYPTO_ALIAS(EVP_MD_meth_new);
418 387
419EVP_MD * 388EVP_MD *
420EVP_MD_meth_dup(const EVP_MD *md) 389EVP_MD_meth_dup(const EVP_MD *md)
@@ -428,14 +397,12 @@ EVP_MD_meth_dup(const EVP_MD *md)
428 397
429 return to; 398 return to;
430} 399}
431LCRYPTO_ALIAS(EVP_MD_meth_dup);
432 400
433void 401void
434EVP_MD_meth_free(EVP_MD *md) 402EVP_MD_meth_free(EVP_MD *md)
435{ 403{
436 freezero(md, sizeof(*md)); 404 freezero(md, sizeof(*md));
437} 405}
438LCRYPTO_ALIAS(EVP_MD_meth_free);
439 406
440int 407int
441EVP_MD_meth_set_input_blocksize(EVP_MD *md, int blocksize) 408EVP_MD_meth_set_input_blocksize(EVP_MD *md, int blocksize)
@@ -443,7 +410,6 @@ EVP_MD_meth_set_input_blocksize(EVP_MD *md, int blocksize)
443 md->block_size = blocksize; 410 md->block_size = blocksize;
444 return 1; 411 return 1;
445} 412}
446LCRYPTO_ALIAS(EVP_MD_meth_set_input_blocksize);
447 413
448int 414int
449EVP_MD_meth_set_result_size(EVP_MD *md, int result_size) 415EVP_MD_meth_set_result_size(EVP_MD *md, int result_size)
@@ -451,7 +417,6 @@ EVP_MD_meth_set_result_size(EVP_MD *md, int result_size)
451 md->md_size = result_size; 417 md->md_size = result_size;
452 return 1; 418 return 1;
453} 419}
454LCRYPTO_ALIAS(EVP_MD_meth_set_result_size);
455 420
456int 421int
457EVP_MD_meth_set_app_datasize(EVP_MD *md, int datasize) 422EVP_MD_meth_set_app_datasize(EVP_MD *md, int datasize)
@@ -459,7 +424,6 @@ EVP_MD_meth_set_app_datasize(EVP_MD *md, int datasize)
459 md->ctx_size = datasize; 424 md->ctx_size = datasize;
460 return 1; 425 return 1;
461} 426}
462LCRYPTO_ALIAS(EVP_MD_meth_set_app_datasize);
463 427
464int 428int
465EVP_MD_meth_set_flags(EVP_MD *md, unsigned long flags) 429EVP_MD_meth_set_flags(EVP_MD *md, unsigned long flags)
@@ -467,7 +431,6 @@ EVP_MD_meth_set_flags(EVP_MD *md, unsigned long flags)
467 md->flags = flags; 431 md->flags = flags;
468 return 1; 432 return 1;
469} 433}
470LCRYPTO_ALIAS(EVP_MD_meth_set_flags);
471 434
472int 435int
473EVP_MD_meth_set_init(EVP_MD *md, int (*init)(EVP_MD_CTX *ctx)) 436EVP_MD_meth_set_init(EVP_MD *md, int (*init)(EVP_MD_CTX *ctx))
@@ -475,7 +438,6 @@ EVP_MD_meth_set_init(EVP_MD *md, int (*init)(EVP_MD_CTX *ctx))
475 md->init = init; 438 md->init = init;
476 return 1; 439 return 1;
477} 440}
478LCRYPTO_ALIAS(EVP_MD_meth_set_init);
479 441
480int 442int
481EVP_MD_meth_set_update(EVP_MD *md, 443EVP_MD_meth_set_update(EVP_MD *md,
@@ -484,7 +446,6 @@ EVP_MD_meth_set_update(EVP_MD *md,
484 md->update = update; 446 md->update = update;
485 return 1; 447 return 1;
486} 448}
487LCRYPTO_ALIAS(EVP_MD_meth_set_update);
488 449
489int 450int
490EVP_MD_meth_set_final(EVP_MD *md, 451EVP_MD_meth_set_final(EVP_MD *md,
@@ -493,7 +454,6 @@ EVP_MD_meth_set_final(EVP_MD *md,
493 md->final = final; 454 md->final = final;
494 return 1; 455 return 1;
495} 456}
496LCRYPTO_ALIAS(EVP_MD_meth_set_final);
497 457
498int 458int
499EVP_MD_meth_set_copy(EVP_MD *md, 459EVP_MD_meth_set_copy(EVP_MD *md,
@@ -502,7 +462,6 @@ EVP_MD_meth_set_copy(EVP_MD *md,
502 md->copy = copy; 462 md->copy = copy;
503 return 1; 463 return 1;
504} 464}
505LCRYPTO_ALIAS(EVP_MD_meth_set_copy);
506 465
507int 466int
508EVP_MD_meth_set_cleanup(EVP_MD *md, 467EVP_MD_meth_set_cleanup(EVP_MD *md,
@@ -511,7 +470,6 @@ EVP_MD_meth_set_cleanup(EVP_MD *md,
511 md->cleanup = cleanup; 470 md->cleanup = cleanup;
512 return 1; 471 return 1;
513} 472}
514LCRYPTO_ALIAS(EVP_MD_meth_set_cleanup);
515 473
516int 474int
517EVP_MD_meth_set_ctrl(EVP_MD *md, 475EVP_MD_meth_set_ctrl(EVP_MD *md,
@@ -520,7 +478,6 @@ EVP_MD_meth_set_ctrl(EVP_MD *md,
520 md->md_ctrl = ctrl; 478 md->md_ctrl = ctrl;
521 return 1; 479 return 1;
522} 480}
523LCRYPTO_ALIAS(EVP_MD_meth_set_ctrl);
524 481
525const EVP_MD * 482const EVP_MD *
526EVP_MD_CTX_md(const EVP_MD_CTX *ctx) 483EVP_MD_CTX_md(const EVP_MD_CTX *ctx)
@@ -529,21 +486,18 @@ EVP_MD_CTX_md(const EVP_MD_CTX *ctx)
529 return NULL; 486 return NULL;
530 return ctx->digest; 487 return ctx->digest;
531} 488}
532LCRYPTO_ALIAS(EVP_MD_CTX_md);
533 489
534void * 490void *
535EVP_MD_CTX_md_data(const EVP_MD_CTX *ctx) 491EVP_MD_CTX_md_data(const EVP_MD_CTX *ctx)
536{ 492{
537 return ctx->md_data; 493 return ctx->md_data;
538} 494}
539LCRYPTO_ALIAS(EVP_MD_CTX_md_data);
540 495
541EVP_PKEY_CTX * 496EVP_PKEY_CTX *
542EVP_MD_CTX_pkey_ctx(const EVP_MD_CTX *ctx) 497EVP_MD_CTX_pkey_ctx(const EVP_MD_CTX *ctx)
543{ 498{
544 return ctx->pctx; 499 return ctx->pctx;
545} 500}
546LCRYPTO_ALIAS(EVP_MD_CTX_pkey_ctx);
547 501
548void 502void
549EVP_MD_CTX_set_pkey_ctx(EVP_MD_CTX *ctx, EVP_PKEY_CTX *pctx) 503EVP_MD_CTX_set_pkey_ctx(EVP_MD_CTX *ctx, EVP_PKEY_CTX *pctx)
@@ -567,46 +521,39 @@ EVP_MD_CTX_set_pkey_ctx(EVP_MD_CTX *ctx, EVP_PKEY_CTX *pctx)
567 EVP_MD_CTX_set_flags(ctx, EVP_MD_CTX_FLAG_KEEP_PKEY_CTX); 521 EVP_MD_CTX_set_flags(ctx, EVP_MD_CTX_FLAG_KEEP_PKEY_CTX);
568 } 522 }
569} 523}
570LCRYPTO_ALIAS(EVP_MD_CTX_set_pkey_ctx);
571 524
572void 525void
573EVP_MD_CTX_set_flags(EVP_MD_CTX *ctx, int flags) 526EVP_MD_CTX_set_flags(EVP_MD_CTX *ctx, int flags)
574{ 527{
575 ctx->flags |= flags; 528 ctx->flags |= flags;
576} 529}
577LCRYPTO_ALIAS(EVP_MD_CTX_set_flags);
578 530
579void 531void
580EVP_MD_CTX_clear_flags(EVP_MD_CTX *ctx, int flags) 532EVP_MD_CTX_clear_flags(EVP_MD_CTX *ctx, int flags)
581{ 533{
582 ctx->flags &= ~flags; 534 ctx->flags &= ~flags;
583} 535}
584LCRYPTO_ALIAS(EVP_MD_CTX_clear_flags);
585 536
586int 537int
587EVP_MD_CTX_test_flags(const EVP_MD_CTX *ctx, int flags) 538EVP_MD_CTX_test_flags(const EVP_MD_CTX *ctx, int flags)
588{ 539{
589 return (ctx->flags & flags); 540 return (ctx->flags & flags);
590} 541}
591LCRYPTO_ALIAS(EVP_MD_CTX_test_flags);
592 542
593void 543void
594EVP_CIPHER_CTX_set_flags(EVP_CIPHER_CTX *ctx, int flags) 544EVP_CIPHER_CTX_set_flags(EVP_CIPHER_CTX *ctx, int flags)
595{ 545{
596 ctx->flags |= flags; 546 ctx->flags |= flags;
597} 547}
598LCRYPTO_ALIAS(EVP_CIPHER_CTX_set_flags);
599 548
600void 549void
601EVP_CIPHER_CTX_clear_flags(EVP_CIPHER_CTX *ctx, int flags) 550EVP_CIPHER_CTX_clear_flags(EVP_CIPHER_CTX *ctx, int flags)
602{ 551{
603 ctx->flags &= ~flags; 552 ctx->flags &= ~flags;
604} 553}
605LCRYPTO_ALIAS(EVP_CIPHER_CTX_clear_flags);
606 554
607int 555int
608EVP_CIPHER_CTX_test_flags(const EVP_CIPHER_CTX *ctx, int flags) 556EVP_CIPHER_CTX_test_flags(const EVP_CIPHER_CTX *ctx, int flags)
609{ 557{
610 return (ctx->flags & flags); 558 return (ctx->flags & flags);
611} 559}
612LCRYPTO_ALIAS(EVP_CIPHER_CTX_test_flags);
diff --git a/src/lib/libcrypto/evp/evp_pbe.c b/src/lib/libcrypto/evp/evp_pbe.c
index 5592521e62..4a23a98f8d 100644
--- a/src/lib/libcrypto/evp/evp_pbe.c
+++ b/src/lib/libcrypto/evp/evp_pbe.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: evp_pbe.c,v 1.28 2023/07/07 13:54:45 beck Exp $ */ 1/* $OpenBSD: evp_pbe.c,v 1.29 2023/07/07 19:37:53 beck Exp $ */
2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL 2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3 * project 1999. 3 * project 1999.
4 */ 4 */
@@ -170,7 +170,6 @@ EVP_PBE_CipherInit(ASN1_OBJECT *pbe_obj, const char *pass, int passlen,
170 } 170 }
171 return 1; 171 return 1;
172} 172}
173LCRYPTO_ALIAS(EVP_PBE_CipherInit);
174 173
175static int pbe2_cmp_BSEARCH_CMP_FN(const void *, const void *); 174static int pbe2_cmp_BSEARCH_CMP_FN(const void *, const void *);
176static int pbe2_cmp(EVP_PBE_CTL const *, EVP_PBE_CTL const *); 175static int pbe2_cmp(EVP_PBE_CTL const *, EVP_PBE_CTL const *);
@@ -247,7 +246,6 @@ EVP_PBE_alg_add_type(int pbe_type, int pbe_nid, int cipher_nid, int md_nid,
247 } 246 }
248 return 1; 247 return 1;
249} 248}
250LCRYPTO_ALIAS(EVP_PBE_alg_add_type);
251 249
252int 250int
253EVP_PBE_alg_add(int nid, const EVP_CIPHER *cipher, const EVP_MD *md, 251EVP_PBE_alg_add(int nid, const EVP_CIPHER *cipher, const EVP_MD *md,
@@ -267,7 +265,6 @@ EVP_PBE_alg_add(int nid, const EVP_CIPHER *cipher, const EVP_MD *md,
267 return EVP_PBE_alg_add_type(EVP_PBE_TYPE_OUTER, nid, 265 return EVP_PBE_alg_add_type(EVP_PBE_TYPE_OUTER, nid,
268 cipher_nid, md_nid, keygen); 266 cipher_nid, md_nid, keygen);
269} 267}
270LCRYPTO_ALIAS(EVP_PBE_alg_add);
271 268
272int 269int
273EVP_PBE_find(int type, int pbe_nid, 270EVP_PBE_find(int type, int pbe_nid,
@@ -300,7 +297,6 @@ EVP_PBE_find(int type, int pbe_nid,
300 *pkeygen = pbetmp->keygen; 297 *pkeygen = pbetmp->keygen;
301 return 1; 298 return 1;
302} 299}
303LCRYPTO_ALIAS(EVP_PBE_find);
304 300
305static void 301static void
306free_evp_pbe_ctl(EVP_PBE_CTL *pbe) 302free_evp_pbe_ctl(EVP_PBE_CTL *pbe)
@@ -314,4 +310,3 @@ EVP_PBE_cleanup(void)
314 sk_EVP_PBE_CTL_pop_free(pbe_algs, free_evp_pbe_ctl); 310 sk_EVP_PBE_CTL_pop_free(pbe_algs, free_evp_pbe_ctl);
315 pbe_algs = NULL; 311 pbe_algs = NULL;
316} 312}
317LCRYPTO_ALIAS(EVP_PBE_cleanup);
diff --git a/src/lib/libcrypto/evp/evp_pkey.c b/src/lib/libcrypto/evp/evp_pkey.c
index 31a59e2536..9e29a1ae69 100644
--- a/src/lib/libcrypto/evp/evp_pkey.c
+++ b/src/lib/libcrypto/evp/evp_pkey.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: evp_pkey.c,v 1.26 2023/07/07 13:54:45 beck Exp $ */ 1/* $OpenBSD: evp_pkey.c,v 1.27 2023/07/07 19:37:53 beck Exp $ */
2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL 2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3 * project 1999. 3 * project 1999.
4 */ 4 */
@@ -105,7 +105,6 @@ error:
105 EVP_PKEY_free(pkey); 105 EVP_PKEY_free(pkey);
106 return NULL; 106 return NULL;
107} 107}
108LCRYPTO_ALIAS(EVP_PKCS82PKEY);
109 108
110/* Turn a private key into a PKCS8 structure */ 109/* Turn a private key into a PKCS8 structure */
111 110
@@ -139,7 +138,6 @@ error:
139 PKCS8_PRIV_KEY_INFO_free(p8); 138 PKCS8_PRIV_KEY_INFO_free(p8);
140 return NULL; 139 return NULL;
141} 140}
142LCRYPTO_ALIAS(EVP_PKEY2PKCS8);
143 141
144/* EVP_PKEY attribute functions */ 142/* EVP_PKEY attribute functions */
145 143
@@ -148,14 +146,12 @@ EVP_PKEY_get_attr_count(const EVP_PKEY *key)
148{ 146{
149 return X509at_get_attr_count(key->attributes); 147 return X509at_get_attr_count(key->attributes);
150} 148}
151LCRYPTO_ALIAS(EVP_PKEY_get_attr_count);
152 149
153int 150int
154EVP_PKEY_get_attr_by_NID(const EVP_PKEY *key, int nid, int lastpos) 151EVP_PKEY_get_attr_by_NID(const EVP_PKEY *key, int nid, int lastpos)
155{ 152{
156 return X509at_get_attr_by_NID(key->attributes, nid, lastpos); 153 return X509at_get_attr_by_NID(key->attributes, nid, lastpos);
157} 154}
158LCRYPTO_ALIAS(EVP_PKEY_get_attr_by_NID);
159 155
160int 156int
161EVP_PKEY_get_attr_by_OBJ(const EVP_PKEY *key, const ASN1_OBJECT *obj, 157EVP_PKEY_get_attr_by_OBJ(const EVP_PKEY *key, const ASN1_OBJECT *obj,
@@ -163,21 +159,18 @@ EVP_PKEY_get_attr_by_OBJ(const EVP_PKEY *key, const ASN1_OBJECT *obj,
163{ 159{
164 return X509at_get_attr_by_OBJ(key->attributes, obj, lastpos); 160 return X509at_get_attr_by_OBJ(key->attributes, obj, lastpos);
165} 161}
166LCRYPTO_ALIAS(EVP_PKEY_get_attr_by_OBJ);
167 162
168X509_ATTRIBUTE * 163X509_ATTRIBUTE *
169EVP_PKEY_get_attr(const EVP_PKEY *key, int loc) 164EVP_PKEY_get_attr(const EVP_PKEY *key, int loc)
170{ 165{
171 return X509at_get_attr(key->attributes, loc); 166 return X509at_get_attr(key->attributes, loc);
172} 167}
173LCRYPTO_ALIAS(EVP_PKEY_get_attr);
174 168
175X509_ATTRIBUTE * 169X509_ATTRIBUTE *
176EVP_PKEY_delete_attr(EVP_PKEY *key, int loc) 170EVP_PKEY_delete_attr(EVP_PKEY *key, int loc)
177{ 171{
178 return X509at_delete_attr(key->attributes, loc); 172 return X509at_delete_attr(key->attributes, loc);
179} 173}
180LCRYPTO_ALIAS(EVP_PKEY_delete_attr);
181 174
182int 175int
183EVP_PKEY_add1_attr(EVP_PKEY *key, X509_ATTRIBUTE *attr) 176EVP_PKEY_add1_attr(EVP_PKEY *key, X509_ATTRIBUTE *attr)
@@ -186,7 +179,6 @@ EVP_PKEY_add1_attr(EVP_PKEY *key, X509_ATTRIBUTE *attr)
186 return 1; 179 return 1;
187 return 0; 180 return 0;
188} 181}
189LCRYPTO_ALIAS(EVP_PKEY_add1_attr);
190 182
191int 183int
192EVP_PKEY_add1_attr_by_OBJ(EVP_PKEY *key, const ASN1_OBJECT *obj, int type, 184EVP_PKEY_add1_attr_by_OBJ(EVP_PKEY *key, const ASN1_OBJECT *obj, int type,
@@ -196,7 +188,6 @@ EVP_PKEY_add1_attr_by_OBJ(EVP_PKEY *key, const ASN1_OBJECT *obj, int type,
196 return 1; 188 return 1;
197 return 0; 189 return 0;
198} 190}
199LCRYPTO_ALIAS(EVP_PKEY_add1_attr_by_OBJ);
200 191
201int 192int
202EVP_PKEY_add1_attr_by_NID(EVP_PKEY *key, int nid, int type, 193EVP_PKEY_add1_attr_by_NID(EVP_PKEY *key, int nid, int type,
@@ -206,7 +197,6 @@ EVP_PKEY_add1_attr_by_NID(EVP_PKEY *key, int nid, int type,
206 return 1; 197 return 1;
207 return 0; 198 return 0;
208} 199}
209LCRYPTO_ALIAS(EVP_PKEY_add1_attr_by_NID);
210 200
211int 201int
212EVP_PKEY_add1_attr_by_txt(EVP_PKEY *key, const char *attrname, int type, 202EVP_PKEY_add1_attr_by_txt(EVP_PKEY *key, const char *attrname, int type,
@@ -217,4 +207,3 @@ EVP_PKEY_add1_attr_by_txt(EVP_PKEY *key, const char *attrname, int type,
217 return 1; 207 return 1;
218 return 0; 208 return 0;
219} 209}
220LCRYPTO_ALIAS(EVP_PKEY_add1_attr_by_txt);
diff --git a/src/lib/libcrypto/evp/m_gost2814789.c b/src/lib/libcrypto/evp/m_gost2814789.c
index 69f927c5a7..9b8a09e5a4 100644
--- a/src/lib/libcrypto/evp/m_gost2814789.c
+++ b/src/lib/libcrypto/evp/m_gost2814789.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: m_gost2814789.c,v 1.5 2023/07/07 13:54:45 beck Exp $ */ 1/* $OpenBSD: m_gost2814789.c,v 1.6 2023/07/07 19:37:53 beck Exp $ */
2/* 2/*
3 * Copyright (c) 2014 Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> 3 * Copyright (c) 2014 Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
4 * Copyright (c) 2005-2006 Cryptocom LTD 4 * Copyright (c) 2005-2006 Cryptocom LTD
@@ -110,5 +110,4 @@ EVP_gost2814789imit(void)
110{ 110{
111 return (&gost2814789imit_md); 111 return (&gost2814789imit_md);
112} 112}
113LCRYPTO_ALIAS(EVP_gost2814789imit);
114#endif 113#endif
diff --git a/src/lib/libcrypto/evp/m_gostr341194.c b/src/lib/libcrypto/evp/m_gostr341194.c
index e2a65a3147..723349a0d8 100644
--- a/src/lib/libcrypto/evp/m_gostr341194.c
+++ b/src/lib/libcrypto/evp/m_gostr341194.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: m_gostr341194.c,v 1.6 2023/07/07 13:54:45 beck Exp $ */ 1/* $OpenBSD: m_gostr341194.c,v 1.7 2023/07/07 19:37:53 beck Exp $ */
2/* 2/*
3 * Copyright (c) 2014 Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> 3 * Copyright (c) 2014 Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
4 * Copyright (c) 2005-2006 Cryptocom LTD 4 * Copyright (c) 2005-2006 Cryptocom LTD
@@ -97,5 +97,4 @@ EVP_gostr341194(void)
97{ 97{
98 return (&gostr341194_md); 98 return (&gostr341194_md);
99} 99}
100LCRYPTO_ALIAS(EVP_gostr341194);
101#endif 100#endif
diff --git a/src/lib/libcrypto/evp/m_md4.c b/src/lib/libcrypto/evp/m_md4.c
index d86ed426d3..199dba8489 100644
--- a/src/lib/libcrypto/evp/m_md4.c
+++ b/src/lib/libcrypto/evp/m_md4.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: m_md4.c,v 1.20 2023/07/07 13:54:45 beck Exp $ */ 1/* $OpenBSD: m_md4.c,v 1.21 2023/07/07 19:37:53 beck 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 *
@@ -110,5 +110,4 @@ EVP_md4(void)
110{ 110{
111 return (&md4_md); 111 return (&md4_md);
112} 112}
113LCRYPTO_ALIAS(EVP_md4);
114#endif 113#endif
diff --git a/src/lib/libcrypto/evp/m_md5.c b/src/lib/libcrypto/evp/m_md5.c
index 18a78016c6..0dfad89aaf 100644
--- a/src/lib/libcrypto/evp/m_md5.c
+++ b/src/lib/libcrypto/evp/m_md5.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: m_md5.c,v 1.19 2023/07/07 13:54:45 beck Exp $ */ 1/* $OpenBSD: m_md5.c,v 1.20 2023/07/07 19:37:53 beck 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 *
@@ -110,5 +110,4 @@ EVP_md5(void)
110{ 110{
111 return (&md5_md); 111 return (&md5_md);
112} 112}
113LCRYPTO_ALIAS(EVP_md5);
114#endif 113#endif
diff --git a/src/lib/libcrypto/evp/m_md5_sha1.c b/src/lib/libcrypto/evp/m_md5_sha1.c
index 32a6f56a1b..f4a6600ec6 100644
--- a/src/lib/libcrypto/evp/m_md5_sha1.c
+++ b/src/lib/libcrypto/evp/m_md5_sha1.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: m_md5_sha1.c,v 1.6 2023/07/07 13:54:45 beck Exp $ */ 1/* $OpenBSD: m_md5_sha1.c,v 1.7 2023/07/07 19:37:53 beck Exp $ */
2/* 2/*
3 * Copyright (c) 2017 Joel Sing <jsing@openbsd.org> 3 * Copyright (c) 2017 Joel Sing <jsing@openbsd.org>
4 * 4 *
@@ -87,4 +87,3 @@ EVP_md5_sha1(void)
87{ 87{
88 return &md5_sha1_md; 88 return &md5_sha1_md;
89} 89}
90LCRYPTO_ALIAS(EVP_md5_sha1);
diff --git a/src/lib/libcrypto/evp/m_null.c b/src/lib/libcrypto/evp/m_null.c
index 884a47927e..28634d2da5 100644
--- a/src/lib/libcrypto/evp/m_null.c
+++ b/src/lib/libcrypto/evp/m_null.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: m_null.c,v 1.13 2023/07/07 13:54:45 beck Exp $ */ 1/* $OpenBSD: m_null.c,v 1.14 2023/07/07 19:37:53 beck 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 *
@@ -101,4 +101,3 @@ EVP_md_null(void)
101{ 101{
102 return (&null_md); 102 return (&null_md);
103} 103}
104LCRYPTO_ALIAS(EVP_md_null);
diff --git a/src/lib/libcrypto/evp/m_ripemd.c b/src/lib/libcrypto/evp/m_ripemd.c
index 3cba1dcf1b..638d0cd274 100644
--- a/src/lib/libcrypto/evp/m_ripemd.c
+++ b/src/lib/libcrypto/evp/m_ripemd.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: m_ripemd.c,v 1.16 2023/07/07 13:54:45 beck Exp $ */ 1/* $OpenBSD: m_ripemd.c,v 1.17 2023/07/07 19:37:53 beck 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 *
@@ -110,5 +110,4 @@ EVP_ripemd160(void)
110{ 110{
111 return (&ripemd160_md); 111 return (&ripemd160_md);
112} 112}
113LCRYPTO_ALIAS(EVP_ripemd160);
114#endif 113#endif
diff --git a/src/lib/libcrypto/evp/m_sha1.c b/src/lib/libcrypto/evp/m_sha1.c
index 631e19549e..c65e0515c8 100644
--- a/src/lib/libcrypto/evp/m_sha1.c
+++ b/src/lib/libcrypto/evp/m_sha1.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: m_sha1.c,v 1.24 2023/07/07 13:54:45 beck Exp $ */ 1/* $OpenBSD: m_sha1.c,v 1.25 2023/07/07 19:37:53 beck 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 *
@@ -110,7 +110,6 @@ EVP_sha1(void)
110{ 110{
111 return &sha1_md; 111 return &sha1_md;
112} 112}
113LCRYPTO_ALIAS(EVP_sha1);
114#endif 113#endif
115 114
116#ifndef OPENSSL_NO_SHA256 115#ifndef OPENSSL_NO_SHA256
@@ -156,7 +155,6 @@ EVP_sha224(void)
156{ 155{
157 return &sha224_md; 156 return &sha224_md;
158} 157}
159LCRYPTO_ALIAS(EVP_sha224);
160 158
161static int 159static int
162sha256_init(EVP_MD_CTX *ctx) 160sha256_init(EVP_MD_CTX *ctx)
@@ -195,7 +193,6 @@ EVP_sha256(void)
195{ 193{
196 return &sha256_md; 194 return &sha256_md;
197} 195}
198LCRYPTO_ALIAS(EVP_sha256);
199#endif /* ifndef OPENSSL_NO_SHA256 */ 196#endif /* ifndef OPENSSL_NO_SHA256 */
200 197
201#ifndef OPENSSL_NO_SHA512 198#ifndef OPENSSL_NO_SHA512
@@ -237,7 +234,6 @@ EVP_sha384(void)
237{ 234{
238 return &sha384_md; 235 return &sha384_md;
239} 236}
240LCRYPTO_ALIAS(EVP_sha384);
241 237
242static int 238static int
243sha512_init(EVP_MD_CTX *ctx) 239sha512_init(EVP_MD_CTX *ctx)
@@ -276,7 +272,6 @@ EVP_sha512(void)
276{ 272{
277 return &sha512_md; 273 return &sha512_md;
278} 274}
279LCRYPTO_ALIAS(EVP_sha512);
280 275
281static int 276static int
282sha512_224_init(EVP_MD_CTX *ctx) 277sha512_224_init(EVP_MD_CTX *ctx)
@@ -315,7 +310,6 @@ EVP_sha512_224(void)
315{ 310{
316 return &sha512_224_md; 311 return &sha512_224_md;
317} 312}
318LCRYPTO_ALIAS(EVP_sha512_224);
319 313
320static int 314static int
321sha512_256_init(EVP_MD_CTX *ctx) 315sha512_256_init(EVP_MD_CTX *ctx)
@@ -354,5 +348,4 @@ EVP_sha512_256(void)
354{ 348{
355 return &sha512_256_md; 349 return &sha512_256_md;
356} 350}
357LCRYPTO_ALIAS(EVP_sha512_256);
358#endif /* ifndef OPENSSL_NO_SHA512 */ 351#endif /* ifndef OPENSSL_NO_SHA512 */
diff --git a/src/lib/libcrypto/evp/m_sha3.c b/src/lib/libcrypto/evp/m_sha3.c
index 9137629823..67f94f7956 100644
--- a/src/lib/libcrypto/evp/m_sha3.c
+++ b/src/lib/libcrypto/evp/m_sha3.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: m_sha3.c,v 1.2 2023/07/07 13:54:45 beck Exp $ */ 1/* $OpenBSD: m_sha3.c,v 1.3 2023/07/07 19:37:53 beck Exp $ */
2/* 2/*
3 * Copyright (c) 2023 Joel Sing <jsing@openbsd.org> 3 * Copyright (c) 2023 Joel Sing <jsing@openbsd.org>
4 * 4 *
@@ -57,7 +57,6 @@ EVP_sha3_224(void)
57{ 57{
58 return &sha3_224_md; 58 return &sha3_224_md;
59} 59}
60LCRYPTO_ALIAS(EVP_sha3_224);
61 60
62static int 61static int
63sha3_256_init(EVP_MD_CTX *ctx) 62sha3_256_init(EVP_MD_CTX *ctx)
@@ -96,7 +95,6 @@ EVP_sha3_256(void)
96{ 95{
97 return &sha3_256_md; 96 return &sha3_256_md;
98} 97}
99LCRYPTO_ALIAS(EVP_sha3_256);
100 98
101static int 99static int
102sha3_384_init(EVP_MD_CTX *ctx) 100sha3_384_init(EVP_MD_CTX *ctx)
@@ -135,7 +133,6 @@ EVP_sha3_384(void)
135{ 133{
136 return &sha3_384_md; 134 return &sha3_384_md;
137} 135}
138LCRYPTO_ALIAS(EVP_sha3_384);
139 136
140static int 137static int
141sha3_512_init(EVP_MD_CTX *ctx) 138sha3_512_init(EVP_MD_CTX *ctx)
@@ -174,4 +171,3 @@ EVP_sha3_512(void)
174{ 171{
175 return &sha3_512_md; 172 return &sha3_512_md;
176} 173}
177LCRYPTO_ALIAS(EVP_sha3_512);
diff --git a/src/lib/libcrypto/evp/m_sigver.c b/src/lib/libcrypto/evp/m_sigver.c
index 950e4a2a2f..47c01f784a 100644
--- a/src/lib/libcrypto/evp/m_sigver.c
+++ b/src/lib/libcrypto/evp/m_sigver.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: m_sigver.c,v 1.12 2023/07/07 13:54:45 beck Exp $ */ 1/* $OpenBSD: m_sigver.c,v 1.13 2023/07/07 19:37:53 beck Exp $ */
2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL 2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3 * project 2006. 3 * project 2006.
4 */ 4 */
@@ -133,7 +133,6 @@ EVP_DigestSignInit(EVP_MD_CTX *ctx, EVP_PKEY_CTX **pctx, const EVP_MD *type,
133{ 133{
134 return do_sigver_init(ctx, pctx, type, e, pkey, 0); 134 return do_sigver_init(ctx, pctx, type, e, pkey, 0);
135} 135}
136LCRYPTO_ALIAS(EVP_DigestSignInit);
137 136
138int 137int
139EVP_DigestVerifyInit(EVP_MD_CTX *ctx, EVP_PKEY_CTX **pctx, const EVP_MD *type, 138EVP_DigestVerifyInit(EVP_MD_CTX *ctx, EVP_PKEY_CTX **pctx, const EVP_MD *type,
@@ -141,7 +140,6 @@ EVP_DigestVerifyInit(EVP_MD_CTX *ctx, EVP_PKEY_CTX **pctx, const EVP_MD *type,
141{ 140{
142 return do_sigver_init(ctx, pctx, type, e, pkey, 1); 141 return do_sigver_init(ctx, pctx, type, e, pkey, 1);
143} 142}
144LCRYPTO_ALIAS(EVP_DigestVerifyInit);
145 143
146int 144int
147EVP_DigestSignFinal(EVP_MD_CTX *ctx, unsigned char *sigret, size_t *siglen) 145EVP_DigestSignFinal(EVP_MD_CTX *ctx, unsigned char *sigret, size_t *siglen)
@@ -200,7 +198,6 @@ EVP_DigestSignFinal(EVP_MD_CTX *ctx, unsigned char *sigret, size_t *siglen)
200 } 198 }
201 return 1; 199 return 1;
202} 200}
203LCRYPTO_ALIAS(EVP_DigestSignFinal);
204 201
205int 202int
206EVP_DigestSign(EVP_MD_CTX *ctx, unsigned char *sigret, size_t *siglen, 203EVP_DigestSign(EVP_MD_CTX *ctx, unsigned char *sigret, size_t *siglen,
@@ -217,7 +214,6 @@ EVP_DigestSign(EVP_MD_CTX *ctx, unsigned char *sigret, size_t *siglen,
217 214
218 return EVP_DigestSignFinal(ctx, sigret, siglen); 215 return EVP_DigestSignFinal(ctx, sigret, siglen);
219} 216}
220LCRYPTO_ALIAS(EVP_DigestSign);
221 217
222int 218int
223EVP_DigestVerifyFinal(EVP_MD_CTX *ctx, const unsigned char *sig, size_t siglen) 219EVP_DigestVerifyFinal(EVP_MD_CTX *ctx, const unsigned char *sig, size_t siglen)
@@ -245,7 +241,6 @@ EVP_DigestVerifyFinal(EVP_MD_CTX *ctx, const unsigned char *sig, size_t siglen)
245 return r; 241 return r;
246 return EVP_PKEY_verify(ctx->pctx, sig, siglen, md, mdlen); 242 return EVP_PKEY_verify(ctx->pctx, sig, siglen, md, mdlen);
247} 243}
248LCRYPTO_ALIAS(EVP_DigestVerifyFinal);
249 244
250int 245int
251EVP_DigestVerify(EVP_MD_CTX *ctx, const unsigned char *sigret, size_t siglen, 246EVP_DigestVerify(EVP_MD_CTX *ctx, const unsigned char *sigret, size_t siglen,
@@ -260,4 +255,3 @@ EVP_DigestVerify(EVP_MD_CTX *ctx, const unsigned char *sigret, size_t siglen,
260 255
261 return EVP_DigestVerifyFinal(ctx, sigret, siglen); 256 return EVP_DigestVerifyFinal(ctx, sigret, siglen);
262} 257}
263LCRYPTO_ALIAS(EVP_DigestVerify);
diff --git a/src/lib/libcrypto/evp/m_sm3.c b/src/lib/libcrypto/evp/m_sm3.c
index 169a492d68..ea30d8d222 100644
--- a/src/lib/libcrypto/evp/m_sm3.c
+++ b/src/lib/libcrypto/evp/m_sm3.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: m_sm3.c,v 1.5 2023/07/07 13:54:46 beck Exp $ */ 1/* $OpenBSD: m_sm3.c,v 1.6 2023/07/07 19:37:53 beck Exp $ */
2/* 2/*
3 * Copyright (c) 2018, Ribose Inc 3 * Copyright (c) 2018, Ribose Inc
4 * 4 *
@@ -64,6 +64,5 @@ EVP_sm3(void)
64{ 64{
65 return &sm3_md; 65 return &sm3_md;
66} 66}
67LCRYPTO_ALIAS(EVP_sm3);
68 67
69#endif /* OPENSSL_NO_SM3 */ 68#endif /* OPENSSL_NO_SM3 */
diff --git a/src/lib/libcrypto/evp/m_streebog.c b/src/lib/libcrypto/evp/m_streebog.c
index ce41e4ca8f..48fa65864e 100644
--- a/src/lib/libcrypto/evp/m_streebog.c
+++ b/src/lib/libcrypto/evp/m_streebog.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: m_streebog.c,v 1.6 2023/07/07 13:54:46 beck Exp $ */ 1/* $OpenBSD: m_streebog.c,v 1.7 2023/07/07 19:37:54 beck Exp $ */
2/* 2/*
3 * Copyright (c) 2014 Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> 3 * Copyright (c) 2014 Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
4 * Copyright (c) 2005-2006 Cryptocom LTD 4 * Copyright (c) 2005-2006 Cryptocom LTD
@@ -124,12 +124,10 @@ EVP_streebog256(void)
124{ 124{
125 return (&streebog256_md); 125 return (&streebog256_md);
126} 126}
127LCRYPTO_ALIAS(EVP_streebog256);
128 127
129const EVP_MD * 128const EVP_MD *
130EVP_streebog512(void) 129EVP_streebog512(void)
131{ 130{
132 return (&streebog512_md); 131 return (&streebog512_md);
133} 132}
134LCRYPTO_ALIAS(EVP_streebog512);
135#endif 133#endif
diff --git a/src/lib/libcrypto/evp/m_wp.c b/src/lib/libcrypto/evp/m_wp.c
index 9bd43370e6..44d13b1484 100644
--- a/src/lib/libcrypto/evp/m_wp.c
+++ b/src/lib/libcrypto/evp/m_wp.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: m_wp.c,v 1.12 2023/07/07 13:54:46 beck Exp $ */ 1/* $OpenBSD: m_wp.c,v 1.13 2023/07/07 19:37:54 beck Exp $ */
2 2
3#include <stdio.h> 3#include <stdio.h>
4 4
@@ -50,5 +50,4 @@ EVP_whirlpool(void)
50{ 50{
51 return (&whirlpool_md); 51 return (&whirlpool_md);
52} 52}
53LCRYPTO_ALIAS(EVP_whirlpool);
54#endif 53#endif
diff --git a/src/lib/libcrypto/evp/names.c b/src/lib/libcrypto/evp/names.c
index c6109a5356..f7864f5958 100644
--- a/src/lib/libcrypto/evp/names.c
+++ b/src/lib/libcrypto/evp/names.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: names.c,v 1.18 2023/07/07 13:54:46 beck Exp $ */ 1/* $OpenBSD: names.c,v 1.19 2023/07/07 19:37:54 beck 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 *
@@ -84,7 +84,6 @@ EVP_add_cipher(const EVP_CIPHER *c)
84 (const char *)c); 84 (const char *)c);
85 return (r); 85 return (r);
86} 86}
87LCRYPTO_ALIAS(EVP_add_cipher);
88 87
89int 88int
90EVP_add_digest(const EVP_MD *md) 89EVP_add_digest(const EVP_MD *md)
@@ -113,7 +112,6 @@ EVP_add_digest(const EVP_MD *md)
113 } 112 }
114 return (r); 113 return (r);
115} 114}
116LCRYPTO_ALIAS(EVP_add_digest);
117 115
118const EVP_CIPHER * 116const EVP_CIPHER *
119EVP_get_cipherbyname(const char *name) 117EVP_get_cipherbyname(const char *name)
@@ -126,7 +124,6 @@ EVP_get_cipherbyname(const char *name)
126 cp = (const EVP_CIPHER *)OBJ_NAME_get(name, OBJ_NAME_TYPE_CIPHER_METH); 124 cp = (const EVP_CIPHER *)OBJ_NAME_get(name, OBJ_NAME_TYPE_CIPHER_METH);
127 return (cp); 125 return (cp);
128} 126}
129LCRYPTO_ALIAS(EVP_get_cipherbyname);
130 127
131const EVP_MD * 128const EVP_MD *
132EVP_get_digestbyname(const char *name) 129EVP_get_digestbyname(const char *name)
@@ -139,7 +136,6 @@ EVP_get_digestbyname(const char *name)
139 cp = (const EVP_MD *)OBJ_NAME_get(name, OBJ_NAME_TYPE_MD_METH); 136 cp = (const EVP_MD *)OBJ_NAME_get(name, OBJ_NAME_TYPE_MD_METH);
140 return (cp); 137 return (cp);
141} 138}
142LCRYPTO_ALIAS(EVP_get_digestbyname);
143 139
144void 140void
145EVP_cleanup(void) 141EVP_cleanup(void)
@@ -158,7 +154,6 @@ EVP_cleanup(void)
158 } 154 }
159 OBJ_sigid_free(); 155 OBJ_sigid_free();
160} 156}
161LCRYPTO_ALIAS(EVP_cleanup);
162 157
163struct doall_cipher { 158struct doall_cipher {
164 void *arg; 159 void *arg;
@@ -190,7 +185,6 @@ EVP_CIPHER_do_all(void (*fn)(const EVP_CIPHER *ciph, const char *from,
190 dc.arg = arg; 185 dc.arg = arg;
191 OBJ_NAME_do_all(OBJ_NAME_TYPE_CIPHER_METH, do_all_cipher_fn, &dc); 186 OBJ_NAME_do_all(OBJ_NAME_TYPE_CIPHER_METH, do_all_cipher_fn, &dc);
192} 187}
193LCRYPTO_ALIAS(EVP_CIPHER_do_all);
194 188
195void 189void
196EVP_CIPHER_do_all_sorted(void (*fn)(const EVP_CIPHER *ciph, const char *from, 190EVP_CIPHER_do_all_sorted(void (*fn)(const EVP_CIPHER *ciph, const char *from,
@@ -206,7 +200,6 @@ EVP_CIPHER_do_all_sorted(void (*fn)(const EVP_CIPHER *ciph, const char *from,
206 OBJ_NAME_do_all_sorted(OBJ_NAME_TYPE_CIPHER_METH, 200 OBJ_NAME_do_all_sorted(OBJ_NAME_TYPE_CIPHER_METH,
207 do_all_cipher_fn, &dc); 201 do_all_cipher_fn, &dc);
208} 202}
209LCRYPTO_ALIAS(EVP_CIPHER_do_all_sorted);
210 203
211struct doall_md { 204struct doall_md {
212 void *arg; 205 void *arg;
@@ -238,7 +231,6 @@ EVP_MD_do_all(void (*fn)(const EVP_MD *md, const char *from, const char *to,
238 dc.arg = arg; 231 dc.arg = arg;
239 OBJ_NAME_do_all(OBJ_NAME_TYPE_MD_METH, do_all_md_fn, &dc); 232 OBJ_NAME_do_all(OBJ_NAME_TYPE_MD_METH, do_all_md_fn, &dc);
240} 233}
241LCRYPTO_ALIAS(EVP_MD_do_all);
242 234
243void 235void
244EVP_MD_do_all_sorted(void (*fn)(const EVP_MD *md, 236EVP_MD_do_all_sorted(void (*fn)(const EVP_MD *md,
@@ -253,4 +245,3 @@ EVP_MD_do_all_sorted(void (*fn)(const EVP_MD *md,
253 dc.arg = arg; 245 dc.arg = arg;
254 OBJ_NAME_do_all_sorted(OBJ_NAME_TYPE_MD_METH, do_all_md_fn, &dc); 246 OBJ_NAME_do_all_sorted(OBJ_NAME_TYPE_MD_METH, do_all_md_fn, &dc);
255} 247}
256LCRYPTO_ALIAS(EVP_MD_do_all_sorted);
diff --git a/src/lib/libcrypto/evp/p5_crpt.c b/src/lib/libcrypto/evp/p5_crpt.c
index cf30ad9176..d26439ad26 100644
--- a/src/lib/libcrypto/evp/p5_crpt.c
+++ b/src/lib/libcrypto/evp/p5_crpt.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: p5_crpt.c,v 1.22 2023/07/07 13:54:46 beck Exp $ */ 1/* $OpenBSD: p5_crpt.c,v 1.23 2023/07/07 19:37:54 beck Exp $ */
2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL 2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3 * project 1999. 3 * project 1999.
4 */ 4 */
@@ -73,7 +73,6 @@ void
73PKCS5_PBE_add(void) 73PKCS5_PBE_add(void)
74{ 74{
75} 75}
76LCRYPTO_ALIAS(PKCS5_PBE_add);
77 76
78int 77int
79PKCS5_PBE_keyivgen(EVP_CIPHER_CTX *cctx, const char *pass, int passlen, 78PKCS5_PBE_keyivgen(EVP_CIPHER_CTX *cctx, const char *pass, int passlen,
@@ -162,4 +161,3 @@ err:
162 PBEPARAM_free(pbe); 161 PBEPARAM_free(pbe);
163 return rv; 162 return rv;
164} 163}
165LCRYPTO_ALIAS(PKCS5_PBE_keyivgen);
diff --git a/src/lib/libcrypto/evp/p5_crpt2.c b/src/lib/libcrypto/evp/p5_crpt2.c
index a6fcc30fa4..3c66af9314 100644
--- a/src/lib/libcrypto/evp/p5_crpt2.c
+++ b/src/lib/libcrypto/evp/p5_crpt2.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: p5_crpt2.c,v 1.26 2023/07/07 13:54:46 beck Exp $ */ 1/* $OpenBSD: p5_crpt2.c,v 1.27 2023/07/07 19:37:54 beck Exp $ */
2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL 2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3 * project 1999. 3 * project 1999.
4 */ 4 */
@@ -149,7 +149,6 @@ PKCS5_PBKDF2_HMAC(const char *pass, int passlen, const unsigned char *salt,
149 HMAC_CTX_cleanup(&hctx_tpl); 149 HMAC_CTX_cleanup(&hctx_tpl);
150 return 1; 150 return 1;
151} 151}
152LCRYPTO_ALIAS(PKCS5_PBKDF2_HMAC);
153 152
154int 153int
155PKCS5_PBKDF2_HMAC_SHA1(const char *pass, int passlen, const unsigned char *salt, 154PKCS5_PBKDF2_HMAC_SHA1(const char *pass, int passlen, const unsigned char *salt,
@@ -158,7 +157,6 @@ PKCS5_PBKDF2_HMAC_SHA1(const char *pass, int passlen, const unsigned char *salt,
158 return PKCS5_PBKDF2_HMAC(pass, passlen, salt, saltlen, iter, 157 return PKCS5_PBKDF2_HMAC(pass, passlen, salt, saltlen, iter,
159 EVP_sha1(), keylen, out); 158 EVP_sha1(), keylen, out);
160} 159}
161LCRYPTO_ALIAS(PKCS5_PBKDF2_HMAC_SHA1);
162 160
163/* Now the key derivation function itself. This is a bit evil because 161/* Now the key derivation function itself. This is a bit evil because
164 * it has to check the ASN1 parameters are valid: and there are quite a 162 * it has to check the ASN1 parameters are valid: and there are quite a
@@ -220,7 +218,6 @@ err:
220 PBE2PARAM_free(pbe2); 218 PBE2PARAM_free(pbe2);
221 return rv; 219 return rv;
222} 220}
223LCRYPTO_ALIAS(PKCS5_v2_PBE_keyivgen);
224 221
225int 222int
226PKCS5_v2_PBKDF2_keyivgen(EVP_CIPHER_CTX *ctx, const char *pass, int passlen, 223PKCS5_v2_PBKDF2_keyivgen(EVP_CIPHER_CTX *ctx, const char *pass, int passlen,
diff --git a/src/lib/libcrypto/evp/p_dec.c b/src/lib/libcrypto/evp/p_dec.c
index 7225606c31..d55b48b771 100644
--- a/src/lib/libcrypto/evp/p_dec.c
+++ b/src/lib/libcrypto/evp/p_dec.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: p_dec.c,v 1.14 2023/07/07 13:54:46 beck Exp $ */ 1/* $OpenBSD: p_dec.c,v 1.15 2023/07/07 19:37:54 beck 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 *
@@ -92,4 +92,3 @@ err:
92#endif 92#endif
93 return (ret); 93 return (ret);
94} 94}
95LCRYPTO_ALIAS(EVP_PKEY_decrypt_old);
diff --git a/src/lib/libcrypto/evp/p_enc.c b/src/lib/libcrypto/evp/p_enc.c
index c2a16234e8..1abaf0b268 100644
--- a/src/lib/libcrypto/evp/p_enc.c
+++ b/src/lib/libcrypto/evp/p_enc.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: p_enc.c,v 1.14 2023/07/07 13:54:46 beck Exp $ */ 1/* $OpenBSD: p_enc.c,v 1.15 2023/07/07 19:37:54 beck 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 *
@@ -89,4 +89,3 @@ err:
89#endif 89#endif
90 return (ret); 90 return (ret);
91} 91}
92LCRYPTO_ALIAS(EVP_PKEY_encrypt_old);
diff --git a/src/lib/libcrypto/evp/p_lib.c b/src/lib/libcrypto/evp/p_lib.c
index 325fb605df..85e7978ff4 100644
--- a/src/lib/libcrypto/evp/p_lib.c
+++ b/src/lib/libcrypto/evp/p_lib.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: p_lib.c,v 1.33 2023/07/07 13:54:46 beck Exp $ */ 1/* $OpenBSD: p_lib.c,v 1.34 2023/07/07 19:37:54 beck 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 *
@@ -93,7 +93,6 @@ EVP_PKEY_bits(const EVP_PKEY *pkey)
93 return pkey->ameth->pkey_bits(pkey); 93 return pkey->ameth->pkey_bits(pkey);
94 return 0; 94 return 0;
95} 95}
96LCRYPTO_ALIAS(EVP_PKEY_bits);
97 96
98int 97int
99EVP_PKEY_security_bits(const EVP_PKEY *pkey) 98EVP_PKEY_security_bits(const EVP_PKEY *pkey)
@@ -105,7 +104,6 @@ EVP_PKEY_security_bits(const EVP_PKEY *pkey)
105 104
106 return pkey->ameth->pkey_security_bits(pkey); 105 return pkey->ameth->pkey_security_bits(pkey);
107} 106}
108LCRYPTO_ALIAS(EVP_PKEY_security_bits);
109 107
110int 108int
111EVP_PKEY_size(const EVP_PKEY *pkey) 109EVP_PKEY_size(const EVP_PKEY *pkey)
@@ -114,7 +112,6 @@ EVP_PKEY_size(const EVP_PKEY *pkey)
114 return pkey->ameth->pkey_size(pkey); 112 return pkey->ameth->pkey_size(pkey);
115 return 0; 113 return 0;
116} 114}
117LCRYPTO_ALIAS(EVP_PKEY_size);
118 115
119int 116int
120EVP_PKEY_save_parameters(EVP_PKEY *pkey, int mode) 117EVP_PKEY_save_parameters(EVP_PKEY *pkey, int mode)
@@ -139,7 +136,6 @@ EVP_PKEY_save_parameters(EVP_PKEY *pkey, int mode)
139#endif 136#endif
140 return (0); 137 return (0);
141} 138}
142LCRYPTO_ALIAS(EVP_PKEY_save_parameters);
143 139
144int 140int
145EVP_PKEY_copy_parameters(EVP_PKEY *to, const EVP_PKEY *from) 141EVP_PKEY_copy_parameters(EVP_PKEY *to, const EVP_PKEY *from)
@@ -159,7 +155,6 @@ EVP_PKEY_copy_parameters(EVP_PKEY *to, const EVP_PKEY *from)
159err: 155err:
160 return 0; 156 return 0;
161} 157}
162LCRYPTO_ALIAS(EVP_PKEY_copy_parameters);
163 158
164int 159int
165EVP_PKEY_missing_parameters(const EVP_PKEY *pkey) 160EVP_PKEY_missing_parameters(const EVP_PKEY *pkey)
@@ -168,7 +163,6 @@ EVP_PKEY_missing_parameters(const EVP_PKEY *pkey)
168 return pkey->ameth->param_missing(pkey); 163 return pkey->ameth->param_missing(pkey);
169 return 0; 164 return 0;
170} 165}
171LCRYPTO_ALIAS(EVP_PKEY_missing_parameters);
172 166
173int 167int
174EVP_PKEY_cmp_parameters(const EVP_PKEY *a, const EVP_PKEY *b) 168EVP_PKEY_cmp_parameters(const EVP_PKEY *a, const EVP_PKEY *b)
@@ -179,7 +173,6 @@ EVP_PKEY_cmp_parameters(const EVP_PKEY *a, const EVP_PKEY *b)
179 return a->ameth->param_cmp(a, b); 173 return a->ameth->param_cmp(a, b);
180 return -2; 174 return -2;
181} 175}
182LCRYPTO_ALIAS(EVP_PKEY_cmp_parameters);
183 176
184int 177int
185EVP_PKEY_cmp(const EVP_PKEY *a, const EVP_PKEY *b) 178EVP_PKEY_cmp(const EVP_PKEY *a, const EVP_PKEY *b)
@@ -202,7 +195,6 @@ EVP_PKEY_cmp(const EVP_PKEY *a, const EVP_PKEY *b)
202 195
203 return -2; 196 return -2;
204} 197}
205LCRYPTO_ALIAS(EVP_PKEY_cmp);
206 198
207EVP_PKEY * 199EVP_PKEY *
208EVP_PKEY_new(void) 200EVP_PKEY_new(void)
@@ -224,7 +216,6 @@ EVP_PKEY_new(void)
224 ret->save_parameters = 1; 216 ret->save_parameters = 1;
225 return (ret); 217 return (ret);
226} 218}
227LCRYPTO_ALIAS(EVP_PKEY_new);
228 219
229int 220int
230EVP_PKEY_up_ref(EVP_PKEY *pkey) 221EVP_PKEY_up_ref(EVP_PKEY *pkey)
@@ -232,7 +223,6 @@ EVP_PKEY_up_ref(EVP_PKEY *pkey)
232 int refs = CRYPTO_add(&pkey->references, 1, CRYPTO_LOCK_EVP_PKEY); 223 int refs = CRYPTO_add(&pkey->references, 1, CRYPTO_LOCK_EVP_PKEY);
233 return ((refs > 1) ? 1 : 0); 224 return ((refs > 1) ? 1 : 0);
234} 225}
235LCRYPTO_ALIAS(EVP_PKEY_up_ref);
236 226
237/* Setup a public key ASN1 method and ENGINE from a NID or a string. 227/* Setup a public key ASN1 method and ENGINE from a NID or a string.
238 * If pkey is NULL just return 1 or 0 if the algorithm exists. 228 * If pkey is NULL just return 1 or 0 if the algorithm exists.
@@ -287,7 +277,6 @@ EVP_PKEY_set_type(EVP_PKEY *pkey, int type)
287{ 277{
288 return pkey_set_type(pkey, NULL, type, NULL, -1); 278 return pkey_set_type(pkey, NULL, type, NULL, -1);
289} 279}
290LCRYPTO_ALIAS(EVP_PKEY_set_type);
291 280
292EVP_PKEY * 281EVP_PKEY *
293EVP_PKEY_new_raw_private_key(int type, ENGINE *engine, 282EVP_PKEY_new_raw_private_key(int type, ENGINE *engine,
@@ -317,7 +306,6 @@ EVP_PKEY_new_raw_private_key(int type, ENGINE *engine,
317 306
318 return NULL; 307 return NULL;
319} 308}
320LCRYPTO_ALIAS(EVP_PKEY_new_raw_private_key);
321 309
322EVP_PKEY * 310EVP_PKEY *
323EVP_PKEY_new_raw_public_key(int type, ENGINE *engine, 311EVP_PKEY_new_raw_public_key(int type, ENGINE *engine,
@@ -347,7 +335,6 @@ EVP_PKEY_new_raw_public_key(int type, ENGINE *engine,
347 335
348 return NULL; 336 return NULL;
349} 337}
350LCRYPTO_ALIAS(EVP_PKEY_new_raw_public_key);
351 338
352int 339int
353EVP_PKEY_get_raw_private_key(const EVP_PKEY *pkey, 340EVP_PKEY_get_raw_private_key(const EVP_PKEY *pkey,
@@ -364,7 +351,6 @@ EVP_PKEY_get_raw_private_key(const EVP_PKEY *pkey,
364 351
365 return 1; 352 return 1;
366} 353}
367LCRYPTO_ALIAS(EVP_PKEY_get_raw_private_key);
368 354
369int 355int
370EVP_PKEY_get_raw_public_key(const EVP_PKEY *pkey, 356EVP_PKEY_get_raw_public_key(const EVP_PKEY *pkey,
@@ -381,7 +367,6 @@ EVP_PKEY_get_raw_public_key(const EVP_PKEY *pkey,
381 367
382 return 1; 368 return 1;
383} 369}
384LCRYPTO_ALIAS(EVP_PKEY_get_raw_public_key);
385 370
386EVP_PKEY * 371EVP_PKEY *
387EVP_PKEY_new_CMAC_key(ENGINE *e, const unsigned char *priv, size_t len, 372EVP_PKEY_new_CMAC_key(ENGINE *e, const unsigned char *priv, size_t len,
@@ -412,14 +397,12 @@ EVP_PKEY_new_CMAC_key(ENGINE *e, const unsigned char *priv, size_t len,
412 CMAC_CTX_free(cmctx); 397 CMAC_CTX_free(cmctx);
413 return NULL; 398 return NULL;
414} 399}
415LCRYPTO_ALIAS(EVP_PKEY_new_CMAC_key);
416 400
417int 401int
418EVP_PKEY_set_type_str(EVP_PKEY *pkey, const char *str, int len) 402EVP_PKEY_set_type_str(EVP_PKEY *pkey, const char *str, int len)
419{ 403{
420 return pkey_set_type(pkey, NULL, EVP_PKEY_NONE, str, len); 404 return pkey_set_type(pkey, NULL, EVP_PKEY_NONE, str, len);
421} 405}
422LCRYPTO_ALIAS(EVP_PKEY_set_type_str);
423 406
424int 407int
425EVP_PKEY_assign(EVP_PKEY *pkey, int type, void *key) 408EVP_PKEY_assign(EVP_PKEY *pkey, int type, void *key)
@@ -429,14 +412,12 @@ EVP_PKEY_assign(EVP_PKEY *pkey, int type, void *key)
429 pkey->pkey.ptr = key; 412 pkey->pkey.ptr = key;
430 return (key != NULL); 413 return (key != NULL);
431} 414}
432LCRYPTO_ALIAS(EVP_PKEY_assign);
433 415
434void * 416void *
435EVP_PKEY_get0(const EVP_PKEY *pkey) 417EVP_PKEY_get0(const EVP_PKEY *pkey)
436{ 418{
437 return pkey->pkey.ptr; 419 return pkey->pkey.ptr;
438} 420}
439LCRYPTO_ALIAS(EVP_PKEY_get0);
440 421
441const unsigned char * 422const unsigned char *
442EVP_PKEY_get0_hmac(const EVP_PKEY *pkey, size_t *len) 423EVP_PKEY_get0_hmac(const EVP_PKEY *pkey, size_t *len)
@@ -453,7 +434,6 @@ EVP_PKEY_get0_hmac(const EVP_PKEY *pkey, size_t *len)
453 434
454 return os->data; 435 return os->data;
455} 436}
456LCRYPTO_ALIAS(EVP_PKEY_get0_hmac);
457 437
458#ifndef OPENSSL_NO_RSA 438#ifndef OPENSSL_NO_RSA
459RSA * 439RSA *
@@ -465,7 +445,6 @@ EVP_PKEY_get0_RSA(EVP_PKEY *pkey)
465 } 445 }
466 return pkey->pkey.rsa; 446 return pkey->pkey.rsa;
467} 447}
468LCRYPTO_ALIAS(EVP_PKEY_get0_RSA);
469 448
470RSA * 449RSA *
471EVP_PKEY_get1_RSA(EVP_PKEY *pkey) 450EVP_PKEY_get1_RSA(EVP_PKEY *pkey)
@@ -477,7 +456,6 @@ EVP_PKEY_get1_RSA(EVP_PKEY *pkey)
477 RSA_up_ref(pkey->pkey.rsa); 456 RSA_up_ref(pkey->pkey.rsa);
478 return pkey->pkey.rsa; 457 return pkey->pkey.rsa;
479} 458}
480LCRYPTO_ALIAS(EVP_PKEY_get1_RSA);
481 459
482int 460int
483EVP_PKEY_set1_RSA(EVP_PKEY *pkey, RSA *key) 461EVP_PKEY_set1_RSA(EVP_PKEY *pkey, RSA *key)
@@ -487,7 +465,6 @@ EVP_PKEY_set1_RSA(EVP_PKEY *pkey, RSA *key)
487 RSA_up_ref(key); 465 RSA_up_ref(key);
488 return ret; 466 return ret;
489} 467}
490LCRYPTO_ALIAS(EVP_PKEY_set1_RSA);
491#endif 468#endif
492 469
493#ifndef OPENSSL_NO_DSA 470#ifndef OPENSSL_NO_DSA
@@ -500,7 +477,6 @@ EVP_PKEY_get0_DSA(EVP_PKEY *pkey)
500 } 477 }
501 return pkey->pkey.dsa; 478 return pkey->pkey.dsa;
502} 479}
503LCRYPTO_ALIAS(EVP_PKEY_get0_DSA);
504 480
505DSA * 481DSA *
506EVP_PKEY_get1_DSA(EVP_PKEY *pkey) 482EVP_PKEY_get1_DSA(EVP_PKEY *pkey)
@@ -512,7 +488,6 @@ EVP_PKEY_get1_DSA(EVP_PKEY *pkey)
512 DSA_up_ref(pkey->pkey.dsa); 488 DSA_up_ref(pkey->pkey.dsa);
513 return pkey->pkey.dsa; 489 return pkey->pkey.dsa;
514} 490}
515LCRYPTO_ALIAS(EVP_PKEY_get1_DSA);
516 491
517int 492int
518EVP_PKEY_set1_DSA(EVP_PKEY *pkey, DSA *key) 493EVP_PKEY_set1_DSA(EVP_PKEY *pkey, DSA *key)
@@ -522,7 +497,6 @@ EVP_PKEY_set1_DSA(EVP_PKEY *pkey, DSA *key)
522 DSA_up_ref(key); 497 DSA_up_ref(key);
523 return ret; 498 return ret;
524} 499}
525LCRYPTO_ALIAS(EVP_PKEY_set1_DSA);
526#endif 500#endif
527 501
528#ifndef OPENSSL_NO_EC 502#ifndef OPENSSL_NO_EC
@@ -535,7 +509,6 @@ EVP_PKEY_get0_EC_KEY(EVP_PKEY *pkey)
535 } 509 }
536 return pkey->pkey.ec; 510 return pkey->pkey.ec;
537} 511}
538LCRYPTO_ALIAS(EVP_PKEY_get0_EC_KEY);
539 512
540EC_KEY * 513EC_KEY *
541EVP_PKEY_get1_EC_KEY(EVP_PKEY *pkey) 514EVP_PKEY_get1_EC_KEY(EVP_PKEY *pkey)
@@ -547,7 +520,6 @@ EVP_PKEY_get1_EC_KEY(EVP_PKEY *pkey)
547 EC_KEY_up_ref(pkey->pkey.ec); 520 EC_KEY_up_ref(pkey->pkey.ec);
548 return pkey->pkey.ec; 521 return pkey->pkey.ec;
549} 522}
550LCRYPTO_ALIAS(EVP_PKEY_get1_EC_KEY);
551 523
552int 524int
553EVP_PKEY_set1_EC_KEY(EVP_PKEY *pkey, EC_KEY *key) 525EVP_PKEY_set1_EC_KEY(EVP_PKEY *pkey, EC_KEY *key)
@@ -557,7 +529,6 @@ EVP_PKEY_set1_EC_KEY(EVP_PKEY *pkey, EC_KEY *key)
557 EC_KEY_up_ref(key); 529 EC_KEY_up_ref(key);
558 return ret; 530 return ret;
559} 531}
560LCRYPTO_ALIAS(EVP_PKEY_set1_EC_KEY);
561#endif 532#endif
562 533
563 534
@@ -571,7 +542,6 @@ EVP_PKEY_get0_DH(EVP_PKEY *pkey)
571 } 542 }
572 return pkey->pkey.dh; 543 return pkey->pkey.dh;
573} 544}
574LCRYPTO_ALIAS(EVP_PKEY_get0_DH);
575 545
576DH * 546DH *
577EVP_PKEY_get1_DH(EVP_PKEY *pkey) 547EVP_PKEY_get1_DH(EVP_PKEY *pkey)
@@ -583,7 +553,6 @@ EVP_PKEY_get1_DH(EVP_PKEY *pkey)
583 DH_up_ref(pkey->pkey.dh); 553 DH_up_ref(pkey->pkey.dh);
584 return pkey->pkey.dh; 554 return pkey->pkey.dh;
585} 555}
586LCRYPTO_ALIAS(EVP_PKEY_get1_DH);
587 556
588int 557int
589EVP_PKEY_set1_DH(EVP_PKEY *pkey, DH *key) 558EVP_PKEY_set1_DH(EVP_PKEY *pkey, DH *key)
@@ -593,7 +562,6 @@ EVP_PKEY_set1_DH(EVP_PKEY *pkey, DH *key)
593 DH_up_ref(key); 562 DH_up_ref(key);
594 return ret; 563 return ret;
595} 564}
596LCRYPTO_ALIAS(EVP_PKEY_set1_DH);
597#endif 565#endif
598 566
599int 567int
@@ -612,21 +580,18 @@ EVP_PKEY_type(int type)
612#endif 580#endif
613 return ret; 581 return ret;
614} 582}
615LCRYPTO_ALIAS(EVP_PKEY_type);
616 583
617int 584int
618EVP_PKEY_id(const EVP_PKEY *pkey) 585EVP_PKEY_id(const EVP_PKEY *pkey)
619{ 586{
620 return pkey->type; 587 return pkey->type;
621} 588}
622LCRYPTO_ALIAS(EVP_PKEY_id);
623 589
624int 590int
625EVP_PKEY_base_id(const EVP_PKEY *pkey) 591EVP_PKEY_base_id(const EVP_PKEY *pkey)
626{ 592{
627 return EVP_PKEY_type(pkey->type); 593 return EVP_PKEY_type(pkey->type);
628} 594}
629LCRYPTO_ALIAS(EVP_PKEY_base_id);
630 595
631void 596void
632EVP_PKEY_free(EVP_PKEY *x) 597EVP_PKEY_free(EVP_PKEY *x)
@@ -645,7 +610,6 @@ EVP_PKEY_free(EVP_PKEY *x)
645 sk_X509_ATTRIBUTE_pop_free(x->attributes, X509_ATTRIBUTE_free); 610 sk_X509_ATTRIBUTE_pop_free(x->attributes, X509_ATTRIBUTE_free);
646 free(x); 611 free(x);
647} 612}
648LCRYPTO_ALIAS(EVP_PKEY_free);
649 613
650static void 614static void
651EVP_PKEY_free_it(EVP_PKEY *x) 615EVP_PKEY_free_it(EVP_PKEY *x)
@@ -679,7 +643,6 @@ EVP_PKEY_print_public(BIO *out, const EVP_PKEY *pkey, int indent,
679 643
680 return unsup_alg(out, pkey, indent, "Public Key"); 644 return unsup_alg(out, pkey, indent, "Public Key");
681} 645}
682LCRYPTO_ALIAS(EVP_PKEY_print_public);
683 646
684int 647int
685EVP_PKEY_print_private(BIO *out, const EVP_PKEY *pkey, int indent, 648EVP_PKEY_print_private(BIO *out, const EVP_PKEY *pkey, int indent,
@@ -690,7 +653,6 @@ EVP_PKEY_print_private(BIO *out, const EVP_PKEY *pkey, int indent,
690 653
691 return unsup_alg(out, pkey, indent, "Private Key"); 654 return unsup_alg(out, pkey, indent, "Private Key");
692} 655}
693LCRYPTO_ALIAS(EVP_PKEY_print_private);
694 656
695int 657int
696EVP_PKEY_print_params(BIO *out, const EVP_PKEY *pkey, int indent, 658EVP_PKEY_print_params(BIO *out, const EVP_PKEY *pkey, int indent,
@@ -700,7 +662,6 @@ EVP_PKEY_print_params(BIO *out, const EVP_PKEY *pkey, int indent,
700 return pkey->ameth->param_print(out, pkey, indent, pctx); 662 return pkey->ameth->param_print(out, pkey, indent, pctx);
701 return unsup_alg(out, pkey, indent, "Parameters"); 663 return unsup_alg(out, pkey, indent, "Parameters");
702} 664}
703LCRYPTO_ALIAS(EVP_PKEY_print_params);
704 665
705int 666int
706EVP_PKEY_get_default_digest_nid(EVP_PKEY *pkey, int *pnid) 667EVP_PKEY_get_default_digest_nid(EVP_PKEY *pkey, int *pnid)
@@ -710,4 +671,3 @@ EVP_PKEY_get_default_digest_nid(EVP_PKEY *pkey, int *pnid)
710 return pkey->ameth->pkey_ctrl(pkey, ASN1_PKEY_CTRL_DEFAULT_MD_NID, 671 return pkey->ameth->pkey_ctrl(pkey, ASN1_PKEY_CTRL_DEFAULT_MD_NID,
711 0, pnid); 672 0, pnid);
712} 673}
713LCRYPTO_ALIAS(EVP_PKEY_get_default_digest_nid);
diff --git a/src/lib/libcrypto/evp/p_open.c b/src/lib/libcrypto/evp/p_open.c
index 5ab36b8ef5..d18548e3f2 100644
--- a/src/lib/libcrypto/evp/p_open.c
+++ b/src/lib/libcrypto/evp/p_open.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: p_open.c,v 1.22 2023/07/07 13:54:46 beck Exp $ */ 1/* $OpenBSD: p_open.c,v 1.23 2023/07/07 19:37:54 beck 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 *
@@ -114,7 +114,6 @@ err:
114 freezero(key, size); 114 freezero(key, size);
115 return (ret); 115 return (ret);
116} 116}
117LCRYPTO_ALIAS(EVP_OpenInit);
118 117
119int 118int
120EVP_OpenFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl) 119EVP_OpenFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl)
@@ -126,5 +125,4 @@ EVP_OpenFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl)
126 i = EVP_DecryptInit_ex(ctx, NULL, NULL, NULL, NULL); 125 i = EVP_DecryptInit_ex(ctx, NULL, NULL, NULL, NULL);
127 return (i); 126 return (i);
128} 127}
129LCRYPTO_ALIAS(EVP_OpenFinal);
130#endif 128#endif
diff --git a/src/lib/libcrypto/evp/p_seal.c b/src/lib/libcrypto/evp/p_seal.c
index 52521e133b..b98da94360 100644
--- a/src/lib/libcrypto/evp/p_seal.c
+++ b/src/lib/libcrypto/evp/p_seal.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: p_seal.c,v 1.15 2023/07/07 13:54:46 beck Exp $ */ 1/* $OpenBSD: p_seal.c,v 1.16 2023/07/07 19:37:54 beck 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 *
@@ -99,7 +99,6 @@ EVP_SealInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type, unsigned char **ek,
99 } 99 }
100 return (npubk); 100 return (npubk);
101} 101}
102LCRYPTO_ALIAS(EVP_SealInit);
103 102
104/* MACRO 103/* MACRO
105void EVP_SealUpdate(ctx,out,outl,in,inl) 104void EVP_SealUpdate(ctx,out,outl,in,inl)
@@ -123,4 +122,3 @@ EVP_SealFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl)
123 i = EVP_EncryptInit_ex(ctx, NULL, NULL, NULL, NULL); 122 i = EVP_EncryptInit_ex(ctx, NULL, NULL, NULL, NULL);
124 return i; 123 return i;
125} 124}
126LCRYPTO_ALIAS(EVP_SealFinal);
diff --git a/src/lib/libcrypto/evp/p_sign.c b/src/lib/libcrypto/evp/p_sign.c
index 13655b076f..f7c21178a0 100644
--- a/src/lib/libcrypto/evp/p_sign.c
+++ b/src/lib/libcrypto/evp/p_sign.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: p_sign.c,v 1.18 2023/07/07 13:54:46 beck Exp $ */ 1/* $OpenBSD: p_sign.c,v 1.19 2023/07/07 19:37:54 beck 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 *
@@ -102,4 +102,3 @@ EVP_SignFinal(EVP_MD_CTX *ctx, unsigned char *sigret, unsigned int *siglen,
102 EVP_PKEY_CTX_free(pkctx); 102 EVP_PKEY_CTX_free(pkctx);
103 return ret; 103 return ret;
104} 104}
105LCRYPTO_ALIAS(EVP_SignFinal);
diff --git a/src/lib/libcrypto/evp/p_verify.c b/src/lib/libcrypto/evp/p_verify.c
index 601b44e5e0..da7ab5425a 100644
--- a/src/lib/libcrypto/evp/p_verify.c
+++ b/src/lib/libcrypto/evp/p_verify.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: p_verify.c,v 1.17 2023/07/07 13:54:46 beck Exp $ */ 1/* $OpenBSD: p_verify.c,v 1.18 2023/07/07 19:37:54 beck 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 *
@@ -95,4 +95,3 @@ EVP_VerifyFinal(EVP_MD_CTX *ctx, const unsigned char *sigbuf,
95 EVP_PKEY_CTX_free(pkctx); 95 EVP_PKEY_CTX_free(pkctx);
96 return ret; 96 return ret;
97} 97}
98LCRYPTO_ALIAS(EVP_VerifyFinal);
diff --git a/src/lib/libcrypto/evp/pmeth_fn.c b/src/lib/libcrypto/evp/pmeth_fn.c
index 3025005034..a304752e63 100644
--- a/src/lib/libcrypto/evp/pmeth_fn.c
+++ b/src/lib/libcrypto/evp/pmeth_fn.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: pmeth_fn.c,v 1.8 2023/07/07 13:54:46 beck Exp $ */ 1/* $OpenBSD: pmeth_fn.c,v 1.9 2023/07/07 19:37:54 beck Exp $ */
2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL 2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3 * project 2006. 3 * project 2006.
4 */ 4 */
@@ -98,7 +98,6 @@ EVP_PKEY_sign_init(EVP_PKEY_CTX *ctx)
98 ctx->operation = EVP_PKEY_OP_UNDEFINED; 98 ctx->operation = EVP_PKEY_OP_UNDEFINED;
99 return ret; 99 return ret;
100} 100}
101LCRYPTO_ALIAS(EVP_PKEY_sign_init);
102 101
103int 102int
104EVP_PKEY_sign(EVP_PKEY_CTX *ctx, unsigned char *sig, size_t *siglen, 103EVP_PKEY_sign(EVP_PKEY_CTX *ctx, unsigned char *sig, size_t *siglen,
@@ -115,7 +114,6 @@ EVP_PKEY_sign(EVP_PKEY_CTX *ctx, unsigned char *sig, size_t *siglen,
115 M_check_autoarg(ctx, sig, siglen, EVP_F_EVP_PKEY_SIGN) 114 M_check_autoarg(ctx, sig, siglen, EVP_F_EVP_PKEY_SIGN)
116 return ctx->pmeth->sign(ctx, sig, siglen, tbs, tbslen); 115 return ctx->pmeth->sign(ctx, sig, siglen, tbs, tbslen);
117} 116}
118LCRYPTO_ALIAS(EVP_PKEY_sign);
119 117
120int 118int
121EVP_PKEY_verify_init(EVP_PKEY_CTX *ctx) 119EVP_PKEY_verify_init(EVP_PKEY_CTX *ctx)
@@ -134,7 +132,6 @@ EVP_PKEY_verify_init(EVP_PKEY_CTX *ctx)
134 ctx->operation = EVP_PKEY_OP_UNDEFINED; 132 ctx->operation = EVP_PKEY_OP_UNDEFINED;
135 return ret; 133 return ret;
136} 134}
137LCRYPTO_ALIAS(EVP_PKEY_verify_init);
138 135
139int 136int
140EVP_PKEY_verify(EVP_PKEY_CTX *ctx, const unsigned char *sig, size_t siglen, 137EVP_PKEY_verify(EVP_PKEY_CTX *ctx, const unsigned char *sig, size_t siglen,
@@ -150,7 +147,6 @@ EVP_PKEY_verify(EVP_PKEY_CTX *ctx, const unsigned char *sig, size_t siglen,
150 } 147 }
151 return ctx->pmeth->verify(ctx, sig, siglen, tbs, tbslen); 148 return ctx->pmeth->verify(ctx, sig, siglen, tbs, tbslen);
152} 149}
153LCRYPTO_ALIAS(EVP_PKEY_verify);
154 150
155int 151int
156EVP_PKEY_verify_recover_init(EVP_PKEY_CTX *ctx) 152EVP_PKEY_verify_recover_init(EVP_PKEY_CTX *ctx)
@@ -169,7 +165,6 @@ EVP_PKEY_verify_recover_init(EVP_PKEY_CTX *ctx)
169 ctx->operation = EVP_PKEY_OP_UNDEFINED; 165 ctx->operation = EVP_PKEY_OP_UNDEFINED;
170 return ret; 166 return ret;
171} 167}
172LCRYPTO_ALIAS(EVP_PKEY_verify_recover_init);
173 168
174int 169int
175EVP_PKEY_verify_recover(EVP_PKEY_CTX *ctx, unsigned char *rout, size_t *routlen, 170EVP_PKEY_verify_recover(EVP_PKEY_CTX *ctx, unsigned char *rout, size_t *routlen,
@@ -186,7 +181,6 @@ EVP_PKEY_verify_recover(EVP_PKEY_CTX *ctx, unsigned char *rout, size_t *routlen,
186 M_check_autoarg(ctx, rout, routlen, EVP_F_EVP_PKEY_VERIFY_RECOVER) 181 M_check_autoarg(ctx, rout, routlen, EVP_F_EVP_PKEY_VERIFY_RECOVER)
187 return ctx->pmeth->verify_recover(ctx, rout, routlen, sig, siglen); 182 return ctx->pmeth->verify_recover(ctx, rout, routlen, sig, siglen);
188} 183}
189LCRYPTO_ALIAS(EVP_PKEY_verify_recover);
190 184
191int 185int
192EVP_PKEY_encrypt_init(EVP_PKEY_CTX *ctx) 186EVP_PKEY_encrypt_init(EVP_PKEY_CTX *ctx)
@@ -205,7 +199,6 @@ EVP_PKEY_encrypt_init(EVP_PKEY_CTX *ctx)
205 ctx->operation = EVP_PKEY_OP_UNDEFINED; 199 ctx->operation = EVP_PKEY_OP_UNDEFINED;
206 return ret; 200 return ret;
207} 201}
208LCRYPTO_ALIAS(EVP_PKEY_encrypt_init);
209 202
210int 203int
211EVP_PKEY_encrypt(EVP_PKEY_CTX *ctx, unsigned char *out, size_t *outlen, 204EVP_PKEY_encrypt(EVP_PKEY_CTX *ctx, unsigned char *out, size_t *outlen,
@@ -222,7 +215,6 @@ EVP_PKEY_encrypt(EVP_PKEY_CTX *ctx, unsigned char *out, size_t *outlen,
222 M_check_autoarg(ctx, out, outlen, EVP_F_EVP_PKEY_ENCRYPT) 215 M_check_autoarg(ctx, out, outlen, EVP_F_EVP_PKEY_ENCRYPT)
223 return ctx->pmeth->encrypt(ctx, out, outlen, in, inlen); 216 return ctx->pmeth->encrypt(ctx, out, outlen, in, inlen);
224} 217}
225LCRYPTO_ALIAS(EVP_PKEY_encrypt);
226 218
227int 219int
228EVP_PKEY_decrypt_init(EVP_PKEY_CTX *ctx) 220EVP_PKEY_decrypt_init(EVP_PKEY_CTX *ctx)
@@ -241,7 +233,6 @@ EVP_PKEY_decrypt_init(EVP_PKEY_CTX *ctx)
241 ctx->operation = EVP_PKEY_OP_UNDEFINED; 233 ctx->operation = EVP_PKEY_OP_UNDEFINED;
242 return ret; 234 return ret;
243} 235}
244LCRYPTO_ALIAS(EVP_PKEY_decrypt_init);
245 236
246int 237int
247EVP_PKEY_decrypt(EVP_PKEY_CTX *ctx, unsigned char *out, size_t *outlen, 238EVP_PKEY_decrypt(EVP_PKEY_CTX *ctx, unsigned char *out, size_t *outlen,
@@ -258,7 +249,6 @@ EVP_PKEY_decrypt(EVP_PKEY_CTX *ctx, unsigned char *out, size_t *outlen,
258 M_check_autoarg(ctx, out, outlen, EVP_F_EVP_PKEY_DECRYPT) 249 M_check_autoarg(ctx, out, outlen, EVP_F_EVP_PKEY_DECRYPT)
259 return ctx->pmeth->decrypt(ctx, out, outlen, in, inlen); 250 return ctx->pmeth->decrypt(ctx, out, outlen, in, inlen);
260} 251}
261LCRYPTO_ALIAS(EVP_PKEY_decrypt);
262 252
263int 253int
264EVP_PKEY_derive_init(EVP_PKEY_CTX *ctx) 254EVP_PKEY_derive_init(EVP_PKEY_CTX *ctx)
@@ -277,7 +267,6 @@ EVP_PKEY_derive_init(EVP_PKEY_CTX *ctx)
277 ctx->operation = EVP_PKEY_OP_UNDEFINED; 267 ctx->operation = EVP_PKEY_OP_UNDEFINED;
278 return ret; 268 return ret;
279} 269}
280LCRYPTO_ALIAS(EVP_PKEY_derive_init);
281 270
282int 271int
283EVP_PKEY_derive_set_peer(EVP_PKEY_CTX *ctx, EVP_PKEY *peer) 272EVP_PKEY_derive_set_peer(EVP_PKEY_CTX *ctx, EVP_PKEY *peer)
@@ -339,7 +328,6 @@ EVP_PKEY_derive_set_peer(EVP_PKEY_CTX *ctx, EVP_PKEY *peer)
339 CRYPTO_add(&peer->references, 1, CRYPTO_LOCK_EVP_PKEY); 328 CRYPTO_add(&peer->references, 1, CRYPTO_LOCK_EVP_PKEY);
340 return 1; 329 return 1;
341} 330}
342LCRYPTO_ALIAS(EVP_PKEY_derive_set_peer);
343 331
344int 332int
345EVP_PKEY_derive(EVP_PKEY_CTX *ctx, unsigned char *key, size_t *pkeylen) 333EVP_PKEY_derive(EVP_PKEY_CTX *ctx, unsigned char *key, size_t *pkeylen)
@@ -355,4 +343,3 @@ EVP_PKEY_derive(EVP_PKEY_CTX *ctx, unsigned char *key, size_t *pkeylen)
355 M_check_autoarg(ctx, key, pkeylen, EVP_F_EVP_PKEY_DERIVE) 343 M_check_autoarg(ctx, key, pkeylen, EVP_F_EVP_PKEY_DERIVE)
356 return ctx->pmeth->derive(ctx, key, pkeylen); 344 return ctx->pmeth->derive(ctx, key, pkeylen);
357} 345}
358LCRYPTO_ALIAS(EVP_PKEY_derive);
diff --git a/src/lib/libcrypto/evp/pmeth_gn.c b/src/lib/libcrypto/evp/pmeth_gn.c
index 2b835cd8fe..b4c0395d97 100644
--- a/src/lib/libcrypto/evp/pmeth_gn.c
+++ b/src/lib/libcrypto/evp/pmeth_gn.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: pmeth_gn.c,v 1.12 2023/07/07 13:54:46 beck Exp $ */ 1/* $OpenBSD: pmeth_gn.c,v 1.13 2023/07/07 19:37:54 beck Exp $ */
2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL 2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3 * project 2006. 3 * project 2006.
4 */ 4 */
@@ -85,7 +85,6 @@ EVP_PKEY_paramgen_init(EVP_PKEY_CTX *ctx)
85 ctx->operation = EVP_PKEY_OP_UNDEFINED; 85 ctx->operation = EVP_PKEY_OP_UNDEFINED;
86 return ret; 86 return ret;
87} 87}
88LCRYPTO_ALIAS(EVP_PKEY_paramgen_init);
89 88
90int 89int
91EVP_PKEY_paramgen(EVP_PKEY_CTX *ctx, EVP_PKEY **ppkey) 90EVP_PKEY_paramgen(EVP_PKEY_CTX *ctx, EVP_PKEY **ppkey)
@@ -115,7 +114,6 @@ EVP_PKEY_paramgen(EVP_PKEY_CTX *ctx, EVP_PKEY **ppkey)
115 } 114 }
116 return ret; 115 return ret;
117} 116}
118LCRYPTO_ALIAS(EVP_PKEY_paramgen);
119 117
120int 118int
121EVP_PKEY_keygen_init(EVP_PKEY_CTX *ctx) 119EVP_PKEY_keygen_init(EVP_PKEY_CTX *ctx)
@@ -134,7 +132,6 @@ EVP_PKEY_keygen_init(EVP_PKEY_CTX *ctx)
134 ctx->operation = EVP_PKEY_OP_UNDEFINED; 132 ctx->operation = EVP_PKEY_OP_UNDEFINED;
135 return ret; 133 return ret;
136} 134}
137LCRYPTO_ALIAS(EVP_PKEY_keygen_init);
138 135
139int 136int
140EVP_PKEY_keygen(EVP_PKEY_CTX *ctx, EVP_PKEY **ppkey) 137EVP_PKEY_keygen(EVP_PKEY_CTX *ctx, EVP_PKEY **ppkey)
@@ -163,21 +160,18 @@ EVP_PKEY_keygen(EVP_PKEY_CTX *ctx, EVP_PKEY **ppkey)
163 } 160 }
164 return ret; 161 return ret;
165} 162}
166LCRYPTO_ALIAS(EVP_PKEY_keygen);
167 163
168void 164void
169EVP_PKEY_CTX_set_cb(EVP_PKEY_CTX *ctx, EVP_PKEY_gen_cb *cb) 165EVP_PKEY_CTX_set_cb(EVP_PKEY_CTX *ctx, EVP_PKEY_gen_cb *cb)
170{ 166{
171 ctx->pkey_gencb = cb; 167 ctx->pkey_gencb = cb;
172} 168}
173LCRYPTO_ALIAS(EVP_PKEY_CTX_set_cb);
174 169
175EVP_PKEY_gen_cb * 170EVP_PKEY_gen_cb *
176EVP_PKEY_CTX_get_cb(EVP_PKEY_CTX *ctx) 171EVP_PKEY_CTX_get_cb(EVP_PKEY_CTX *ctx)
177{ 172{
178 return ctx->pkey_gencb; 173 return ctx->pkey_gencb;
179} 174}
180LCRYPTO_ALIAS(EVP_PKEY_CTX_get_cb);
181 175
182/* "translation callback" to call EVP_PKEY_CTX callbacks using BN_GENCB 176/* "translation callback" to call EVP_PKEY_CTX callbacks using BN_GENCB
183 * style callbacks. 177 * style callbacks.
@@ -207,7 +201,6 @@ EVP_PKEY_CTX_get_keygen_info(EVP_PKEY_CTX *ctx, int idx)
207 return 0; 201 return 0;
208 return ctx->keygen_info[idx]; 202 return ctx->keygen_info[idx];
209} 203}
210LCRYPTO_ALIAS(EVP_PKEY_CTX_get_keygen_info);
211 204
212EVP_PKEY * 205EVP_PKEY *
213EVP_PKEY_new_mac_key(int type, ENGINE *e, const unsigned char *key, int keylen) 206EVP_PKEY_new_mac_key(int type, ENGINE *e, const unsigned char *key, int keylen)
@@ -230,7 +223,6 @@ merr:
230 EVP_PKEY_CTX_free(mac_ctx); 223 EVP_PKEY_CTX_free(mac_ctx);
231 return mac_key; 224 return mac_key;
232} 225}
233LCRYPTO_ALIAS(EVP_PKEY_new_mac_key);
234 226
235int 227int
236EVP_PKEY_check(EVP_PKEY_CTX *ctx) 228EVP_PKEY_check(EVP_PKEY_CTX *ctx)
@@ -252,7 +244,6 @@ EVP_PKEY_check(EVP_PKEY_CTX *ctx)
252 244
253 return pkey->ameth->pkey_check(pkey); 245 return pkey->ameth->pkey_check(pkey);
254} 246}
255LCRYPTO_ALIAS(EVP_PKEY_check);
256 247
257int 248int
258EVP_PKEY_public_check(EVP_PKEY_CTX *ctx) 249EVP_PKEY_public_check(EVP_PKEY_CTX *ctx)
@@ -274,7 +265,6 @@ EVP_PKEY_public_check(EVP_PKEY_CTX *ctx)
274 265
275 return pkey->ameth->pkey_public_check(pkey); 266 return pkey->ameth->pkey_public_check(pkey);
276} 267}
277LCRYPTO_ALIAS(EVP_PKEY_public_check);
278 268
279int 269int
280EVP_PKEY_param_check(EVP_PKEY_CTX *ctx) 270EVP_PKEY_param_check(EVP_PKEY_CTX *ctx)
@@ -296,4 +286,3 @@ EVP_PKEY_param_check(EVP_PKEY_CTX *ctx)
296 286
297 return pkey->ameth->pkey_param_check(pkey); 287 return pkey->ameth->pkey_param_check(pkey);
298} 288}
299LCRYPTO_ALIAS(EVP_PKEY_param_check);
diff --git a/src/lib/libcrypto/evp/pmeth_lib.c b/src/lib/libcrypto/evp/pmeth_lib.c
index cad38d4fe9..b480a574fe 100644
--- a/src/lib/libcrypto/evp/pmeth_lib.c
+++ b/src/lib/libcrypto/evp/pmeth_lib.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: pmeth_lib.c,v 1.32 2023/07/07 13:54:46 beck Exp $ */ 1/* $OpenBSD: pmeth_lib.c,v 1.33 2023/07/07 19:37:54 beck Exp $ */
2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL 2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3 * project 2006. 3 * project 2006.
4 */ 4 */
@@ -149,7 +149,6 @@ EVP_PKEY_meth_find(int type)
149 149
150 return NULL; 150 return NULL;
151} 151}
152LCRYPTO_ALIAS(EVP_PKEY_meth_find);
153 152
154static EVP_PKEY_CTX * 153static EVP_PKEY_CTX *
155evp_pkey_ctx_new(EVP_PKEY *pkey, ENGINE *engine, int id) 154evp_pkey_ctx_new(EVP_PKEY *pkey, ENGINE *engine, int id)
@@ -226,7 +225,6 @@ EVP_PKEY_meth_new(int id, int flags)
226 225
227 return pmeth; 226 return pmeth;
228} 227}
229LCRYPTO_ALIAS(EVP_PKEY_meth_new);
230 228
231void 229void
232EVP_PKEY_meth_get0_info(int *ppkey_id, int *pflags, const EVP_PKEY_METHOD *meth) 230EVP_PKEY_meth_get0_info(int *ppkey_id, int *pflags, const EVP_PKEY_METHOD *meth)
@@ -236,7 +234,6 @@ EVP_PKEY_meth_get0_info(int *ppkey_id, int *pflags, const EVP_PKEY_METHOD *meth)
236 if (pflags) 234 if (pflags)
237 *pflags = meth->flags; 235 *pflags = meth->flags;
238} 236}
239LCRYPTO_ALIAS(EVP_PKEY_meth_get0_info);
240 237
241void 238void
242EVP_PKEY_meth_copy(EVP_PKEY_METHOD *dst, const EVP_PKEY_METHOD *src) 239EVP_PKEY_meth_copy(EVP_PKEY_METHOD *dst, const EVP_PKEY_METHOD *src)
@@ -251,7 +248,6 @@ EVP_PKEY_meth_copy(EVP_PKEY_METHOD *dst, const EVP_PKEY_METHOD *src)
251 dst->pkey_id = preserve.pkey_id; 248 dst->pkey_id = preserve.pkey_id;
252 dst->flags = preserve.flags; 249 dst->flags = preserve.flags;
253} 250}
254LCRYPTO_ALIAS(EVP_PKEY_meth_copy);
255 251
256void 252void
257EVP_PKEY_meth_free(EVP_PKEY_METHOD *pmeth) 253EVP_PKEY_meth_free(EVP_PKEY_METHOD *pmeth)
@@ -259,21 +255,18 @@ EVP_PKEY_meth_free(EVP_PKEY_METHOD *pmeth)
259 if (pmeth && (pmeth->flags & EVP_PKEY_FLAG_DYNAMIC)) 255 if (pmeth && (pmeth->flags & EVP_PKEY_FLAG_DYNAMIC))
260 free(pmeth); 256 free(pmeth);
261} 257}
262LCRYPTO_ALIAS(EVP_PKEY_meth_free);
263 258
264EVP_PKEY_CTX * 259EVP_PKEY_CTX *
265EVP_PKEY_CTX_new(EVP_PKEY *pkey, ENGINE *engine) 260EVP_PKEY_CTX_new(EVP_PKEY *pkey, ENGINE *engine)
266{ 261{
267 return evp_pkey_ctx_new(pkey, engine, -1); 262 return evp_pkey_ctx_new(pkey, engine, -1);
268} 263}
269LCRYPTO_ALIAS(EVP_PKEY_CTX_new);
270 264
271EVP_PKEY_CTX * 265EVP_PKEY_CTX *
272EVP_PKEY_CTX_new_id(int id, ENGINE *engine) 266EVP_PKEY_CTX_new_id(int id, ENGINE *engine)
273{ 267{
274 return evp_pkey_ctx_new(NULL, engine, id); 268 return evp_pkey_ctx_new(NULL, engine, id);
275} 269}
276LCRYPTO_ALIAS(EVP_PKEY_CTX_new_id);
277 270
278EVP_PKEY_CTX * 271EVP_PKEY_CTX *
279EVP_PKEY_CTX_dup(EVP_PKEY_CTX *pctx) 272EVP_PKEY_CTX_dup(EVP_PKEY_CTX *pctx)
@@ -315,7 +308,6 @@ EVP_PKEY_CTX_dup(EVP_PKEY_CTX *pctx)
315 EVP_PKEY_CTX_free(rctx); 308 EVP_PKEY_CTX_free(rctx);
316 return NULL; 309 return NULL;
317} 310}
318LCRYPTO_ALIAS(EVP_PKEY_CTX_dup);
319 311
320int 312int
321EVP_PKEY_meth_add0(const EVP_PKEY_METHOD *pmeth) 313EVP_PKEY_meth_add0(const EVP_PKEY_METHOD *pmeth)
@@ -331,7 +323,6 @@ EVP_PKEY_meth_add0(const EVP_PKEY_METHOD *pmeth)
331 323
332 return 1; 324 return 1;
333} 325}
334LCRYPTO_ALIAS(EVP_PKEY_meth_add0);
335 326
336void 327void
337EVP_PKEY_CTX_free(EVP_PKEY_CTX *ctx) 328EVP_PKEY_CTX_free(EVP_PKEY_CTX *ctx)
@@ -347,7 +338,6 @@ EVP_PKEY_CTX_free(EVP_PKEY_CTX *ctx)
347#endif 338#endif
348 free(ctx); 339 free(ctx);
349} 340}
350LCRYPTO_ALIAS(EVP_PKEY_CTX_free);
351 341
352int 342int
353EVP_PKEY_CTX_ctrl(EVP_PKEY_CTX *ctx, int keytype, int optype, int cmd, 343EVP_PKEY_CTX_ctrl(EVP_PKEY_CTX *ctx, int keytype, int optype, int cmd,
@@ -380,7 +370,6 @@ EVP_PKEY_CTX_ctrl(EVP_PKEY_CTX *ctx, int keytype, int optype, int cmd,
380 return ret; 370 return ret;
381 371
382} 372}
383LCRYPTO_ALIAS(EVP_PKEY_CTX_ctrl);
384 373
385int 374int
386EVP_PKEY_CTX_ctrl_str(EVP_PKEY_CTX *ctx, const char *name, const char *value) 375EVP_PKEY_CTX_ctrl_str(EVP_PKEY_CTX *ctx, const char *name, const char *value)
@@ -395,7 +384,6 @@ EVP_PKEY_CTX_ctrl_str(EVP_PKEY_CTX *ctx, const char *name, const char *value)
395 } 384 }
396 return ctx->pmeth->ctrl_str(ctx, name, value); 385 return ctx->pmeth->ctrl_str(ctx, name, value);
397} 386}
398LCRYPTO_ALIAS(EVP_PKEY_CTX_ctrl_str);
399 387
400int 388int
401EVP_PKEY_CTX_str2ctrl(EVP_PKEY_CTX *ctx, int cmd, const char *str) 389EVP_PKEY_CTX_str2ctrl(EVP_PKEY_CTX *ctx, int cmd, const char *str)
@@ -446,7 +434,6 @@ EVP_PKEY_CTX_get_operation(EVP_PKEY_CTX *ctx)
446{ 434{
447 return ctx->operation; 435 return ctx->operation;
448} 436}
449LCRYPTO_ALIAS(EVP_PKEY_CTX_get_operation);
450 437
451void 438void
452EVP_PKEY_CTX_set0_keygen_info(EVP_PKEY_CTX *ctx, int *dat, int datlen) 439EVP_PKEY_CTX_set0_keygen_info(EVP_PKEY_CTX *ctx, int *dat, int datlen)
@@ -454,49 +441,42 @@ EVP_PKEY_CTX_set0_keygen_info(EVP_PKEY_CTX *ctx, int *dat, int datlen)
454 ctx->keygen_info = dat; 441 ctx->keygen_info = dat;
455 ctx->keygen_info_count = datlen; 442 ctx->keygen_info_count = datlen;
456} 443}
457LCRYPTO_ALIAS(EVP_PKEY_CTX_set0_keygen_info);
458 444
459void 445void
460EVP_PKEY_CTX_set_data(EVP_PKEY_CTX *ctx, void *data) 446EVP_PKEY_CTX_set_data(EVP_PKEY_CTX *ctx, void *data)
461{ 447{
462 ctx->data = data; 448 ctx->data = data;
463} 449}
464LCRYPTO_ALIAS(EVP_PKEY_CTX_set_data);
465 450
466void * 451void *
467EVP_PKEY_CTX_get_data(EVP_PKEY_CTX *ctx) 452EVP_PKEY_CTX_get_data(EVP_PKEY_CTX *ctx)
468{ 453{
469 return ctx->data; 454 return ctx->data;
470} 455}
471LCRYPTO_ALIAS(EVP_PKEY_CTX_get_data);
472 456
473EVP_PKEY * 457EVP_PKEY *
474EVP_PKEY_CTX_get0_pkey(EVP_PKEY_CTX *ctx) 458EVP_PKEY_CTX_get0_pkey(EVP_PKEY_CTX *ctx)
475{ 459{
476 return ctx->pkey; 460 return ctx->pkey;
477} 461}
478LCRYPTO_ALIAS(EVP_PKEY_CTX_get0_pkey);
479 462
480EVP_PKEY * 463EVP_PKEY *
481EVP_PKEY_CTX_get0_peerkey(EVP_PKEY_CTX *ctx) 464EVP_PKEY_CTX_get0_peerkey(EVP_PKEY_CTX *ctx)
482{ 465{
483 return ctx->peerkey; 466 return ctx->peerkey;
484} 467}
485LCRYPTO_ALIAS(EVP_PKEY_CTX_get0_peerkey);
486 468
487void 469void
488EVP_PKEY_CTX_set_app_data(EVP_PKEY_CTX *ctx, void *data) 470EVP_PKEY_CTX_set_app_data(EVP_PKEY_CTX *ctx, void *data)
489{ 471{
490 ctx->app_data = data; 472 ctx->app_data = data;
491} 473}
492LCRYPTO_ALIAS(EVP_PKEY_CTX_set_app_data);
493 474
494void * 475void *
495EVP_PKEY_CTX_get_app_data(EVP_PKEY_CTX *ctx) 476EVP_PKEY_CTX_get_app_data(EVP_PKEY_CTX *ctx)
496{ 477{
497 return ctx->app_data; 478 return ctx->app_data;
498} 479}
499LCRYPTO_ALIAS(EVP_PKEY_CTX_get_app_data);
500 480
501void 481void
502EVP_PKEY_meth_set_init(EVP_PKEY_METHOD *pmeth, 482EVP_PKEY_meth_set_init(EVP_PKEY_METHOD *pmeth,
@@ -504,7 +484,6 @@ EVP_PKEY_meth_set_init(EVP_PKEY_METHOD *pmeth,
504{ 484{
505 pmeth->init = init; 485 pmeth->init = init;
506} 486}
507LCRYPTO_ALIAS(EVP_PKEY_meth_set_init);
508 487
509void 488void
510EVP_PKEY_meth_set_copy(EVP_PKEY_METHOD *pmeth, 489EVP_PKEY_meth_set_copy(EVP_PKEY_METHOD *pmeth,
@@ -512,7 +491,6 @@ EVP_PKEY_meth_set_copy(EVP_PKEY_METHOD *pmeth,
512{ 491{
513 pmeth->copy = copy; 492 pmeth->copy = copy;
514} 493}
515LCRYPTO_ALIAS(EVP_PKEY_meth_set_copy);
516 494
517void 495void
518EVP_PKEY_meth_set_cleanup(EVP_PKEY_METHOD *pmeth, 496EVP_PKEY_meth_set_cleanup(EVP_PKEY_METHOD *pmeth,
@@ -520,7 +498,6 @@ EVP_PKEY_meth_set_cleanup(EVP_PKEY_METHOD *pmeth,
520{ 498{
521 pmeth->cleanup = cleanup; 499 pmeth->cleanup = cleanup;
522} 500}
523LCRYPTO_ALIAS(EVP_PKEY_meth_set_cleanup);
524 501
525void 502void
526EVP_PKEY_meth_set_paramgen(EVP_PKEY_METHOD *pmeth, 503EVP_PKEY_meth_set_paramgen(EVP_PKEY_METHOD *pmeth,
@@ -530,7 +507,6 @@ EVP_PKEY_meth_set_paramgen(EVP_PKEY_METHOD *pmeth,
530 pmeth->paramgen_init = paramgen_init; 507 pmeth->paramgen_init = paramgen_init;
531 pmeth->paramgen = paramgen; 508 pmeth->paramgen = paramgen;
532} 509}
533LCRYPTO_ALIAS(EVP_PKEY_meth_set_paramgen);
534 510
535void 511void
536EVP_PKEY_meth_set_keygen(EVP_PKEY_METHOD *pmeth, 512EVP_PKEY_meth_set_keygen(EVP_PKEY_METHOD *pmeth,
@@ -540,7 +516,6 @@ EVP_PKEY_meth_set_keygen(EVP_PKEY_METHOD *pmeth,
540 pmeth->keygen_init = keygen_init; 516 pmeth->keygen_init = keygen_init;
541 pmeth->keygen = keygen; 517 pmeth->keygen = keygen;
542} 518}
543LCRYPTO_ALIAS(EVP_PKEY_meth_set_keygen);
544 519
545void 520void
546EVP_PKEY_meth_set_sign(EVP_PKEY_METHOD *pmeth, 521EVP_PKEY_meth_set_sign(EVP_PKEY_METHOD *pmeth,
@@ -551,7 +526,6 @@ EVP_PKEY_meth_set_sign(EVP_PKEY_METHOD *pmeth,
551 pmeth->sign_init = sign_init; 526 pmeth->sign_init = sign_init;
552 pmeth->sign = sign; 527 pmeth->sign = sign;
553} 528}
554LCRYPTO_ALIAS(EVP_PKEY_meth_set_sign);
555 529
556void 530void
557EVP_PKEY_meth_set_verify(EVP_PKEY_METHOD *pmeth, 531EVP_PKEY_meth_set_verify(EVP_PKEY_METHOD *pmeth,
@@ -562,7 +536,6 @@ EVP_PKEY_meth_set_verify(EVP_PKEY_METHOD *pmeth,
562 pmeth->verify_init = verify_init; 536 pmeth->verify_init = verify_init;
563 pmeth->verify = verify; 537 pmeth->verify = verify;
564} 538}
565LCRYPTO_ALIAS(EVP_PKEY_meth_set_verify);
566 539
567void 540void
568EVP_PKEY_meth_set_verify_recover(EVP_PKEY_METHOD *pmeth, 541EVP_PKEY_meth_set_verify_recover(EVP_PKEY_METHOD *pmeth,
@@ -574,7 +547,6 @@ EVP_PKEY_meth_set_verify_recover(EVP_PKEY_METHOD *pmeth,
574 pmeth->verify_recover_init = verify_recover_init; 547 pmeth->verify_recover_init = verify_recover_init;
575 pmeth->verify_recover = verify_recover; 548 pmeth->verify_recover = verify_recover;
576} 549}
577LCRYPTO_ALIAS(EVP_PKEY_meth_set_verify_recover);
578 550
579void 551void
580EVP_PKEY_meth_set_signctx(EVP_PKEY_METHOD *pmeth, 552EVP_PKEY_meth_set_signctx(EVP_PKEY_METHOD *pmeth,
@@ -585,7 +557,6 @@ EVP_PKEY_meth_set_signctx(EVP_PKEY_METHOD *pmeth,
585 pmeth->signctx_init = signctx_init; 557 pmeth->signctx_init = signctx_init;
586 pmeth->signctx = signctx; 558 pmeth->signctx = signctx;
587} 559}
588LCRYPTO_ALIAS(EVP_PKEY_meth_set_signctx);
589 560
590void 561void
591EVP_PKEY_meth_set_verifyctx(EVP_PKEY_METHOD *pmeth, 562EVP_PKEY_meth_set_verifyctx(EVP_PKEY_METHOD *pmeth,
@@ -596,7 +567,6 @@ EVP_PKEY_meth_set_verifyctx(EVP_PKEY_METHOD *pmeth,
596 pmeth->verifyctx_init = verifyctx_init; 567 pmeth->verifyctx_init = verifyctx_init;
597 pmeth->verifyctx = verifyctx; 568 pmeth->verifyctx = verifyctx;
598} 569}
599LCRYPTO_ALIAS(EVP_PKEY_meth_set_verifyctx);
600 570
601void 571void
602EVP_PKEY_meth_set_encrypt(EVP_PKEY_METHOD *pmeth, 572EVP_PKEY_meth_set_encrypt(EVP_PKEY_METHOD *pmeth,
@@ -607,7 +577,6 @@ EVP_PKEY_meth_set_encrypt(EVP_PKEY_METHOD *pmeth,
607 pmeth->encrypt_init = encrypt_init; 577 pmeth->encrypt_init = encrypt_init;
608 pmeth->encrypt = encryptfn; 578 pmeth->encrypt = encryptfn;
609} 579}
610LCRYPTO_ALIAS(EVP_PKEY_meth_set_encrypt);
611 580
612void 581void
613EVP_PKEY_meth_set_decrypt(EVP_PKEY_METHOD *pmeth, 582EVP_PKEY_meth_set_decrypt(EVP_PKEY_METHOD *pmeth,
@@ -618,7 +587,6 @@ EVP_PKEY_meth_set_decrypt(EVP_PKEY_METHOD *pmeth,
618 pmeth->decrypt_init = decrypt_init; 587 pmeth->decrypt_init = decrypt_init;
619 pmeth->decrypt = decrypt; 588 pmeth->decrypt = decrypt;
620} 589}
621LCRYPTO_ALIAS(EVP_PKEY_meth_set_decrypt);
622 590
623void 591void
624EVP_PKEY_meth_set_derive(EVP_PKEY_METHOD *pmeth, 592EVP_PKEY_meth_set_derive(EVP_PKEY_METHOD *pmeth,
@@ -628,7 +596,6 @@ EVP_PKEY_meth_set_derive(EVP_PKEY_METHOD *pmeth,
628 pmeth->derive_init = derive_init; 596 pmeth->derive_init = derive_init;
629 pmeth->derive = derive; 597 pmeth->derive = derive;
630} 598}
631LCRYPTO_ALIAS(EVP_PKEY_meth_set_derive);
632 599
633void 600void
634EVP_PKEY_meth_set_ctrl(EVP_PKEY_METHOD *pmeth, 601EVP_PKEY_meth_set_ctrl(EVP_PKEY_METHOD *pmeth,
@@ -638,14 +605,12 @@ EVP_PKEY_meth_set_ctrl(EVP_PKEY_METHOD *pmeth,
638 pmeth->ctrl = ctrl; 605 pmeth->ctrl = ctrl;
639 pmeth->ctrl_str = ctrl_str; 606 pmeth->ctrl_str = ctrl_str;
640} 607}
641LCRYPTO_ALIAS(EVP_PKEY_meth_set_ctrl);
642 608
643void 609void
644EVP_PKEY_meth_set_check(EVP_PKEY_METHOD *pmeth, int (*check)(EVP_PKEY *pkey)) 610EVP_PKEY_meth_set_check(EVP_PKEY_METHOD *pmeth, int (*check)(EVP_PKEY *pkey))
645{ 611{
646 pmeth->check = check; 612 pmeth->check = check;
647} 613}
648LCRYPTO_ALIAS(EVP_PKEY_meth_set_check);
649 614
650void 615void
651EVP_PKEY_meth_set_public_check(EVP_PKEY_METHOD *pmeth, 616EVP_PKEY_meth_set_public_check(EVP_PKEY_METHOD *pmeth,
@@ -653,7 +618,6 @@ EVP_PKEY_meth_set_public_check(EVP_PKEY_METHOD *pmeth,
653{ 618{
654 pmeth->public_check = public_check; 619 pmeth->public_check = public_check;
655} 620}
656LCRYPTO_ALIAS(EVP_PKEY_meth_set_public_check);
657 621
658void 622void
659EVP_PKEY_meth_set_param_check(EVP_PKEY_METHOD *pmeth, 623EVP_PKEY_meth_set_param_check(EVP_PKEY_METHOD *pmeth,
@@ -661,4 +625,3 @@ EVP_PKEY_meth_set_param_check(EVP_PKEY_METHOD *pmeth,
661{ 625{
662 pmeth->param_check = param_check; 626 pmeth->param_check = param_check;
663} 627}
664LCRYPTO_ALIAS(EVP_PKEY_meth_set_param_check);
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-04-26 07:29:12 +0000