diff options
Diffstat (limited to 'lib/libcrypto/evp')
57 files changed, 57 insertions, 470 deletions
diff --git a/lib/libcrypto/evp/bio_b64.c b/lib/libcrypto/evp/bio_b64.c index 5eceda09938..3c47628f544 100644 --- a/lib/libcrypto/evp/bio_b64.c +++ b/lib/libcrypto/evp/bio_b64.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bio_b64.c,v 1.27 2023/07/07 13:54:45 beck Exp $ */ +/* $OpenBSD: bio_b64.c,v 1.28 2023/07/07 19:37:53 beck Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -111,7 +111,6 @@ BIO_f_base64(void) { return (&methods_b64); } -LCRYPTO_ALIAS(BIO_f_base64); static int b64_new(BIO *bi) diff --git a/lib/libcrypto/evp/bio_enc.c b/lib/libcrypto/evp/bio_enc.c index 747e64ed7ff..d2132adb4e5 100644 --- a/lib/libcrypto/evp/bio_enc.c +++ b/lib/libcrypto/evp/bio_enc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bio_enc.c,v 1.28 2023/07/07 13:54:45 beck Exp $ */ +/* $OpenBSD: bio_enc.c,v 1.29 2023/07/07 19:37:53 beck Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -106,7 +106,6 @@ BIO_f_cipher(void) { return (&methods_enc); } -LCRYPTO_ALIAS(BIO_f_cipher); static int enc_new(BIO *bi) @@ -417,4 +416,3 @@ BIO_set_cipher(BIO *b, const EVP_CIPHER *c, const unsigned char *k, return 1; } -LCRYPTO_ALIAS(BIO_set_cipher); diff --git a/lib/libcrypto/evp/bio_md.c b/lib/libcrypto/evp/bio_md.c index 83d6c3732cd..ccfcd1ea1d0 100644 --- a/lib/libcrypto/evp/bio_md.c +++ b/lib/libcrypto/evp/bio_md.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bio_md.c,v 1.20 2023/07/07 13:54:45 beck Exp $ */ +/* $OpenBSD: bio_md.c,v 1.21 2023/07/07 19:37:53 beck Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -94,7 +94,6 @@ BIO_f_md(void) { return (&methods_md); } -LCRYPTO_ALIAS(BIO_f_md); static int md_new(BIO *bi) diff --git a/lib/libcrypto/evp/c_all.c b/lib/libcrypto/evp/c_all.c index 5efcd5f2377..10e35dd7abc 100644 --- a/lib/libcrypto/evp/c_all.c +++ b/lib/libcrypto/evp/c_all.c @@ -1,4 +1,4 @@ -/* $OpenBSD: c_all.c,v 1.30 2023/07/07 13:54:45 beck Exp $ */ +/* $OpenBSD: c_all.c,v 1.31 2023/07/07 19:37:53 beck Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -251,7 +251,6 @@ OpenSSL_add_all_ciphers(void) static pthread_once_t add_all_ciphers_once = PTHREAD_ONCE_INIT; (void) pthread_once(&add_all_ciphers_once, OpenSSL_add_all_ciphers_internal); } -LCRYPTO_ALIAS(OpenSSL_add_all_ciphers); static void OpenSSL_add_all_digests_internal(void) @@ -314,7 +313,6 @@ OpenSSL_add_all_digests(void) static pthread_once_t add_all_digests_once = PTHREAD_ONCE_INIT; (void) pthread_once(&add_all_digests_once, OpenSSL_add_all_digests_internal); } -LCRYPTO_ALIAS(OpenSSL_add_all_digests); void OPENSSL_add_all_algorithms_noconf(void) @@ -323,7 +321,6 @@ OPENSSL_add_all_algorithms_noconf(void) OpenSSL_add_all_ciphers(); OpenSSL_add_all_digests(); } -LCRYPTO_ALIAS(OPENSSL_add_all_algorithms_noconf); void OPENSSL_add_all_algorithms_conf(void) @@ -331,4 +328,3 @@ OPENSSL_add_all_algorithms_conf(void) OPENSSL_add_all_algorithms_noconf(); OPENSSL_config(NULL); } -LCRYPTO_ALIAS(OPENSSL_add_all_algorithms_conf); diff --git a/lib/libcrypto/evp/cipher_method_lib.c b/lib/libcrypto/evp/cipher_method_lib.c index 9e4fd483a37..c3f510fcc74 100644 --- a/lib/libcrypto/evp/cipher_method_lib.c +++ b/lib/libcrypto/evp/cipher_method_lib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cipher_method_lib.c,v 1.9 2023/07/07 13:54:45 beck Exp $ */ +/* $OpenBSD: cipher_method_lib.c,v 1.10 2023/07/07 19:37:53 beck Exp $ */ /* * Written by Richard Levitte (levitte@openssl.org) for the OpenSSL project * 2015. @@ -77,7 +77,6 @@ EVP_CIPHER_meth_new(int cipher_type, int block_size, int key_len) return cipher; } -LCRYPTO_ALIAS(EVP_CIPHER_meth_new); EVP_CIPHER * EVP_CIPHER_meth_dup(const EVP_CIPHER *cipher) @@ -91,14 +90,12 @@ EVP_CIPHER_meth_dup(const EVP_CIPHER *cipher) return copy; } -LCRYPTO_ALIAS(EVP_CIPHER_meth_dup); void EVP_CIPHER_meth_free(EVP_CIPHER *cipher) { free(cipher); } -LCRYPTO_ALIAS(EVP_CIPHER_meth_free); int EVP_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) return 1; } -LCRYPTO_ALIAS(EVP_CIPHER_meth_set_iv_length); int EVP_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) return 1; } -LCRYPTO_ALIAS(EVP_CIPHER_meth_set_flags); int EVP_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) return 1; } -LCRYPTO_ALIAS(EVP_CIPHER_meth_set_impl_ctx_size); int EVP_CIPHER_meth_set_init(EVP_CIPHER *cipher, @@ -136,7 +130,6 @@ EVP_CIPHER_meth_set_init(EVP_CIPHER *cipher, return 1; } -LCRYPTO_ALIAS(EVP_CIPHER_meth_set_init); int EVP_CIPHER_meth_set_do_cipher(EVP_CIPHER *cipher, @@ -147,7 +140,6 @@ EVP_CIPHER_meth_set_do_cipher(EVP_CIPHER *cipher, return 1; } -LCRYPTO_ALIAS(EVP_CIPHER_meth_set_do_cipher); int EVP_CIPHER_meth_set_cleanup(EVP_CIPHER *cipher, @@ -157,7 +149,6 @@ EVP_CIPHER_meth_set_cleanup(EVP_CIPHER *cipher, return 1; } -LCRYPTO_ALIAS(EVP_CIPHER_meth_set_cleanup); int EVP_CIPHER_meth_set_set_asn1_params(EVP_CIPHER *cipher, @@ -167,7 +158,6 @@ EVP_CIPHER_meth_set_set_asn1_params(EVP_CIPHER *cipher, return 1; } -LCRYPTO_ALIAS(EVP_CIPHER_meth_set_set_asn1_params); int EVP_CIPHER_meth_set_get_asn1_params(EVP_CIPHER *cipher, @@ -177,7 +167,6 @@ EVP_CIPHER_meth_set_get_asn1_params(EVP_CIPHER *cipher, return 1; } -LCRYPTO_ALIAS(EVP_CIPHER_meth_set_get_asn1_params); int EVP_CIPHER_meth_set_ctrl(EVP_CIPHER *cipher, @@ -187,4 +176,3 @@ EVP_CIPHER_meth_set_ctrl(EVP_CIPHER *cipher, return 1; } -LCRYPTO_ALIAS(EVP_CIPHER_meth_set_ctrl); diff --git a/lib/libcrypto/evp/digest.c b/lib/libcrypto/evp/digest.c index 6615aa4a359..ca3fb219cde 100644 --- a/lib/libcrypto/evp/digest.c +++ b/lib/libcrypto/evp/digest.c @@ -1,4 +1,4 @@ -/* $OpenBSD: digest.c,v 1.37 2023/07/07 13:54:45 beck Exp $ */ +/* $OpenBSD: digest.c,v 1.38 2023/07/07 19:37:53 beck Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -130,7 +130,6 @@ EVP_DigestInit(EVP_MD_CTX *ctx, const EVP_MD *type) EVP_MD_CTX_init(ctx); return EVP_DigestInit_ex(ctx, type, NULL); } -LCRYPTO_ALIAS(EVP_DigestInit); int EVP_DigestInit_ex(EVP_MD_CTX *ctx, const EVP_MD *type, ENGINE *impl) @@ -212,14 +211,12 @@ skip_to_init: return 1; return ctx->digest->init(ctx); } -LCRYPTO_ALIAS(EVP_DigestInit_ex); int EVP_DigestUpdate(EVP_MD_CTX *ctx, const void *data, size_t count) { return ctx->update(ctx, data, count); } -LCRYPTO_ALIAS(EVP_DigestUpdate); /* The caller can assume that this removes any secret data from the context */ int @@ -231,7 +228,6 @@ EVP_DigestFinal(EVP_MD_CTX *ctx, unsigned char *md, unsigned int *size) EVP_MD_CTX_cleanup(ctx); return ret; } -LCRYPTO_ALIAS(EVP_DigestFinal); /* The caller can assume that this removes any secret data from the context */ int @@ -253,7 +249,6 @@ EVP_DigestFinal_ex(EVP_MD_CTX *ctx, unsigned char *md, unsigned int *size) memset(ctx->md_data, 0, ctx->digest->ctx_size); return ret; } -LCRYPTO_ALIAS(EVP_DigestFinal_ex); int EVP_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) EVP_MD_CTX_init(out); return EVP_MD_CTX_copy_ex(out, in); } -LCRYPTO_ALIAS(EVP_MD_CTX_copy); int EVP_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) return 1; } -LCRYPTO_ALIAS(EVP_MD_CTX_copy_ex); int EVP_Digest(const void *data, size_t count, @@ -342,14 +335,12 @@ EVP_Digest(const void *data, size_t count, return ret; } -LCRYPTO_ALIAS(EVP_Digest); EVP_MD_CTX * EVP_MD_CTX_new(void) { return calloc(1, sizeof(EVP_MD_CTX)); } -LCRYPTO_ALIAS(EVP_MD_CTX_new); void EVP_MD_CTX_free(EVP_MD_CTX *ctx) @@ -361,35 +352,30 @@ EVP_MD_CTX_free(EVP_MD_CTX *ctx) free(ctx); } -LCRYPTO_ALIAS(EVP_MD_CTX_free); void EVP_MD_CTX_init(EVP_MD_CTX *ctx) { memset(ctx, 0, sizeof(*ctx)); } -LCRYPTO_ALIAS(EVP_MD_CTX_init); int EVP_MD_CTX_reset(EVP_MD_CTX *ctx) { return EVP_MD_CTX_cleanup(ctx); } -LCRYPTO_ALIAS(EVP_MD_CTX_reset); EVP_MD_CTX * EVP_MD_CTX_create(void) { return EVP_MD_CTX_new(); } -LCRYPTO_ALIAS(EVP_MD_CTX_create); void EVP_MD_CTX_destroy(EVP_MD_CTX *ctx) { EVP_MD_CTX_free(ctx); } -LCRYPTO_ALIAS(EVP_MD_CTX_destroy); /* This call frees resources associated with the context */ int @@ -418,7 +404,6 @@ EVP_MD_CTX_cleanup(EVP_MD_CTX *ctx) return 1; } -LCRYPTO_ALIAS(EVP_MD_CTX_cleanup); int EVP_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) } return ret; } -LCRYPTO_ALIAS(EVP_MD_CTX_ctrl); diff --git a/lib/libcrypto/evp/e_aes.c b/lib/libcrypto/evp/e_aes.c index 35c8d944edb..3d3b1a9d6c2 100644 --- a/lib/libcrypto/evp/e_aes.c +++ b/lib/libcrypto/evp/e_aes.c @@ -1,4 +1,4 @@ -/* $OpenBSD: e_aes.c,v 1.52 2023/07/07 13:54:45 beck Exp $ */ +/* $OpenBSD: e_aes.c,v 1.53 2023/07/07 19:37:53 beck Exp $ */ /* ==================================================================== * Copyright (c) 2001-2011 The OpenSSL Project. All rights reserved. * @@ -572,7 +572,6 @@ EVP_aes_128_cbc(void) return &aes_128_cbc; #endif } -LCRYPTO_ALIAS(EVP_aes_128_cbc); #ifdef AESNI_CAPABLE static const EVP_CIPHER aesni_128_ecb = { @@ -607,7 +606,6 @@ EVP_aes_128_ecb(void) return &aes_128_ecb; #endif } -LCRYPTO_ALIAS(EVP_aes_128_ecb); #ifdef AESNI_CAPABLE static const EVP_CIPHER aesni_128_ofb = { @@ -642,7 +640,6 @@ EVP_aes_128_ofb(void) return &aes_128_ofb; #endif } -LCRYPTO_ALIAS(EVP_aes_128_ofb); #ifdef AESNI_CAPABLE static const EVP_CIPHER aesni_128_cfb = { @@ -711,7 +708,6 @@ EVP_aes_128_cfb1(void) return &aes_128_cfb1; #endif } -LCRYPTO_ALIAS(EVP_aes_128_cfb1); #ifdef AESNI_CAPABLE static const EVP_CIPHER aesni_128_cfb8 = { @@ -746,7 +742,6 @@ EVP_aes_128_cfb8(void) return &aes_128_cfb8; #endif } -LCRYPTO_ALIAS(EVP_aes_128_cfb8); #ifdef AESNI_CAPABLE static const EVP_CIPHER aesni_128_ctr = { @@ -781,7 +776,6 @@ EVP_aes_128_ctr(void) return &aes_128_ctr; #endif } -LCRYPTO_ALIAS(EVP_aes_128_ctr); #ifdef AESNI_CAPABLE @@ -817,7 +811,6 @@ EVP_aes_192_cbc(void) return &aes_192_cbc; #endif } -LCRYPTO_ALIAS(EVP_aes_192_cbc); #ifdef AESNI_CAPABLE static const EVP_CIPHER aesni_192_ecb = { @@ -852,7 +845,6 @@ EVP_aes_192_ecb(void) return &aes_192_ecb; #endif } -LCRYPTO_ALIAS(EVP_aes_192_ecb); #ifdef AESNI_CAPABLE static const EVP_CIPHER aesni_192_ofb = { @@ -887,7 +879,6 @@ EVP_aes_192_ofb(void) return &aes_192_ofb; #endif } -LCRYPTO_ALIAS(EVP_aes_192_ofb); #ifdef AESNI_CAPABLE static const EVP_CIPHER aesni_192_cfb = { @@ -956,7 +947,6 @@ EVP_aes_192_cfb1(void) return &aes_192_cfb1; #endif } -LCRYPTO_ALIAS(EVP_aes_192_cfb1); #ifdef AESNI_CAPABLE static const EVP_CIPHER aesni_192_cfb8 = { @@ -991,7 +981,6 @@ EVP_aes_192_cfb8(void) return &aes_192_cfb8; #endif } -LCRYPTO_ALIAS(EVP_aes_192_cfb8); #ifdef AESNI_CAPABLE static const EVP_CIPHER aesni_192_ctr = { @@ -1026,7 +1015,6 @@ EVP_aes_192_ctr(void) return &aes_192_ctr; #endif } -LCRYPTO_ALIAS(EVP_aes_192_ctr); #ifdef AESNI_CAPABLE @@ -1062,7 +1050,6 @@ EVP_aes_256_cbc(void) return &aes_256_cbc; #endif } -LCRYPTO_ALIAS(EVP_aes_256_cbc); #ifdef AESNI_CAPABLE static const EVP_CIPHER aesni_256_ecb = { @@ -1097,7 +1084,6 @@ EVP_aes_256_ecb(void) return &aes_256_ecb; #endif } -LCRYPTO_ALIAS(EVP_aes_256_ecb); #ifdef AESNI_CAPABLE static const EVP_CIPHER aesni_256_ofb = { @@ -1132,7 +1118,6 @@ EVP_aes_256_ofb(void) return &aes_256_ofb; #endif } -LCRYPTO_ALIAS(EVP_aes_256_ofb); #ifdef AESNI_CAPABLE static const EVP_CIPHER aesni_256_cfb = { @@ -1201,7 +1186,6 @@ EVP_aes_256_cfb1(void) return &aes_256_cfb1; #endif } -LCRYPTO_ALIAS(EVP_aes_256_cfb1); #ifdef AESNI_CAPABLE static const EVP_CIPHER aesni_256_cfb8 = { @@ -1236,7 +1220,6 @@ EVP_aes_256_cfb8(void) return &aes_256_cfb8; #endif } -LCRYPTO_ALIAS(EVP_aes_256_cfb8); #ifdef AESNI_CAPABLE static const EVP_CIPHER aesni_256_ctr = { @@ -1271,7 +1254,6 @@ EVP_aes_256_ctr(void) return &aes_256_ctr; #endif } -LCRYPTO_ALIAS(EVP_aes_256_ctr); static int aes_gcm_cleanup(EVP_CIPHER_CTX *c) @@ -1690,7 +1672,6 @@ EVP_aes_128_gcm(void) return &aes_128_gcm; #endif } -LCRYPTO_ALIAS(EVP_aes_128_gcm); #ifdef AESNI_CAPABLE static const EVP_CIPHER aesni_192_gcm = { @@ -1729,7 +1710,6 @@ EVP_aes_192_gcm(void) return &aes_192_gcm; #endif } -LCRYPTO_ALIAS(EVP_aes_192_gcm); #ifdef AESNI_CAPABLE static const EVP_CIPHER aesni_256_gcm = { @@ -1768,7 +1748,6 @@ EVP_aes_256_gcm(void) return &aes_256_gcm; #endif } -LCRYPTO_ALIAS(EVP_aes_256_gcm); static int aes_xts_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr) @@ -1935,7 +1914,6 @@ EVP_aes_128_xts(void) return &aes_128_xts; #endif } -LCRYPTO_ALIAS(EVP_aes_128_xts); #ifdef AESNI_CAPABLE static const EVP_CIPHER aesni_256_xts = { @@ -1974,7 +1952,6 @@ EVP_aes_256_xts(void) return &aes_256_xts; #endif } -LCRYPTO_ALIAS(EVP_aes_256_xts); static int aes_ccm_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr) @@ -2171,7 +2148,6 @@ EVP_aes_128_ccm(void) return &aes_128_ccm; #endif } -LCRYPTO_ALIAS(EVP_aes_128_ccm); #ifdef AESNI_CAPABLE static const EVP_CIPHER aesni_192_ccm = { @@ -2210,7 +2186,6 @@ EVP_aes_192_ccm(void) return &aes_192_ccm; #endif } -LCRYPTO_ALIAS(EVP_aes_192_ccm); #ifdef AESNI_CAPABLE static const EVP_CIPHER aesni_256_ccm = { @@ -2249,7 +2224,6 @@ EVP_aes_256_ccm(void) return &aes_256_ccm; #endif } -LCRYPTO_ALIAS(EVP_aes_256_ccm); #define EVP_AEAD_AES_GCM_TAG_LEN 16 @@ -2440,14 +2414,12 @@ EVP_aead_aes_128_gcm(void) { return &aead_aes_128_gcm; } -LCRYPTO_ALIAS(EVP_aead_aes_128_gcm); const EVP_AEAD * EVP_aead_aes_256_gcm(void) { return &aead_aes_256_gcm; } -LCRYPTO_ALIAS(EVP_aead_aes_256_gcm); typedef struct { union { @@ -2573,7 +2545,6 @@ EVP_aes_128_wrap(void) { return &aes_128_wrap; } -LCRYPTO_ALIAS(EVP_aes_128_wrap); static const EVP_CIPHER aes_192_wrap = { .nid = NID_id_aes192_wrap, @@ -2596,7 +2567,6 @@ EVP_aes_192_wrap(void) { return &aes_192_wrap; } -LCRYPTO_ALIAS(EVP_aes_192_wrap); static const EVP_CIPHER aes_256_wrap = { .nid = NID_id_aes256_wrap, @@ -2619,6 +2589,5 @@ EVP_aes_256_wrap(void) { return &aes_256_wrap; } -LCRYPTO_ALIAS(EVP_aes_256_wrap); #endif diff --git a/lib/libcrypto/evp/e_aes_cbc_hmac_sha1.c b/lib/libcrypto/evp/e_aes_cbc_hmac_sha1.c index b905b359c9c..09a73da7482 100644 --- a/lib/libcrypto/evp/e_aes_cbc_hmac_sha1.c +++ b/lib/libcrypto/evp/e_aes_cbc_hmac_sha1.c @@ -1,4 +1,4 @@ -/* $OpenBSD: e_aes_cbc_hmac_sha1.c,v 1.18 2023/07/07 13:54:45 beck Exp $ */ +/* $OpenBSD: e_aes_cbc_hmac_sha1.c,v 1.19 2023/07/07 19:37:53 beck Exp $ */ /* ==================================================================== * Copyright (c) 2011-2013 The OpenSSL Project. All rights reserved. * @@ -581,7 +581,6 @@ EVP_aes_128_cbc_hmac_sha1(void) return (OPENSSL_cpu_caps() & CPUCAP_MASK_AESNI) ? &aesni_128_cbc_hmac_sha1_cipher : NULL; } -LCRYPTO_ALIAS(EVP_aes_128_cbc_hmac_sha1); const EVP_CIPHER * EVP_aes_256_cbc_hmac_sha1(void) @@ -589,20 +588,17 @@ EVP_aes_256_cbc_hmac_sha1(void) return (OPENSSL_cpu_caps() & CPUCAP_MASK_AESNI) ? &aesni_256_cbc_hmac_sha1_cipher : NULL; } -LCRYPTO_ALIAS(EVP_aes_256_cbc_hmac_sha1); #else const EVP_CIPHER * EVP_aes_128_cbc_hmac_sha1(void) { return NULL; } -LCRYPTO_ALIAS(EVP_aes_128_cbc_hmac_sha1); const EVP_CIPHER * EVP_aes_256_cbc_hmac_sha1(void) { return NULL; } -LCRYPTO_ALIAS(EVP_aes_256_cbc_hmac_sha1); #endif #endif diff --git a/lib/libcrypto/evp/e_bf.c b/lib/libcrypto/evp/e_bf.c index 4e671fab3e5..9146a531e4e 100644 --- a/lib/libcrypto/evp/e_bf.c +++ b/lib/libcrypto/evp/e_bf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: e_bf.c,v 1.16 2023/07/07 13:54:45 beck Exp $ */ +/* $OpenBSD: e_bf.c,v 1.17 2023/07/07 19:37:53 beck Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -178,7 +178,6 @@ EVP_bf_cbc(void) { return &bf_cbc; } -LCRYPTO_ALIAS(EVP_bf_cbc); static const EVP_CIPHER bf_cfb64 = { .nid = NID_bf_cfb64, @@ -201,7 +200,6 @@ EVP_bf_cfb64(void) { return &bf_cfb64; } -LCRYPTO_ALIAS(EVP_bf_cfb64); static const EVP_CIPHER bf_ofb = { .nid = NID_bf_ofb64, @@ -224,7 +222,6 @@ EVP_bf_ofb(void) { return &bf_ofb; } -LCRYPTO_ALIAS(EVP_bf_ofb); static const EVP_CIPHER bf_ecb = { .nid = NID_bf_ecb, @@ -247,5 +244,4 @@ EVP_bf_ecb(void) { return &bf_ecb; } -LCRYPTO_ALIAS(EVP_bf_ecb); #endif diff --git a/lib/libcrypto/evp/e_camellia.c b/lib/libcrypto/evp/e_camellia.c index 0ab6e9ca604..cec7649e3f3 100644 --- a/lib/libcrypto/evp/e_camellia.c +++ b/lib/libcrypto/evp/e_camellia.c @@ -1,4 +1,4 @@ -/* $OpenBSD: e_camellia.c,v 1.17 2023/07/07 13:54:45 beck Exp $ */ +/* $OpenBSD: e_camellia.c,v 1.18 2023/07/07 19:37:53 beck Exp $ */ /* ==================================================================== * Copyright (c) 2006 The OpenSSL Project. All rights reserved. * @@ -179,7 +179,6 @@ EVP_camellia_128_cbc(void) { return &camellia_128_cbc; } -LCRYPTO_ALIAS(EVP_camellia_128_cbc); static const EVP_CIPHER camellia_128_cfb128 = { .nid = NID_camellia_128_cfb128, @@ -202,7 +201,6 @@ EVP_camellia_128_cfb128(void) { return &camellia_128_cfb128; } -LCRYPTO_ALIAS(EVP_camellia_128_cfb128); static const EVP_CIPHER camellia_128_ofb = { .nid = NID_camellia_128_ofb128, @@ -225,7 +223,6 @@ EVP_camellia_128_ofb(void) { return &camellia_128_ofb; } -LCRYPTO_ALIAS(EVP_camellia_128_ofb); static const EVP_CIPHER camellia_128_ecb = { .nid = NID_camellia_128_ecb, @@ -248,7 +245,6 @@ EVP_camellia_128_ecb(void) { return &camellia_128_ecb; } -LCRYPTO_ALIAS(EVP_camellia_128_ecb); static int camellia_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) { return &camellia_192_cbc; } -LCRYPTO_ALIAS(EVP_camellia_192_cbc); static const EVP_CIPHER camellia_192_cfb128 = { .nid = NID_camellia_192_cfb128, @@ -364,7 +359,6 @@ EVP_camellia_192_cfb128(void) { return &camellia_192_cfb128; } -LCRYPTO_ALIAS(EVP_camellia_192_cfb128); static const EVP_CIPHER camellia_192_ofb = { .nid = NID_camellia_192_ofb128, @@ -387,7 +381,6 @@ EVP_camellia_192_ofb(void) { return &camellia_192_ofb; } -LCRYPTO_ALIAS(EVP_camellia_192_ofb); static const EVP_CIPHER camellia_192_ecb = { .nid = NID_camellia_192_ecb, @@ -410,7 +403,6 @@ EVP_camellia_192_ecb(void) { return &camellia_192_ecb; } -LCRYPTO_ALIAS(EVP_camellia_192_ecb); static int camellia_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) { return &camellia_256_cbc; } -LCRYPTO_ALIAS(EVP_camellia_256_cbc); static const EVP_CIPHER camellia_256_cfb128 = { .nid = NID_camellia_256_cfb128, @@ -526,7 +517,6 @@ EVP_camellia_256_cfb128(void) { return &camellia_256_cfb128; } -LCRYPTO_ALIAS(EVP_camellia_256_cfb128); static const EVP_CIPHER camellia_256_ofb = { .nid = NID_camellia_256_ofb128, @@ -549,7 +539,6 @@ EVP_camellia_256_ofb(void) { return &camellia_256_ofb; } -LCRYPTO_ALIAS(EVP_camellia_256_ofb); static const EVP_CIPHER camellia_256_ecb = { .nid = NID_camellia_256_ecb, @@ -572,7 +561,6 @@ EVP_camellia_256_ecb(void) { return &camellia_256_ecb; } -LCRYPTO_ALIAS(EVP_camellia_256_ecb); static int camellia_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) { return &camellia_128_cfb1; } -LCRYPTO_ALIAS(EVP_camellia_128_cfb1); static int camellia_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) { return &camellia_192_cfb1; } -LCRYPTO_ALIAS(EVP_camellia_192_cfb1); static int camellia_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) { return &camellia_256_cfb1; } -LCRYPTO_ALIAS(EVP_camellia_256_cfb1); static int @@ -751,7 +736,6 @@ EVP_camellia_128_cfb8(void) { return &camellia_128_cfb8; } -LCRYPTO_ALIAS(EVP_camellia_128_cfb8); static int camellia_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) { return &camellia_192_cfb8; } -LCRYPTO_ALIAS(EVP_camellia_192_cfb8); static int camellia_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) { return &camellia_256_cfb8; } -LCRYPTO_ALIAS(EVP_camellia_256_cfb8); #endif diff --git a/lib/libcrypto/evp/e_cast.c b/lib/libcrypto/evp/e_cast.c index 8f62ba6f29d..a0e52dfdf43 100644 --- a/lib/libcrypto/evp/e_cast.c +++ b/lib/libcrypto/evp/e_cast.c @@ -1,4 +1,4 @@ -/* $OpenBSD: e_cast.c,v 1.15 2023/07/07 13:54:45 beck Exp $ */ +/* $OpenBSD: e_cast.c,v 1.16 2023/07/07 19:37:53 beck Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -178,7 +178,6 @@ EVP_cast5_cbc(void) { return &cast5_cbc; } -LCRYPTO_ALIAS(EVP_cast5_cbc); static const EVP_CIPHER cast5_cfb64 = { .nid = NID_cast5_cfb64, @@ -201,7 +200,6 @@ EVP_cast5_cfb64(void) { return &cast5_cfb64; } -LCRYPTO_ALIAS(EVP_cast5_cfb64); static const EVP_CIPHER cast5_ofb = { .nid = NID_cast5_ofb64, @@ -224,7 +222,6 @@ EVP_cast5_ofb(void) { return &cast5_ofb; } -LCRYPTO_ALIAS(EVP_cast5_ofb); static const EVP_CIPHER cast5_ecb = { .nid = NID_cast5_ecb, @@ -247,5 +244,4 @@ EVP_cast5_ecb(void) { return &cast5_ecb; } -LCRYPTO_ALIAS(EVP_cast5_ecb); #endif diff --git a/lib/libcrypto/evp/e_chacha.c b/lib/libcrypto/evp/e_chacha.c index f781d663392..add04884776 100644 --- a/lib/libcrypto/evp/e_chacha.c +++ b/lib/libcrypto/evp/e_chacha.c @@ -1,4 +1,4 @@ -/* $OpenBSD: e_chacha.c,v 1.11 2023/07/07 13:54:45 beck Exp $ */ +/* $OpenBSD: e_chacha.c,v 1.12 2023/07/07 19:37:53 beck Exp $ */ /* * Copyright (c) 2014 Joel Sing <jsing@openbsd.org> * @@ -74,6 +74,5 @@ EVP_chacha20(void) { return (&chacha20_cipher); } -LCRYPTO_ALIAS(EVP_chacha20); #endif diff --git a/lib/libcrypto/evp/e_chacha20poly1305.c b/lib/libcrypto/evp/e_chacha20poly1305.c index 4b8f47cefce..a17657899b6 100644 --- a/lib/libcrypto/evp/e_chacha20poly1305.c +++ b/lib/libcrypto/evp/e_chacha20poly1305.c @@ -1,4 +1,4 @@ -/* $OpenBSD: e_chacha20poly1305.c,v 1.29 2023/07/07 13:54:45 beck Exp $ */ +/* $OpenBSD: e_chacha20poly1305.c,v 1.30 2023/07/07 19:37:53 beck Exp $ */ /* * Copyright (c) 2022 Joel Sing <jsing@openbsd.org> @@ -348,7 +348,6 @@ EVP_aead_chacha20_poly1305() { return &aead_chacha20_poly1305; } -LCRYPTO_ALIAS(EVP_aead_chacha20_poly1305); static const EVP_AEAD aead_xchacha20_poly1305 = { .key_len = 32, @@ -367,7 +366,6 @@ EVP_aead_xchacha20_poly1305() { return &aead_xchacha20_poly1305; } -LCRYPTO_ALIAS(EVP_aead_xchacha20_poly1305); struct chacha20_poly1305_ctx { ChaCha_ctx chacha; @@ -608,6 +606,5 @@ EVP_chacha20_poly1305(void) { return &cipher_chacha20_poly1305; } -LCRYPTO_ALIAS(EVP_chacha20_poly1305); #endif /* !OPENSSL_NO_CHACHA && !OPENSSL_NO_POLY1305 */ diff --git a/lib/libcrypto/evp/e_des.c b/lib/libcrypto/evp/e_des.c index c87de1a690b..64d098ca145 100644 --- a/lib/libcrypto/evp/e_des.c +++ b/lib/libcrypto/evp/e_des.c @@ -1,4 +1,4 @@ -/* $OpenBSD: e_des.c,v 1.21 2023/07/07 13:54:45 beck Exp $ */ +/* $OpenBSD: e_des.c,v 1.22 2023/07/07 19:37:53 beck Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -242,7 +242,6 @@ EVP_des_cbc(void) { return &des_cbc; } -LCRYPTO_ALIAS(EVP_des_cbc); static const EVP_CIPHER des_cfb64 = { .nid = NID_des_cfb64, @@ -265,7 +264,6 @@ EVP_des_cfb64(void) { return &des_cfb64; } -LCRYPTO_ALIAS(EVP_des_cfb64); static const EVP_CIPHER des_ofb = { .nid = NID_des_ofb64, @@ -288,7 +286,6 @@ EVP_des_ofb(void) { return &des_ofb; } -LCRYPTO_ALIAS(EVP_des_ofb); static const EVP_CIPHER des_ecb = { .nid = NID_des_ecb, @@ -311,7 +308,6 @@ EVP_des_ecb(void) { return &des_ecb; } -LCRYPTO_ALIAS(EVP_des_ecb); static const EVP_CIPHER des_cfb1 = { .nid = NID_des_cfb1, @@ -334,7 +330,6 @@ EVP_des_cfb1(void) { return &des_cfb1; } -LCRYPTO_ALIAS(EVP_des_cfb1); static const EVP_CIPHER des_cfb8 = { .nid = NID_des_cfb8, @@ -357,5 +352,4 @@ EVP_des_cfb8(void) { return &des_cfb8; } -LCRYPTO_ALIAS(EVP_des_cfb8); #endif diff --git a/lib/libcrypto/evp/e_des3.c b/lib/libcrypto/evp/e_des3.c index d345c354c03..3e6c5234cb3 100644 --- a/lib/libcrypto/evp/e_des3.c +++ b/lib/libcrypto/evp/e_des3.c @@ -1,4 +1,4 @@ -/* $OpenBSD: e_des3.c,v 1.27 2023/07/07 13:54:45 beck Exp $ */ +/* $OpenBSD: e_des3.c,v 1.28 2023/07/07 19:37:53 beck Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -274,7 +274,6 @@ EVP_des_ede_cbc(void) { return &des_ede_cbc; } -LCRYPTO_ALIAS(EVP_des_ede_cbc); static const EVP_CIPHER des_ede_cfb64 = { .nid = NID_des_ede_cfb64, @@ -297,7 +296,6 @@ EVP_des_ede_cfb64(void) { return &des_ede_cfb64; } -LCRYPTO_ALIAS(EVP_des_ede_cfb64); static const EVP_CIPHER des_ede_ofb = { .nid = NID_des_ede_ofb64, @@ -320,7 +318,6 @@ EVP_des_ede_ofb(void) { return &des_ede_ofb; } -LCRYPTO_ALIAS(EVP_des_ede_ofb); static const EVP_CIPHER des_ede_ecb = { .nid = NID_des_ede_ecb, @@ -343,7 +340,6 @@ EVP_des_ede_ecb(void) { return &des_ede_ecb; } -LCRYPTO_ALIAS(EVP_des_ede_ecb); #define des_ede3_cfb64_cipher des_ede_cfb64_cipher @@ -372,7 +368,6 @@ EVP_des_ede3_cbc(void) { return &des_ede3_cbc; } -LCRYPTO_ALIAS(EVP_des_ede3_cbc); static const EVP_CIPHER des_ede3_cfb64 = { .nid = NID_des_ede3_cfb64, @@ -395,7 +390,6 @@ EVP_des_ede3_cfb64(void) { return &des_ede3_cfb64; } -LCRYPTO_ALIAS(EVP_des_ede3_cfb64); static const EVP_CIPHER des_ede3_ofb = { .nid = NID_des_ede3_ofb64, @@ -418,7 +412,6 @@ EVP_des_ede3_ofb(void) { return &des_ede3_ofb; } -LCRYPTO_ALIAS(EVP_des_ede3_ofb); static const EVP_CIPHER des_ede3_ecb = { .nid = NID_des_ede3_ecb, @@ -441,7 +434,6 @@ EVP_des_ede3_ecb(void) { return &des_ede3_ecb; } -LCRYPTO_ALIAS(EVP_des_ede3_ecb); static const EVP_CIPHER des_ede3_cfb1 = { @@ -465,7 +457,6 @@ EVP_des_ede3_cfb1(void) { return &des_ede3_cfb1; } -LCRYPTO_ALIAS(EVP_des_ede3_cfb1); static const EVP_CIPHER des_ede3_cfb8 = { @@ -489,19 +480,16 @@ EVP_des_ede3_cfb8(void) { return &des_ede3_cfb8; } -LCRYPTO_ALIAS(EVP_des_ede3_cfb8); const EVP_CIPHER * EVP_des_ede(void) { return &des_ede_ecb; } -LCRYPTO_ALIAS(EVP_des_ede); const EVP_CIPHER * EVP_des_ede3(void) { return &des_ede3_ecb; } -LCRYPTO_ALIAS(EVP_des_ede3); #endif diff --git a/lib/libcrypto/evp/e_gost2814789.c b/lib/libcrypto/evp/e_gost2814789.c index fdbc6628100..359cf5e4caf 100644 --- a/lib/libcrypto/evp/e_gost2814789.c +++ b/lib/libcrypto/evp/e_gost2814789.c @@ -1,4 +1,4 @@ -/* $OpenBSD: e_gost2814789.c,v 1.12 2023/07/07 13:54:45 beck Exp $ */ +/* $OpenBSD: e_gost2814789.c,v 1.13 2023/07/07 19:37:53 beck Exp $ */ /* * Copyright (c) 2014 Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> * Copyright (c) 2005-2006 Cryptocom LTD @@ -268,7 +268,6 @@ EVP_gost2814789_ecb(void) { return &gost2814789_ecb; } -LCRYPTO_ALIAS(EVP_gost2814789_ecb); static const EVP_CIPHER gost2814789_cfb64 = { .nid = NID_gost89_cfb64, @@ -291,7 +290,6 @@ EVP_gost2814789_cfb64(void) { return &gost2814789_cfb64; } -LCRYPTO_ALIAS(EVP_gost2814789_cfb64); static const EVP_CIPHER gost2814789_cnt = { .nid = NID_gost89_cnt, @@ -314,5 +312,4 @@ EVP_gost2814789_cnt(void) { return &gost2814789_cnt; } -LCRYPTO_ALIAS(EVP_gost2814789_cnt); #endif diff --git a/lib/libcrypto/evp/e_idea.c b/lib/libcrypto/evp/e_idea.c index e330888ba6b..b2129dc990b 100644 --- a/lib/libcrypto/evp/e_idea.c +++ b/lib/libcrypto/evp/e_idea.c @@ -1,4 +1,4 @@ -/* $OpenBSD: e_idea.c,v 1.19 2023/07/07 13:54:45 beck Exp $ */ +/* $OpenBSD: e_idea.c,v 1.20 2023/07/07 19:37:53 beck Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -197,7 +197,6 @@ EVP_idea_cbc(void) { return &idea_cbc; } -LCRYPTO_ALIAS(EVP_idea_cbc); static const EVP_CIPHER idea_cfb64 = { .nid = NID_idea_cfb64, @@ -220,7 +219,6 @@ EVP_idea_cfb64(void) { return &idea_cfb64; } -LCRYPTO_ALIAS(EVP_idea_cfb64); static const EVP_CIPHER idea_ofb = { .nid = NID_idea_ofb64, @@ -243,7 +241,6 @@ EVP_idea_ofb(void) { return &idea_ofb; } -LCRYPTO_ALIAS(EVP_idea_ofb); static const EVP_CIPHER idea_ecb = { .nid = NID_idea_ecb, @@ -266,5 +263,4 @@ EVP_idea_ecb(void) { return &idea_ecb; } -LCRYPTO_ALIAS(EVP_idea_ecb); #endif diff --git a/lib/libcrypto/evp/e_null.c b/lib/libcrypto/evp/e_null.c index 3daadb1479b..f30c207ff6a 100644 --- a/lib/libcrypto/evp/e_null.c +++ b/lib/libcrypto/evp/e_null.c @@ -1,4 +1,4 @@ -/* $OpenBSD: e_null.c,v 1.17 2023/07/07 13:54:45 beck Exp $ */ +/* $OpenBSD: e_null.c,v 1.18 2023/07/07 19:37:53 beck Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -88,7 +88,6 @@ EVP_enc_null(void) { return (&n_cipher); } -LCRYPTO_ALIAS(EVP_enc_null); static int null_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, diff --git a/lib/libcrypto/evp/e_rc2.c b/lib/libcrypto/evp/e_rc2.c index 540c94cdfd5..32559e223f4 100644 --- a/lib/libcrypto/evp/e_rc2.c +++ b/lib/libcrypto/evp/e_rc2.c @@ -1,4 +1,4 @@ -/* $OpenBSD: e_rc2.c,v 1.21 2023/07/07 13:54:45 beck Exp $ */ +/* $OpenBSD: e_rc2.c,v 1.22 2023/07/07 19:37:53 beck Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -180,7 +180,6 @@ EVP_rc2_cbc(void) { return &rc2_cbc; } -LCRYPTO_ALIAS(EVP_rc2_cbc); static const EVP_CIPHER rc2_cfb64 = { .nid = NID_rc2_cfb64, @@ -203,7 +202,6 @@ EVP_rc2_cfb64(void) { return &rc2_cfb64; } -LCRYPTO_ALIAS(EVP_rc2_cfb64); static const EVP_CIPHER rc2_ofb = { .nid = NID_rc2_ofb64, @@ -226,7 +224,6 @@ EVP_rc2_ofb(void) { return &rc2_ofb; } -LCRYPTO_ALIAS(EVP_rc2_ofb); static const EVP_CIPHER rc2_ecb = { .nid = NID_rc2_ecb, @@ -249,7 +246,6 @@ EVP_rc2_ecb(void) { return &rc2_ecb; } -LCRYPTO_ALIAS(EVP_rc2_ecb); #define RC2_40_MAGIC 0xa0 #define RC2_64_MAGIC 0x78 @@ -288,14 +284,12 @@ EVP_rc2_64_cbc(void) { return (&r2_64_cbc_cipher); } -LCRYPTO_ALIAS(EVP_rc2_64_cbc); const EVP_CIPHER * EVP_rc2_40_cbc(void) { return (&r2_40_cbc_cipher); } -LCRYPTO_ALIAS(EVP_rc2_40_cbc); static int rc2_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, diff --git a/lib/libcrypto/evp/e_rc4.c b/lib/libcrypto/evp/e_rc4.c index d79bfa729a7..2503d370498 100644 --- a/lib/libcrypto/evp/e_rc4.c +++ b/lib/libcrypto/evp/e_rc4.c @@ -1,4 +1,4 @@ -/* $OpenBSD: e_rc4.c,v 1.16 2023/07/07 13:54:45 beck Exp $ */ +/* $OpenBSD: e_rc4.c,v 1.17 2023/07/07 19:37:53 beck Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -115,14 +115,12 @@ EVP_rc4(void) { return (&r4_cipher); } -LCRYPTO_ALIAS(EVP_rc4); const EVP_CIPHER * EVP_rc4_40(void) { return (&r4_40_cipher); } -LCRYPTO_ALIAS(EVP_rc4_40); static int rc4_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, diff --git a/lib/libcrypto/evp/e_rc4_hmac_md5.c b/lib/libcrypto/evp/e_rc4_hmac_md5.c index 1d0bced2dfd..bcf8daea607 100644 --- a/lib/libcrypto/evp/e_rc4_hmac_md5.c +++ b/lib/libcrypto/evp/e_rc4_hmac_md5.c @@ -1,4 +1,4 @@ -/* $OpenBSD: e_rc4_hmac_md5.c,v 1.11 2023/07/07 13:54:45 beck Exp $ */ +/* $OpenBSD: e_rc4_hmac_md5.c,v 1.12 2023/07/07 19:37:53 beck Exp $ */ /* ==================================================================== * Copyright (c) 2011 The OpenSSL Project. All rights reserved. * @@ -304,5 +304,4 @@ EVP_rc4_hmac_md5(void) { return (&r4_hmac_md5_cipher); } -LCRYPTO_ALIAS(EVP_rc4_hmac_md5); #endif diff --git a/lib/libcrypto/evp/e_sm4.c b/lib/libcrypto/evp/e_sm4.c index 705a914821b..c1664db3980 100644 --- a/lib/libcrypto/evp/e_sm4.c +++ b/lib/libcrypto/evp/e_sm4.c @@ -1,4 +1,4 @@ -/* $OpenBSD: e_sm4.c,v 1.8 2023/07/07 13:54:45 beck Exp $ */ +/* $OpenBSD: e_sm4.c,v 1.9 2023/07/07 19:37:53 beck Exp $ */ /* * Copyright (c) 2017, 2019 Ribose Inc * @@ -165,7 +165,6 @@ EVP_sm4_cbc(void) { return &sm4_cbc; } -LCRYPTO_ALIAS(EVP_sm4_cbc); static const EVP_CIPHER sm4_cfb128 = { .nid = NID_sm4_cfb128, @@ -188,7 +187,6 @@ EVP_sm4_cfb128(void) { return &sm4_cfb128; } -LCRYPTO_ALIAS(EVP_sm4_cfb128); static const EVP_CIPHER sm4_ofb = { .nid = NID_sm4_ofb128, @@ -211,7 +209,6 @@ EVP_sm4_ofb(void) { return &sm4_ofb; } -LCRYPTO_ALIAS(EVP_sm4_ofb); static const EVP_CIPHER sm4_ecb = { .nid = NID_sm4_ecb, @@ -234,7 +231,6 @@ EVP_sm4_ecb(void) { return &sm4_ecb; } -LCRYPTO_ALIAS(EVP_sm4_ecb); static int sm4_ctr_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, const unsigned char *in, @@ -268,5 +264,4 @@ EVP_sm4_ctr(void) { return &sm4_ctr_mode; } -LCRYPTO_ALIAS(EVP_sm4_ctr); #endif diff --git a/lib/libcrypto/evp/e_xcbc_d.c b/lib/libcrypto/evp/e_xcbc_d.c index c7810a2c22e..32f9f2eaa88 100644 --- a/lib/libcrypto/evp/e_xcbc_d.c +++ b/lib/libcrypto/evp/e_xcbc_d.c @@ -1,4 +1,4 @@ -/* $OpenBSD: e_xcbc_d.c,v 1.14 2023/07/07 13:54:45 beck Exp $ */ +/* $OpenBSD: e_xcbc_d.c,v 1.15 2023/07/07 19:37:53 beck Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -102,7 +102,6 @@ EVP_desx_cbc(void) { return (&d_xcbc_cipher); } -LCRYPTO_ALIAS(EVP_desx_cbc); static int desx_cbc_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, diff --git a/lib/libcrypto/evp/encode.c b/lib/libcrypto/evp/encode.c index 10cb51217a8..c62a1dea8fc 100644 --- a/lib/libcrypto/evp/encode.c +++ b/lib/libcrypto/evp/encode.c @@ -1,4 +1,4 @@ -/* $OpenBSD: encode.c,v 1.31 2023/07/07 13:54:45 beck Exp $ */ +/* $OpenBSD: encode.c,v 1.32 2023/07/07 19:37:53 beck Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -128,14 +128,12 @@ EVP_ENCODE_CTX_new(void) { return calloc(1, sizeof(EVP_ENCODE_CTX)); } -LCRYPTO_ALIAS(EVP_ENCODE_CTX_new); void EVP_ENCODE_CTX_free(EVP_ENCODE_CTX *ctx) { free(ctx); } -LCRYPTO_ALIAS(EVP_ENCODE_CTX_free); void EVP_EncodeInit(EVP_ENCODE_CTX *ctx) @@ -144,7 +142,6 @@ EVP_EncodeInit(EVP_ENCODE_CTX *ctx) ctx->num = 0; ctx->line_num = 0; } -LCRYPTO_ALIAS(EVP_EncodeInit); int EVP_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, return 1; } -LCRYPTO_ALIAS(EVP_EncodeUpdate); void EVP_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) } *outl = ret; } -LCRYPTO_ALIAS(EVP_EncodeFinal); int EVP_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) *t = '\0'; return (ret); } -LCRYPTO_ALIAS(EVP_EncodeBlock); void EVP_DecodeInit(EVP_ENCODE_CTX *ctx) @@ -253,7 +247,6 @@ EVP_DecodeInit(EVP_ENCODE_CTX *ctx) ctx->line_num = 0; ctx->expect_nl = 0; } -LCRYPTO_ALIAS(EVP_DecodeInit); int EVP_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, ctx->num = n; return (rv); } -LCRYPTO_ALIAS(EVP_DecodeUpdate); int EVP_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) } return (ret); } -LCRYPTO_ALIAS(EVP_DecodeBlock); int EVP_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) } else return (1); } -LCRYPTO_ALIAS(EVP_DecodeFinal); diff --git a/lib/libcrypto/evp/evp_aead.c b/lib/libcrypto/evp/evp_aead.c index 8b39c7f9238..3579533e5b6 100644 --- a/lib/libcrypto/evp/evp_aead.c +++ b/lib/libcrypto/evp/evp_aead.c @@ -1,4 +1,4 @@ -/* $OpenBSD: evp_aead.c,v 1.9 2023/07/07 13:54:45 beck Exp $ */ +/* $OpenBSD: evp_aead.c,v 1.10 2023/07/07 19:37:53 beck Exp $ */ /* * Copyright (c) 2014, Google Inc. * @@ -28,28 +28,24 @@ EVP_AEAD_key_length(const EVP_AEAD *aead) { return aead->key_len; } -LCRYPTO_ALIAS(EVP_AEAD_key_length); size_t EVP_AEAD_nonce_length(const EVP_AEAD *aead) { return aead->nonce_len; } -LCRYPTO_ALIAS(EVP_AEAD_nonce_length); size_t EVP_AEAD_max_overhead(const EVP_AEAD *aead) { return aead->overhead; } -LCRYPTO_ALIAS(EVP_AEAD_max_overhead); size_t EVP_AEAD_max_tag_len(const EVP_AEAD *aead) { return aead->max_tag_len; } -LCRYPTO_ALIAS(EVP_AEAD_max_tag_len); int EVP_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, } return aead->init(ctx, key, key_len, tag_len); } -LCRYPTO_ALIAS(EVP_AEAD_CTX_init); void EVP_AEAD_CTX_cleanup(EVP_AEAD_CTX *ctx) @@ -72,14 +67,12 @@ EVP_AEAD_CTX_cleanup(EVP_AEAD_CTX *ctx) ctx->aead->cleanup(ctx); ctx->aead = NULL; } -LCRYPTO_ALIAS(EVP_AEAD_CTX_cleanup); EVP_AEAD_CTX * EVP_AEAD_CTX_new(void) { return calloc(1, sizeof(EVP_AEAD_CTX)); } -LCRYPTO_ALIAS(EVP_AEAD_CTX_new); void EVP_AEAD_CTX_free(EVP_AEAD_CTX *ctx) @@ -90,7 +83,6 @@ EVP_AEAD_CTX_free(EVP_AEAD_CTX *ctx) EVP_AEAD_CTX_cleanup(ctx); free(ctx); } -LCRYPTO_ALIAS(EVP_AEAD_CTX_free); /* check_alias returns 0 if out points within the buffer determined by in * and in_len and 1 otherwise. @@ -141,7 +133,6 @@ error: *out_len = 0; return 0; } -LCRYPTO_ALIAS(EVP_AEAD_CTX_seal); int EVP_AEAD_CTX_open(const EVP_AEAD_CTX *ctx, unsigned char *out, size_t *out_len, @@ -167,4 +158,3 @@ error: *out_len = 0; return 0; } -LCRYPTO_ALIAS(EVP_AEAD_CTX_open); diff --git a/lib/libcrypto/evp/evp_enc.c b/lib/libcrypto/evp/evp_enc.c index f9b8deddf59..27f753baa07 100644 --- a/lib/libcrypto/evp/evp_enc.c +++ b/lib/libcrypto/evp/evp_enc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: evp_enc.c,v 1.51 2023/07/07 13:54:45 beck Exp $ */ +/* $OpenBSD: evp_enc.c,v 1.52 2023/07/07 19:37:53 beck Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -82,7 +82,6 @@ EVP_CipherInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher, EVP_CIPHER_CTX_init(ctx); return EVP_CipherInit_ex(ctx, cipher, NULL, key, iv, enc); } -LCRYPTO_ALIAS(EVP_CipherInit); int EVP_CipherInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher, ENGINE *impl, @@ -231,7 +230,6 @@ skip_to_init: ctx->block_mask = ctx->cipher->block_size - 1; return 1; } -LCRYPTO_ALIAS(EVP_CipherInit_ex); int EVP_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, else return EVP_DecryptUpdate(ctx, out, outl, in, inl); } -LCRYPTO_ALIAS(EVP_CipherUpdate); int EVP_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) else return EVP_DecryptFinal_ex(ctx, out, outl); } -LCRYPTO_ALIAS(EVP_CipherFinal_ex); __warn_references(EVP_CipherFinal, "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) ret = EVP_DecryptFinal_ex(ctx, out, outl); return ret; } -LCRYPTO_ALIAS(EVP_CipherFinal); int EVP_EncryptInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher, @@ -275,7 +270,6 @@ EVP_EncryptInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher, { return EVP_CipherInit(ctx, cipher, key, iv, 1); } -LCRYPTO_ALIAS(EVP_EncryptInit); int EVP_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, { return EVP_CipherInit_ex(ctx, cipher, impl, key, iv, 1); } -LCRYPTO_ALIAS(EVP_EncryptInit_ex); int EVP_DecryptInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher, @@ -291,7 +284,6 @@ EVP_DecryptInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher, { return EVP_CipherInit(ctx, cipher, key, iv, 0); } -LCRYPTO_ALIAS(EVP_DecryptInit); int EVP_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, { return EVP_CipherInit_ex(ctx, cipher, impl, key, iv, 0); } -LCRYPTO_ALIAS(EVP_DecryptInit_ex); int EVP_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, ctx->buf_len = i; return 1; } -LCRYPTO_ALIAS(EVP_EncryptUpdate); __warn_references(EVP_EncryptFinal, "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) ret = EVP_EncryptFinal_ex(ctx, out, outl); return ret; } -LCRYPTO_ALIAS(EVP_EncryptFinal); int EVP_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) return ret; } -LCRYPTO_ALIAS(EVP_EncryptFinal_ex); int EVP_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, return 1; } -LCRYPTO_ALIAS(EVP_DecryptUpdate); __warn_references(EVP_DecryptFinal, "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) ret = EVP_DecryptFinal_ex(ctx, out, outl); return ret; } -LCRYPTO_ALIAS(EVP_DecryptFinal); int EVP_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) *outl = 0; return (1); } -LCRYPTO_ALIAS(EVP_DecryptFinal_ex); EVP_CIPHER_CTX * EVP_CIPHER_CTX_new(void) { return calloc(1, sizeof(EVP_CIPHER_CTX)); } -LCRYPTO_ALIAS(EVP_CIPHER_CTX_new); void EVP_CIPHER_CTX_free(EVP_CIPHER_CTX *ctx) @@ -600,21 +584,18 @@ EVP_CIPHER_CTX_free(EVP_CIPHER_CTX *ctx) free(ctx); } -LCRYPTO_ALIAS(EVP_CIPHER_CTX_free); void EVP_CIPHER_CTX_init(EVP_CIPHER_CTX *ctx) { memset(ctx, 0, sizeof(EVP_CIPHER_CTX)); } -LCRYPTO_ALIAS(EVP_CIPHER_CTX_init); int EVP_CIPHER_CTX_reset(EVP_CIPHER_CTX *a) { return EVP_CIPHER_CTX_cleanup(a); } -LCRYPTO_ALIAS(EVP_CIPHER_CTX_reset); int EVP_CIPHER_CTX_cleanup(EVP_CIPHER_CTX *c) @@ -638,7 +619,6 @@ EVP_CIPHER_CTX_cleanup(EVP_CIPHER_CTX *c) return 1; } -LCRYPTO_ALIAS(EVP_CIPHER_CTX_cleanup); int EVP_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) EVPerror(EVP_R_INVALID_KEY_LENGTH); return 0; } -LCRYPTO_ALIAS(EVP_CIPHER_CTX_set_key_length); int EVP_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) ctx->flags |= EVP_CIPH_NO_PADDING; return 1; } -LCRYPTO_ALIAS(EVP_CIPHER_CTX_set_padding); int EVP_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) } return ret; } -LCRYPTO_ALIAS(EVP_CIPHER_CTX_ctrl); int EVP_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) arc4random_buf(key, ctx->key_len); return 1; } -LCRYPTO_ALIAS(EVP_CIPHER_CTX_rand_key); int EVP_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) return 1; } -LCRYPTO_ALIAS(EVP_CIPHER_CTX_copy); diff --git a/lib/libcrypto/evp/evp_err.c b/lib/libcrypto/evp/evp_err.c index 8835215c143..039e17e6cf6 100644 --- a/lib/libcrypto/evp/evp_err.c +++ b/lib/libcrypto/evp/evp_err.c @@ -1,4 +1,4 @@ -/* $OpenBSD: evp_err.c,v 1.31 2023/07/07 13:54:45 beck Exp $ */ +/* $OpenBSD: evp_err.c,v 1.32 2023/07/07 19:37:53 beck Exp $ */ /* ==================================================================== * Copyright (c) 1999-2011 The OpenSSL Project. All rights reserved. * @@ -164,4 +164,3 @@ ERR_load_EVP_strings(void) } #endif } -LCRYPTO_ALIAS(ERR_load_EVP_strings); diff --git a/lib/libcrypto/evp/evp_key.c b/lib/libcrypto/evp/evp_key.c index 148fd2fe92e..2f6e7e70cc2 100644 --- a/lib/libcrypto/evp/evp_key.c +++ b/lib/libcrypto/evp/evp_key.c @@ -1,4 +1,4 @@ -/* $OpenBSD: evp_key.c,v 1.29 2023/07/07 13:54:45 beck Exp $ */ +/* $OpenBSD: evp_key.c,v 1.30 2023/07/07 19:37:53 beck Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -79,7 +79,6 @@ EVP_set_pw_prompt(const char *prompt) strlcpy(prompt_string, prompt, sizeof(prompt_string)); } } -LCRYPTO_ALIAS(EVP_set_pw_prompt); char * EVP_get_pw_prompt(void) @@ -89,14 +88,12 @@ EVP_get_pw_prompt(void) else return (prompt_string); } -LCRYPTO_ALIAS(EVP_get_pw_prompt); int EVP_read_pw_string(char *buf, int len, const char *prompt, int verify) { return EVP_read_pw_string_min(buf, 0, len, prompt, verify); } -LCRYPTO_ALIAS(EVP_read_pw_string); int EVP_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, explicit_bzero(buff, BUFSIZ); return ret; } -LCRYPTO_ALIAS(EVP_read_pw_string_min); int EVP_BytesToKey(const EVP_CIPHER *type, const EVP_MD *md, @@ -214,4 +210,3 @@ err: explicit_bzero(md_buf, sizeof md_buf); return rv; } -LCRYPTO_ALIAS(EVP_BytesToKey); diff --git a/lib/libcrypto/evp/evp_lib.c b/lib/libcrypto/evp/evp_lib.c index d6b929c0e30..24ce1963dfb 100644 --- a/lib/libcrypto/evp/evp_lib.c +++ b/lib/libcrypto/evp/evp_lib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: evp_lib.c,v 1.26 2023/07/07 13:54:45 beck Exp $ */ +/* $OpenBSD: evp_lib.c,v 1.27 2023/07/07 19:37:53 beck Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -79,7 +79,6 @@ EVP_CIPHER_param_to_asn1(EVP_CIPHER_CTX *c, ASN1_TYPE *type) ret = -1; return (ret); } -LCRYPTO_ALIAS(EVP_CIPHER_param_to_asn1); int EVP_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) ret = -1; return (ret); } -LCRYPTO_ALIAS(EVP_CIPHER_asn1_to_param); int EVP_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) } return (i); } -LCRYPTO_ALIAS(EVP_CIPHER_get_asn1_iv); int EVP_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) } return (i); } -LCRYPTO_ALIAS(EVP_CIPHER_set_asn1_iv); /* Convert the various cipher NIDs and dummies to a proper OID NID */ int @@ -188,21 +184,18 @@ EVP_CIPHER_type(const EVP_CIPHER *ctx) return nid; } } -LCRYPTO_ALIAS(EVP_CIPHER_type); int EVP_CIPHER_block_size(const EVP_CIPHER *e) { return e->block_size; } -LCRYPTO_ALIAS(EVP_CIPHER_block_size); int EVP_CIPHER_CTX_block_size(const EVP_CIPHER_CTX *ctx) { return ctx->cipher->block_size; } -LCRYPTO_ALIAS(EVP_CIPHER_CTX_block_size); int EVP_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, { return ctx->cipher->do_cipher(ctx, out, in, inl); } -LCRYPTO_ALIAS(EVP_Cipher); const EVP_CIPHER * EVP_CIPHER_CTX_cipher(const EVP_CIPHER_CTX *ctx) { return ctx->cipher; } -LCRYPTO_ALIAS(EVP_CIPHER_CTX_cipher); int EVP_CIPHER_CTX_encrypting(const EVP_CIPHER_CTX *ctx) { return ctx->encrypt; } -LCRYPTO_ALIAS(EVP_CIPHER_CTX_encrypting); unsigned long EVP_CIPHER_flags(const EVP_CIPHER *cipher) { return cipher->flags; } -LCRYPTO_ALIAS(EVP_CIPHER_flags); unsigned long EVP_CIPHER_CTX_flags(const EVP_CIPHER_CTX *ctx) { return ctx->cipher->flags; } -LCRYPTO_ALIAS(EVP_CIPHER_CTX_flags); void * EVP_CIPHER_CTX_get_app_data(const EVP_CIPHER_CTX *ctx) { return ctx->app_data; } -LCRYPTO_ALIAS(EVP_CIPHER_CTX_get_app_data); void EVP_CIPHER_CTX_set_app_data(EVP_CIPHER_CTX *ctx, void *data) { ctx->app_data = data; } -LCRYPTO_ALIAS(EVP_CIPHER_CTX_set_app_data); void * EVP_CIPHER_CTX_get_cipher_data(const EVP_CIPHER_CTX *ctx) { return ctx->cipher_data; } -LCRYPTO_ALIAS(EVP_CIPHER_CTX_get_cipher_data); void * EVP_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) return old_cipher_data; } -LCRYPTO_ALIAS(EVP_CIPHER_CTX_set_cipher_data); int EVP_CIPHER_iv_length(const EVP_CIPHER *cipher) { return cipher->iv_len; } -LCRYPTO_ALIAS(EVP_CIPHER_iv_length); int EVP_CIPHER_CTX_iv_length(const EVP_CIPHER_CTX *ctx) { return ctx->cipher->iv_len; } -LCRYPTO_ALIAS(EVP_CIPHER_CTX_iv_length); unsigned char * EVP_CIPHER_CTX_buf_noconst(EVP_CIPHER_CTX *ctx) { return ctx->buf; } -LCRYPTO_ALIAS(EVP_CIPHER_CTX_buf_noconst); int EVP_CIPHER_key_length(const EVP_CIPHER *cipher) { return cipher->key_len; } -LCRYPTO_ALIAS(EVP_CIPHER_key_length); int EVP_CIPHER_CTX_key_length(const EVP_CIPHER_CTX *ctx) { return ctx->key_len; } -LCRYPTO_ALIAS(EVP_CIPHER_CTX_key_length); int EVP_CIPHER_nid(const EVP_CIPHER *cipher) { return cipher->nid; } -LCRYPTO_ALIAS(EVP_CIPHER_nid); int EVP_CIPHER_CTX_nid(const EVP_CIPHER_CTX *ctx) { return ctx->cipher->nid; } -LCRYPTO_ALIAS(EVP_CIPHER_CTX_nid); int EVP_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) } return 1; } -LCRYPTO_ALIAS(EVP_CIPHER_CTX_get_iv); int EVP_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) } return 1; } -LCRYPTO_ALIAS(EVP_CIPHER_CTX_set_iv); int EVP_MD_block_size(const EVP_MD *md) { return md->block_size; } -LCRYPTO_ALIAS(EVP_MD_block_size); int EVP_MD_type(const EVP_MD *md) { return md->type; } -LCRYPTO_ALIAS(EVP_MD_type); int EVP_MD_pkey_type(const EVP_MD *md) { return md->pkey_type; } -LCRYPTO_ALIAS(EVP_MD_pkey_type); int EVP_MD_size(const EVP_MD *md) @@ -392,14 +364,12 @@ EVP_MD_size(const EVP_MD *md) } return md->md_size; } -LCRYPTO_ALIAS(EVP_MD_size); unsigned long EVP_MD_flags(const EVP_MD *md) { return md->flags; } -LCRYPTO_ALIAS(EVP_MD_flags); EVP_MD * EVP_MD_meth_new(int md_type, int pkey_type) @@ -414,7 +384,6 @@ EVP_MD_meth_new(int md_type, int pkey_type) return md; } -LCRYPTO_ALIAS(EVP_MD_meth_new); EVP_MD * EVP_MD_meth_dup(const EVP_MD *md) @@ -428,14 +397,12 @@ EVP_MD_meth_dup(const EVP_MD *md) return to; } -LCRYPTO_ALIAS(EVP_MD_meth_dup); void EVP_MD_meth_free(EVP_MD *md) { freezero(md, sizeof(*md)); } -LCRYPTO_ALIAS(EVP_MD_meth_free); int EVP_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) md->block_size = blocksize; return 1; } -LCRYPTO_ALIAS(EVP_MD_meth_set_input_blocksize); int EVP_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) md->md_size = result_size; return 1; } -LCRYPTO_ALIAS(EVP_MD_meth_set_result_size); int EVP_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) md->ctx_size = datasize; return 1; } -LCRYPTO_ALIAS(EVP_MD_meth_set_app_datasize); int EVP_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) md->flags = flags; return 1; } -LCRYPTO_ALIAS(EVP_MD_meth_set_flags); int EVP_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)) md->init = init; return 1; } -LCRYPTO_ALIAS(EVP_MD_meth_set_init); int EVP_MD_meth_set_update(EVP_MD *md, @@ -484,7 +446,6 @@ EVP_MD_meth_set_update(EVP_MD *md, md->update = update; return 1; } -LCRYPTO_ALIAS(EVP_MD_meth_set_update); int EVP_MD_meth_set_final(EVP_MD *md, @@ -493,7 +454,6 @@ EVP_MD_meth_set_final(EVP_MD *md, md->final = final; return 1; } -LCRYPTO_ALIAS(EVP_MD_meth_set_final); int EVP_MD_meth_set_copy(EVP_MD *md, @@ -502,7 +462,6 @@ EVP_MD_meth_set_copy(EVP_MD *md, md->copy = copy; return 1; } -LCRYPTO_ALIAS(EVP_MD_meth_set_copy); int EVP_MD_meth_set_cleanup(EVP_MD *md, @@ -511,7 +470,6 @@ EVP_MD_meth_set_cleanup(EVP_MD *md, md->cleanup = cleanup; return 1; } -LCRYPTO_ALIAS(EVP_MD_meth_set_cleanup); int EVP_MD_meth_set_ctrl(EVP_MD *md, @@ -520,7 +478,6 @@ EVP_MD_meth_set_ctrl(EVP_MD *md, md->md_ctrl = ctrl; return 1; } -LCRYPTO_ALIAS(EVP_MD_meth_set_ctrl); const EVP_MD * EVP_MD_CTX_md(const EVP_MD_CTX *ctx) @@ -529,21 +486,18 @@ EVP_MD_CTX_md(const EVP_MD_CTX *ctx) return NULL; return ctx->digest; } -LCRYPTO_ALIAS(EVP_MD_CTX_md); void * EVP_MD_CTX_md_data(const EVP_MD_CTX *ctx) { return ctx->md_data; } -LCRYPTO_ALIAS(EVP_MD_CTX_md_data); EVP_PKEY_CTX * EVP_MD_CTX_pkey_ctx(const EVP_MD_CTX *ctx) { return ctx->pctx; } -LCRYPTO_ALIAS(EVP_MD_CTX_pkey_ctx); void EVP_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) EVP_MD_CTX_set_flags(ctx, EVP_MD_CTX_FLAG_KEEP_PKEY_CTX); } } -LCRYPTO_ALIAS(EVP_MD_CTX_set_pkey_ctx); void EVP_MD_CTX_set_flags(EVP_MD_CTX *ctx, int flags) { ctx->flags |= flags; } -LCRYPTO_ALIAS(EVP_MD_CTX_set_flags); void EVP_MD_CTX_clear_flags(EVP_MD_CTX *ctx, int flags) { ctx->flags &= ~flags; } -LCRYPTO_ALIAS(EVP_MD_CTX_clear_flags); int EVP_MD_CTX_test_flags(const EVP_MD_CTX *ctx, int flags) { return (ctx->flags & flags); } -LCRYPTO_ALIAS(EVP_MD_CTX_test_flags); void EVP_CIPHER_CTX_set_flags(EVP_CIPHER_CTX *ctx, int flags) { ctx->flags |= flags; } -LCRYPTO_ALIAS(EVP_CIPHER_CTX_set_flags); void EVP_CIPHER_CTX_clear_flags(EVP_CIPHER_CTX *ctx, int flags) { ctx->flags &= ~flags; } -LCRYPTO_ALIAS(EVP_CIPHER_CTX_clear_flags); int EVP_CIPHER_CTX_test_flags(const EVP_CIPHER_CTX *ctx, int flags) { return (ctx->flags & flags); } -LCRYPTO_ALIAS(EVP_CIPHER_CTX_test_flags); diff --git a/lib/libcrypto/evp/evp_pbe.c b/lib/libcrypto/evp/evp_pbe.c index 5592521e620..4a23a98f8df 100644 --- a/lib/libcrypto/evp/evp_pbe.c +++ b/lib/libcrypto/evp/evp_pbe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: evp_pbe.c,v 1.28 2023/07/07 13:54:45 beck Exp $ */ +/* $OpenBSD: evp_pbe.c,v 1.29 2023/07/07 19:37:53 beck Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 1999. */ @@ -170,7 +170,6 @@ EVP_PBE_CipherInit(ASN1_OBJECT *pbe_obj, const char *pass, int passlen, } return 1; } -LCRYPTO_ALIAS(EVP_PBE_CipherInit); static int pbe2_cmp_BSEARCH_CMP_FN(const void *, const void *); static 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, } return 1; } -LCRYPTO_ALIAS(EVP_PBE_alg_add_type); int EVP_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, return EVP_PBE_alg_add_type(EVP_PBE_TYPE_OUTER, nid, cipher_nid, md_nid, keygen); } -LCRYPTO_ALIAS(EVP_PBE_alg_add); int EVP_PBE_find(int type, int pbe_nid, @@ -300,7 +297,6 @@ EVP_PBE_find(int type, int pbe_nid, *pkeygen = pbetmp->keygen; return 1; } -LCRYPTO_ALIAS(EVP_PBE_find); static void free_evp_pbe_ctl(EVP_PBE_CTL *pbe) @@ -314,4 +310,3 @@ EVP_PBE_cleanup(void) sk_EVP_PBE_CTL_pop_free(pbe_algs, free_evp_pbe_ctl); pbe_algs = NULL; } -LCRYPTO_ALIAS(EVP_PBE_cleanup); diff --git a/lib/libcrypto/evp/evp_pkey.c b/lib/libcrypto/evp/evp_pkey.c index 31a59e25367..9e29a1ae691 100644 --- a/lib/libcrypto/evp/evp_pkey.c +++ b/lib/libcrypto/evp/evp_pkey.c @@ -1,4 +1,4 @@ -/* $OpenBSD: evp_pkey.c,v 1.26 2023/07/07 13:54:45 beck Exp $ */ +/* $OpenBSD: evp_pkey.c,v 1.27 2023/07/07 19:37:53 beck Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 1999. */ @@ -105,7 +105,6 @@ error: EVP_PKEY_free(pkey); return NULL; } -LCRYPTO_ALIAS(EVP_PKCS82PKEY); /* Turn a private key into a PKCS8 structure */ @@ -139,7 +138,6 @@ error: PKCS8_PRIV_KEY_INFO_free(p8); return NULL; } -LCRYPTO_ALIAS(EVP_PKEY2PKCS8); /* EVP_PKEY attribute functions */ @@ -148,14 +146,12 @@ EVP_PKEY_get_attr_count(const EVP_PKEY *key) { return X509at_get_attr_count(key->attributes); } -LCRYPTO_ALIAS(EVP_PKEY_get_attr_count); int EVP_PKEY_get_attr_by_NID(const EVP_PKEY *key, int nid, int lastpos) { return X509at_get_attr_by_NID(key->attributes, nid, lastpos); } -LCRYPTO_ALIAS(EVP_PKEY_get_attr_by_NID); int EVP_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, { return X509at_get_attr_by_OBJ(key->attributes, obj, lastpos); } -LCRYPTO_ALIAS(EVP_PKEY_get_attr_by_OBJ); X509_ATTRIBUTE * EVP_PKEY_get_attr(const EVP_PKEY *key, int loc) { return X509at_get_attr(key->attributes, loc); } -LCRYPTO_ALIAS(EVP_PKEY_get_attr); X509_ATTRIBUTE * EVP_PKEY_delete_attr(EVP_PKEY *key, int loc) { return X509at_delete_attr(key->attributes, loc); } -LCRYPTO_ALIAS(EVP_PKEY_delete_attr); int EVP_PKEY_add1_attr(EVP_PKEY *key, X509_ATTRIBUTE *attr) @@ -186,7 +179,6 @@ EVP_PKEY_add1_attr(EVP_PKEY *key, X509_ATTRIBUTE *attr) return 1; return 0; } -LCRYPTO_ALIAS(EVP_PKEY_add1_attr); int EVP_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, return 1; return 0; } -LCRYPTO_ALIAS(EVP_PKEY_add1_attr_by_OBJ); int EVP_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, return 1; return 0; } -LCRYPTO_ALIAS(EVP_PKEY_add1_attr_by_NID); int EVP_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, return 1; return 0; } -LCRYPTO_ALIAS(EVP_PKEY_add1_attr_by_txt); diff --git a/lib/libcrypto/evp/m_gost2814789.c b/lib/libcrypto/evp/m_gost2814789.c index 69f927c5a70..9b8a09e5a4d 100644 --- a/lib/libcrypto/evp/m_gost2814789.c +++ b/lib/libcrypto/evp/m_gost2814789.c @@ -1,4 +1,4 @@ -/* $OpenBSD: m_gost2814789.c,v 1.5 2023/07/07 13:54:45 beck Exp $ */ +/* $OpenBSD: m_gost2814789.c,v 1.6 2023/07/07 19:37:53 beck Exp $ */ /* * Copyright (c) 2014 Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> * Copyright (c) 2005-2006 Cryptocom LTD @@ -110,5 +110,4 @@ EVP_gost2814789imit(void) { return (&gost2814789imit_md); } -LCRYPTO_ALIAS(EVP_gost2814789imit); #endif diff --git a/lib/libcrypto/evp/m_gostr341194.c b/lib/libcrypto/evp/m_gostr341194.c index e2a65a3147b..723349a0d8a 100644 --- a/lib/libcrypto/evp/m_gostr341194.c +++ b/lib/libcrypto/evp/m_gostr341194.c @@ -1,4 +1,4 @@ -/* $OpenBSD: m_gostr341194.c,v 1.6 2023/07/07 13:54:45 beck Exp $ */ +/* $OpenBSD: m_gostr341194.c,v 1.7 2023/07/07 19:37:53 beck Exp $ */ /* * Copyright (c) 2014 Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> * Copyright (c) 2005-2006 Cryptocom LTD @@ -97,5 +97,4 @@ EVP_gostr341194(void) { return (&gostr341194_md); } -LCRYPTO_ALIAS(EVP_gostr341194); #endif diff --git a/lib/libcrypto/evp/m_md4.c b/lib/libcrypto/evp/m_md4.c index d86ed426d3b..199dba84896 100644 --- a/lib/libcrypto/evp/m_md4.c +++ b/lib/libcrypto/evp/m_md4.c @@ -1,4 +1,4 @@ -/* $OpenBSD: m_md4.c,v 1.20 2023/07/07 13:54:45 beck Exp $ */ +/* $OpenBSD: m_md4.c,v 1.21 2023/07/07 19:37:53 beck Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -110,5 +110,4 @@ EVP_md4(void) { return (&md4_md); } -LCRYPTO_ALIAS(EVP_md4); #endif diff --git a/lib/libcrypto/evp/m_md5.c b/lib/libcrypto/evp/m_md5.c index 18a78016c6d..0dfad89aaf2 100644 --- a/lib/libcrypto/evp/m_md5.c +++ b/lib/libcrypto/evp/m_md5.c @@ -1,4 +1,4 @@ -/* $OpenBSD: m_md5.c,v 1.19 2023/07/07 13:54:45 beck Exp $ */ +/* $OpenBSD: m_md5.c,v 1.20 2023/07/07 19:37:53 beck Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -110,5 +110,4 @@ EVP_md5(void) { return (&md5_md); } -LCRYPTO_ALIAS(EVP_md5); #endif diff --git a/lib/libcrypto/evp/m_md5_sha1.c b/lib/libcrypto/evp/m_md5_sha1.c index 32a6f56a1b0..f4a6600ec61 100644 --- a/lib/libcrypto/evp/m_md5_sha1.c +++ b/lib/libcrypto/evp/m_md5_sha1.c @@ -1,4 +1,4 @@ -/* $OpenBSD: m_md5_sha1.c,v 1.6 2023/07/07 13:54:45 beck Exp $ */ +/* $OpenBSD: m_md5_sha1.c,v 1.7 2023/07/07 19:37:53 beck Exp $ */ /* * Copyright (c) 2017 Joel Sing <jsing@openbsd.org> * @@ -87,4 +87,3 @@ EVP_md5_sha1(void) { return &md5_sha1_md; } -LCRYPTO_ALIAS(EVP_md5_sha1); diff --git a/lib/libcrypto/evp/m_null.c b/lib/libcrypto/evp/m_null.c index 884a47927e5..28634d2da58 100644 --- a/lib/libcrypto/evp/m_null.c +++ b/lib/libcrypto/evp/m_null.c @@ -1,4 +1,4 @@ -/* $OpenBSD: m_null.c,v 1.13 2023/07/07 13:54:45 beck Exp $ */ +/* $OpenBSD: m_null.c,v 1.14 2023/07/07 19:37:53 beck Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -101,4 +101,3 @@ EVP_md_null(void) { return (&null_md); } -LCRYPTO_ALIAS(EVP_md_null); diff --git a/lib/libcrypto/evp/m_ripemd.c b/lib/libcrypto/evp/m_ripemd.c index 3cba1dcf1b4..638d0cd2743 100644 --- a/lib/libcrypto/evp/m_ripemd.c +++ b/lib/libcrypto/evp/m_ripemd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: m_ripemd.c,v 1.16 2023/07/07 13:54:45 beck Exp $ */ +/* $OpenBSD: m_ripemd.c,v 1.17 2023/07/07 19:37:53 beck Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -110,5 +110,4 @@ EVP_ripemd160(void) { return (&ripemd160_md); } -LCRYPTO_ALIAS(EVP_ripemd160); #endif diff --git a/lib/libcrypto/evp/m_sha1.c b/lib/libcrypto/evp/m_sha1.c index 631e19549e7..c65e0515c88 100644 --- a/lib/libcrypto/evp/m_sha1.c +++ b/lib/libcrypto/evp/m_sha1.c @@ -1,4 +1,4 @@ -/* $OpenBSD: m_sha1.c,v 1.24 2023/07/07 13:54:45 beck Exp $ */ +/* $OpenBSD: m_sha1.c,v 1.25 2023/07/07 19:37:53 beck Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -110,7 +110,6 @@ EVP_sha1(void) { return &sha1_md; } -LCRYPTO_ALIAS(EVP_sha1); #endif #ifndef OPENSSL_NO_SHA256 @@ -156,7 +155,6 @@ EVP_sha224(void) { return &sha224_md; } -LCRYPTO_ALIAS(EVP_sha224); static int sha256_init(EVP_MD_CTX *ctx) @@ -195,7 +193,6 @@ EVP_sha256(void) { return &sha256_md; } -LCRYPTO_ALIAS(EVP_sha256); #endif /* ifndef OPENSSL_NO_SHA256 */ #ifndef OPENSSL_NO_SHA512 @@ -237,7 +234,6 @@ EVP_sha384(void) { return &sha384_md; } -LCRYPTO_ALIAS(EVP_sha384); static int sha512_init(EVP_MD_CTX *ctx) @@ -276,7 +272,6 @@ EVP_sha512(void) { return &sha512_md; } -LCRYPTO_ALIAS(EVP_sha512); static int sha512_224_init(EVP_MD_CTX *ctx) @@ -315,7 +310,6 @@ EVP_sha512_224(void) { return &sha512_224_md; } -LCRYPTO_ALIAS(EVP_sha512_224); static int sha512_256_init(EVP_MD_CTX *ctx) @@ -354,5 +348,4 @@ EVP_sha512_256(void) { return &sha512_256_md; } -LCRYPTO_ALIAS(EVP_sha512_256); #endif /* ifndef OPENSSL_NO_SHA512 */ diff --git a/lib/libcrypto/evp/m_sha3.c b/lib/libcrypto/evp/m_sha3.c index 9137629823e..67f94f79569 100644 --- a/lib/libcrypto/evp/m_sha3.c +++ b/lib/libcrypto/evp/m_sha3.c @@ -1,4 +1,4 @@ -/* $OpenBSD: m_sha3.c,v 1.2 2023/07/07 13:54:45 beck Exp $ */ +/* $OpenBSD: m_sha3.c,v 1.3 2023/07/07 19:37:53 beck Exp $ */ /* * Copyright (c) 2023 Joel Sing <jsing@openbsd.org> * @@ -57,7 +57,6 @@ EVP_sha3_224(void) { return &sha3_224_md; } -LCRYPTO_ALIAS(EVP_sha3_224); static int sha3_256_init(EVP_MD_CTX *ctx) @@ -96,7 +95,6 @@ EVP_sha3_256(void) { return &sha3_256_md; } -LCRYPTO_ALIAS(EVP_sha3_256); static int sha3_384_init(EVP_MD_CTX *ctx) @@ -135,7 +133,6 @@ EVP_sha3_384(void) { return &sha3_384_md; } -LCRYPTO_ALIAS(EVP_sha3_384); static int sha3_512_init(EVP_MD_CTX *ctx) @@ -174,4 +171,3 @@ EVP_sha3_512(void) { return &sha3_512_md; } -LCRYPTO_ALIAS(EVP_sha3_512); diff --git a/lib/libcrypto/evp/m_sigver.c b/lib/libcrypto/evp/m_sigver.c index 950e4a2a2fc..47c01f784af 100644 --- a/lib/libcrypto/evp/m_sigver.c +++ b/lib/libcrypto/evp/m_sigver.c @@ -1,4 +1,4 @@ -/* $OpenBSD: m_sigver.c,v 1.12 2023/07/07 13:54:45 beck Exp $ */ +/* $OpenBSD: m_sigver.c,v 1.13 2023/07/07 19:37:53 beck Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 2006. */ @@ -133,7 +133,6 @@ EVP_DigestSignInit(EVP_MD_CTX *ctx, EVP_PKEY_CTX **pctx, const EVP_MD *type, { return do_sigver_init(ctx, pctx, type, e, pkey, 0); } -LCRYPTO_ALIAS(EVP_DigestSignInit); int EVP_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, { return do_sigver_init(ctx, pctx, type, e, pkey, 1); } -LCRYPTO_ALIAS(EVP_DigestVerifyInit); int EVP_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) } return 1; } -LCRYPTO_ALIAS(EVP_DigestSignFinal); int EVP_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, return EVP_DigestSignFinal(ctx, sigret, siglen); } -LCRYPTO_ALIAS(EVP_DigestSign); int EVP_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) return r; return EVP_PKEY_verify(ctx->pctx, sig, siglen, md, mdlen); } -LCRYPTO_ALIAS(EVP_DigestVerifyFinal); int EVP_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, return EVP_DigestVerifyFinal(ctx, sigret, siglen); } -LCRYPTO_ALIAS(EVP_DigestVerify); diff --git a/lib/libcrypto/evp/m_sm3.c b/lib/libcrypto/evp/m_sm3.c index 169a492d68b..ea30d8d2224 100644 --- a/lib/libcrypto/evp/m_sm3.c +++ b/lib/libcrypto/evp/m_sm3.c @@ -1,4 +1,4 @@ -/* $OpenBSD: m_sm3.c,v 1.5 2023/07/07 13:54:46 beck Exp $ */ +/* $OpenBSD: m_sm3.c,v 1.6 2023/07/07 19:37:53 beck Exp $ */ /* * Copyright (c) 2018, Ribose Inc * @@ -64,6 +64,5 @@ EVP_sm3(void) { return &sm3_md; } -LCRYPTO_ALIAS(EVP_sm3); #endif /* OPENSSL_NO_SM3 */ diff --git a/lib/libcrypto/evp/m_streebog.c b/lib/libcrypto/evp/m_streebog.c index ce41e4ca8f4..48fa65864e5 100644 --- a/lib/libcrypto/evp/m_streebog.c +++ b/lib/libcrypto/evp/m_streebog.c @@ -1,4 +1,4 @@ -/* $OpenBSD: m_streebog.c,v 1.6 2023/07/07 13:54:46 beck Exp $ */ +/* $OpenBSD: m_streebog.c,v 1.7 2023/07/07 19:37:54 beck Exp $ */ /* * Copyright (c) 2014 Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> * Copyright (c) 2005-2006 Cryptocom LTD @@ -124,12 +124,10 @@ EVP_streebog256(void) { return (&streebog256_md); } -LCRYPTO_ALIAS(EVP_streebog256); const EVP_MD * EVP_streebog512(void) { return (&streebog512_md); } -LCRYPTO_ALIAS(EVP_streebog512); #endif diff --git a/lib/libcrypto/evp/m_wp.c b/lib/libcrypto/evp/m_wp.c index 9bd43370e61..44d13b1484c 100644 --- a/lib/libcrypto/evp/m_wp.c +++ b/lib/libcrypto/evp/m_wp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: m_wp.c,v 1.12 2023/07/07 13:54:46 beck Exp $ */ +/* $OpenBSD: m_wp.c,v 1.13 2023/07/07 19:37:54 beck Exp $ */ #include <stdio.h> @@ -50,5 +50,4 @@ EVP_whirlpool(void) { return (&whirlpool_md); } -LCRYPTO_ALIAS(EVP_whirlpool); #endif diff --git a/lib/libcrypto/evp/names.c b/lib/libcrypto/evp/names.c index c6109a5356b..f7864f59584 100644 --- a/lib/libcrypto/evp/names.c +++ b/lib/libcrypto/evp/names.c @@ -1,4 +1,4 @@ -/* $OpenBSD: names.c,v 1.18 2023/07/07 13:54:46 beck Exp $ */ +/* $OpenBSD: names.c,v 1.19 2023/07/07 19:37:54 beck Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -84,7 +84,6 @@ EVP_add_cipher(const EVP_CIPHER *c) (const char *)c); return (r); } -LCRYPTO_ALIAS(EVP_add_cipher); int EVP_add_digest(const EVP_MD *md) @@ -113,7 +112,6 @@ EVP_add_digest(const EVP_MD *md) } return (r); } -LCRYPTO_ALIAS(EVP_add_digest); const EVP_CIPHER * EVP_get_cipherbyname(const char *name) @@ -126,7 +124,6 @@ EVP_get_cipherbyname(const char *name) cp = (const EVP_CIPHER *)OBJ_NAME_get(name, OBJ_NAME_TYPE_CIPHER_METH); return (cp); } -LCRYPTO_ALIAS(EVP_get_cipherbyname); const EVP_MD * EVP_get_digestbyname(const char *name) @@ -139,7 +136,6 @@ EVP_get_digestbyname(const char *name) cp = (const EVP_MD *)OBJ_NAME_get(name, OBJ_NAME_TYPE_MD_METH); return (cp); } -LCRYPTO_ALIAS(EVP_get_digestbyname); void EVP_cleanup(void) @@ -158,7 +154,6 @@ EVP_cleanup(void) } OBJ_sigid_free(); } -LCRYPTO_ALIAS(EVP_cleanup); struct doall_cipher { void *arg; @@ -190,7 +185,6 @@ EVP_CIPHER_do_all(void (*fn)(const EVP_CIPHER *ciph, const char *from, dc.arg = arg; OBJ_NAME_do_all(OBJ_NAME_TYPE_CIPHER_METH, do_all_cipher_fn, &dc); } -LCRYPTO_ALIAS(EVP_CIPHER_do_all); void EVP_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, OBJ_NAME_do_all_sorted(OBJ_NAME_TYPE_CIPHER_METH, do_all_cipher_fn, &dc); } -LCRYPTO_ALIAS(EVP_CIPHER_do_all_sorted); struct doall_md { void *arg; @@ -238,7 +231,6 @@ EVP_MD_do_all(void (*fn)(const EVP_MD *md, const char *from, const char *to, dc.arg = arg; OBJ_NAME_do_all(OBJ_NAME_TYPE_MD_METH, do_all_md_fn, &dc); } -LCRYPTO_ALIAS(EVP_MD_do_all); void EVP_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, dc.arg = arg; OBJ_NAME_do_all_sorted(OBJ_NAME_TYPE_MD_METH, do_all_md_fn, &dc); } -LCRYPTO_ALIAS(EVP_MD_do_all_sorted); diff --git a/lib/libcrypto/evp/p5_crpt.c b/lib/libcrypto/evp/p5_crpt.c index cf30ad91768..d26439ad260 100644 --- a/lib/libcrypto/evp/p5_crpt.c +++ b/lib/libcrypto/evp/p5_crpt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: p5_crpt.c,v 1.22 2023/07/07 13:54:46 beck Exp $ */ +/* $OpenBSD: p5_crpt.c,v 1.23 2023/07/07 19:37:54 beck Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 1999. */ @@ -73,7 +73,6 @@ void PKCS5_PBE_add(void) { } -LCRYPTO_ALIAS(PKCS5_PBE_add); int PKCS5_PBE_keyivgen(EVP_CIPHER_CTX *cctx, const char *pass, int passlen, @@ -162,4 +161,3 @@ err: PBEPARAM_free(pbe); return rv; } -LCRYPTO_ALIAS(PKCS5_PBE_keyivgen); diff --git a/lib/libcrypto/evp/p5_crpt2.c b/lib/libcrypto/evp/p5_crpt2.c index a6fcc30fa40..3c66af9314f 100644 --- a/lib/libcrypto/evp/p5_crpt2.c +++ b/lib/libcrypto/evp/p5_crpt2.c @@ -1,4 +1,4 @@ -/* $OpenBSD: p5_crpt2.c,v 1.26 2023/07/07 13:54:46 beck Exp $ */ +/* $OpenBSD: p5_crpt2.c,v 1.27 2023/07/07 19:37:54 beck Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 1999. */ @@ -149,7 +149,6 @@ PKCS5_PBKDF2_HMAC(const char *pass, int passlen, const unsigned char *salt, HMAC_CTX_cleanup(&hctx_tpl); return 1; } -LCRYPTO_ALIAS(PKCS5_PBKDF2_HMAC); int PKCS5_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, return PKCS5_PBKDF2_HMAC(pass, passlen, salt, saltlen, iter, EVP_sha1(), keylen, out); } -LCRYPTO_ALIAS(PKCS5_PBKDF2_HMAC_SHA1); /* Now the key derivation function itself. This is a bit evil because * it has to check the ASN1 parameters are valid: and there are quite a @@ -220,7 +218,6 @@ err: PBE2PARAM_free(pbe2); return rv; } -LCRYPTO_ALIAS(PKCS5_v2_PBE_keyivgen); int PKCS5_v2_PBKDF2_keyivgen(EVP_CIPHER_CTX *ctx, const char *pass, int passlen, diff --git a/lib/libcrypto/evp/p_dec.c b/lib/libcrypto/evp/p_dec.c index 7225606c313..d55b48b771c 100644 --- a/lib/libcrypto/evp/p_dec.c +++ b/lib/libcrypto/evp/p_dec.c @@ -1,4 +1,4 @@ -/* $OpenBSD: p_dec.c,v 1.14 2023/07/07 13:54:46 beck Exp $ */ +/* $OpenBSD: p_dec.c,v 1.15 2023/07/07 19:37:54 beck Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -92,4 +92,3 @@ err: #endif return (ret); } -LCRYPTO_ALIAS(EVP_PKEY_decrypt_old); diff --git a/lib/libcrypto/evp/p_enc.c b/lib/libcrypto/evp/p_enc.c index c2a16234e87..1abaf0b2685 100644 --- a/lib/libcrypto/evp/p_enc.c +++ b/lib/libcrypto/evp/p_enc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: p_enc.c,v 1.14 2023/07/07 13:54:46 beck Exp $ */ +/* $OpenBSD: p_enc.c,v 1.15 2023/07/07 19:37:54 beck Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -89,4 +89,3 @@ err: #endif return (ret); } -LCRYPTO_ALIAS(EVP_PKEY_encrypt_old); diff --git a/lib/libcrypto/evp/p_lib.c b/lib/libcrypto/evp/p_lib.c index 325fb605dfd..85e7978ff4f 100644 --- a/lib/libcrypto/evp/p_lib.c +++ b/lib/libcrypto/evp/p_lib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: p_lib.c,v 1.33 2023/07/07 13:54:46 beck Exp $ */ +/* $OpenBSD: p_lib.c,v 1.34 2023/07/07 19:37:54 beck Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -93,7 +93,6 @@ EVP_PKEY_bits(const EVP_PKEY *pkey) return pkey->ameth->pkey_bits(pkey); return 0; } -LCRYPTO_ALIAS(EVP_PKEY_bits); int EVP_PKEY_security_bits(const EVP_PKEY *pkey) @@ -105,7 +104,6 @@ EVP_PKEY_security_bits(const EVP_PKEY *pkey) return pkey->ameth->pkey_security_bits(pkey); } -LCRYPTO_ALIAS(EVP_PKEY_security_bits); int EVP_PKEY_size(const EVP_PKEY *pkey) @@ -114,7 +112,6 @@ EVP_PKEY_size(const EVP_PKEY *pkey) return pkey->ameth->pkey_size(pkey); return 0; } -LCRYPTO_ALIAS(EVP_PKEY_size); int EVP_PKEY_save_parameters(EVP_PKEY *pkey, int mode) @@ -139,7 +136,6 @@ EVP_PKEY_save_parameters(EVP_PKEY *pkey, int mode) #endif return (0); } -LCRYPTO_ALIAS(EVP_PKEY_save_parameters); int EVP_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) err: return 0; } -LCRYPTO_ALIAS(EVP_PKEY_copy_parameters); int EVP_PKEY_missing_parameters(const EVP_PKEY *pkey) @@ -168,7 +163,6 @@ EVP_PKEY_missing_parameters(const EVP_PKEY *pkey) return pkey->ameth->param_missing(pkey); return 0; } -LCRYPTO_ALIAS(EVP_PKEY_missing_parameters); int EVP_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) return a->ameth->param_cmp(a, b); return -2; } -LCRYPTO_ALIAS(EVP_PKEY_cmp_parameters); int EVP_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) return -2; } -LCRYPTO_ALIAS(EVP_PKEY_cmp); EVP_PKEY * EVP_PKEY_new(void) @@ -224,7 +216,6 @@ EVP_PKEY_new(void) ret->save_parameters = 1; return (ret); } -LCRYPTO_ALIAS(EVP_PKEY_new); int EVP_PKEY_up_ref(EVP_PKEY *pkey) @@ -232,7 +223,6 @@ EVP_PKEY_up_ref(EVP_PKEY *pkey) int refs = CRYPTO_add(&pkey->references, 1, CRYPTO_LOCK_EVP_PKEY); return ((refs > 1) ? 1 : 0); } -LCRYPTO_ALIAS(EVP_PKEY_up_ref); /* Setup a public key ASN1 method and ENGINE from a NID or a string. * 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) { return pkey_set_type(pkey, NULL, type, NULL, -1); } -LCRYPTO_ALIAS(EVP_PKEY_set_type); EVP_PKEY * EVP_PKEY_new_raw_private_key(int type, ENGINE *engine, @@ -317,7 +306,6 @@ EVP_PKEY_new_raw_private_key(int type, ENGINE *engine, return NULL; } -LCRYPTO_ALIAS(EVP_PKEY_new_raw_private_key); EVP_PKEY * EVP_PKEY_new_raw_public_key(int type, ENGINE *engine, @@ -347,7 +335,6 @@ EVP_PKEY_new_raw_public_key(int type, ENGINE *engine, return NULL; } -LCRYPTO_ALIAS(EVP_PKEY_new_raw_public_key); int EVP_PKEY_get_raw_private_key(const EVP_PKEY *pkey, @@ -364,7 +351,6 @@ EVP_PKEY_get_raw_private_key(const EVP_PKEY *pkey, return 1; } -LCRYPTO_ALIAS(EVP_PKEY_get_raw_private_key); int EVP_PKEY_get_raw_public_key(const EVP_PKEY *pkey, @@ -381,7 +367,6 @@ EVP_PKEY_get_raw_public_key(const EVP_PKEY *pkey, return 1; } -LCRYPTO_ALIAS(EVP_PKEY_get_raw_public_key); EVP_PKEY * EVP_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, CMAC_CTX_free(cmctx); return NULL; } -LCRYPTO_ALIAS(EVP_PKEY_new_CMAC_key); int EVP_PKEY_set_type_str(EVP_PKEY *pkey, const char *str, int len) { return pkey_set_type(pkey, NULL, EVP_PKEY_NONE, str, len); } -LCRYPTO_ALIAS(EVP_PKEY_set_type_str); int EVP_PKEY_assign(EVP_PKEY *pkey, int type, void *key) @@ -429,14 +412,12 @@ EVP_PKEY_assign(EVP_PKEY *pkey, int type, void *key) pkey->pkey.ptr = key; return (key != NULL); } -LCRYPTO_ALIAS(EVP_PKEY_assign); void * EVP_PKEY_get0(const EVP_PKEY *pkey) { return pkey->pkey.ptr; } -LCRYPTO_ALIAS(EVP_PKEY_get0); const unsigned char * EVP_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) return os->data; } -LCRYPTO_ALIAS(EVP_PKEY_get0_hmac); #ifndef OPENSSL_NO_RSA RSA * @@ -465,7 +445,6 @@ EVP_PKEY_get0_RSA(EVP_PKEY *pkey) } return pkey->pkey.rsa; } -LCRYPTO_ALIAS(EVP_PKEY_get0_RSA); RSA * EVP_PKEY_get1_RSA(EVP_PKEY *pkey) @@ -477,7 +456,6 @@ EVP_PKEY_get1_RSA(EVP_PKEY *pkey) RSA_up_ref(pkey->pkey.rsa); return pkey->pkey.rsa; } -LCRYPTO_ALIAS(EVP_PKEY_get1_RSA); int EVP_PKEY_set1_RSA(EVP_PKEY *pkey, RSA *key) @@ -487,7 +465,6 @@ EVP_PKEY_set1_RSA(EVP_PKEY *pkey, RSA *key) RSA_up_ref(key); return ret; } -LCRYPTO_ALIAS(EVP_PKEY_set1_RSA); #endif #ifndef OPENSSL_NO_DSA @@ -500,7 +477,6 @@ EVP_PKEY_get0_DSA(EVP_PKEY *pkey) } return pkey->pkey.dsa; } -LCRYPTO_ALIAS(EVP_PKEY_get0_DSA); DSA * EVP_PKEY_get1_DSA(EVP_PKEY *pkey) @@ -512,7 +488,6 @@ EVP_PKEY_get1_DSA(EVP_PKEY *pkey) DSA_up_ref(pkey->pkey.dsa); return pkey->pkey.dsa; } -LCRYPTO_ALIAS(EVP_PKEY_get1_DSA); int EVP_PKEY_set1_DSA(EVP_PKEY *pkey, DSA *key) @@ -522,7 +497,6 @@ EVP_PKEY_set1_DSA(EVP_PKEY *pkey, DSA *key) DSA_up_ref(key); return ret; } -LCRYPTO_ALIAS(EVP_PKEY_set1_DSA); #endif #ifndef OPENSSL_NO_EC @@ -535,7 +509,6 @@ EVP_PKEY_get0_EC_KEY(EVP_PKEY *pkey) } return pkey->pkey.ec; } -LCRYPTO_ALIAS(EVP_PKEY_get0_EC_KEY); EC_KEY * EVP_PKEY_get1_EC_KEY(EVP_PKEY *pkey) @@ -547,7 +520,6 @@ EVP_PKEY_get1_EC_KEY(EVP_PKEY *pkey) EC_KEY_up_ref(pkey->pkey.ec); return pkey->pkey.ec; } -LCRYPTO_ALIAS(EVP_PKEY_get1_EC_KEY); int EVP_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) EC_KEY_up_ref(key); return ret; } -LCRYPTO_ALIAS(EVP_PKEY_set1_EC_KEY); #endif @@ -571,7 +542,6 @@ EVP_PKEY_get0_DH(EVP_PKEY *pkey) } return pkey->pkey.dh; } -LCRYPTO_ALIAS(EVP_PKEY_get0_DH); DH * EVP_PKEY_get1_DH(EVP_PKEY *pkey) @@ -583,7 +553,6 @@ EVP_PKEY_get1_DH(EVP_PKEY *pkey) DH_up_ref(pkey->pkey.dh); return pkey->pkey.dh; } -LCRYPTO_ALIAS(EVP_PKEY_get1_DH); int EVP_PKEY_set1_DH(EVP_PKEY *pkey, DH *key) @@ -593,7 +562,6 @@ EVP_PKEY_set1_DH(EVP_PKEY *pkey, DH *key) DH_up_ref(key); return ret; } -LCRYPTO_ALIAS(EVP_PKEY_set1_DH); #endif int @@ -612,21 +580,18 @@ EVP_PKEY_type(int type) #endif return ret; } -LCRYPTO_ALIAS(EVP_PKEY_type); int EVP_PKEY_id(const EVP_PKEY *pkey) { return pkey->type; } -LCRYPTO_ALIAS(EVP_PKEY_id); int EVP_PKEY_base_id(const EVP_PKEY *pkey) { return EVP_PKEY_type(pkey->type); } -LCRYPTO_ALIAS(EVP_PKEY_base_id); void EVP_PKEY_free(EVP_PKEY *x) @@ -645,7 +610,6 @@ EVP_PKEY_free(EVP_PKEY *x) sk_X509_ATTRIBUTE_pop_free(x->attributes, X509_ATTRIBUTE_free); free(x); } -LCRYPTO_ALIAS(EVP_PKEY_free); static void EVP_PKEY_free_it(EVP_PKEY *x) @@ -679,7 +643,6 @@ EVP_PKEY_print_public(BIO *out, const EVP_PKEY *pkey, int indent, return unsup_alg(out, pkey, indent, "Public Key"); } -LCRYPTO_ALIAS(EVP_PKEY_print_public); int EVP_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, return unsup_alg(out, pkey, indent, "Private Key"); } -LCRYPTO_ALIAS(EVP_PKEY_print_private); int EVP_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, return pkey->ameth->param_print(out, pkey, indent, pctx); return unsup_alg(out, pkey, indent, "Parameters"); } -LCRYPTO_ALIAS(EVP_PKEY_print_params); int EVP_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) return pkey->ameth->pkey_ctrl(pkey, ASN1_PKEY_CTRL_DEFAULT_MD_NID, 0, pnid); } -LCRYPTO_ALIAS(EVP_PKEY_get_default_digest_nid); diff --git a/lib/libcrypto/evp/p_open.c b/lib/libcrypto/evp/p_open.c index 5ab36b8ef5c..d18548e3f20 100644 --- a/lib/libcrypto/evp/p_open.c +++ b/lib/libcrypto/evp/p_open.c @@ -1,4 +1,4 @@ -/* $OpenBSD: p_open.c,v 1.22 2023/07/07 13:54:46 beck Exp $ */ +/* $OpenBSD: p_open.c,v 1.23 2023/07/07 19:37:54 beck Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -114,7 +114,6 @@ err: freezero(key, size); return (ret); } -LCRYPTO_ALIAS(EVP_OpenInit); int EVP_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) i = EVP_DecryptInit_ex(ctx, NULL, NULL, NULL, NULL); return (i); } -LCRYPTO_ALIAS(EVP_OpenFinal); #endif diff --git a/lib/libcrypto/evp/p_seal.c b/lib/libcrypto/evp/p_seal.c index 52521e133b9..b98da94360f 100644 --- a/lib/libcrypto/evp/p_seal.c +++ b/lib/libcrypto/evp/p_seal.c @@ -1,4 +1,4 @@ -/* $OpenBSD: p_seal.c,v 1.15 2023/07/07 13:54:46 beck Exp $ */ +/* $OpenBSD: p_seal.c,v 1.16 2023/07/07 19:37:54 beck Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -99,7 +99,6 @@ EVP_SealInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type, unsigned char **ek, } return (npubk); } -LCRYPTO_ALIAS(EVP_SealInit); /* MACRO void EVP_SealUpdate(ctx,out,outl,in,inl) @@ -123,4 +122,3 @@ EVP_SealFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl) i = EVP_EncryptInit_ex(ctx, NULL, NULL, NULL, NULL); return i; } -LCRYPTO_ALIAS(EVP_SealFinal); diff --git a/lib/libcrypto/evp/p_sign.c b/lib/libcrypto/evp/p_sign.c index 13655b076f1..f7c21178a07 100644 --- a/lib/libcrypto/evp/p_sign.c +++ b/lib/libcrypto/evp/p_sign.c @@ -1,4 +1,4 @@ -/* $OpenBSD: p_sign.c,v 1.18 2023/07/07 13:54:46 beck Exp $ */ +/* $OpenBSD: p_sign.c,v 1.19 2023/07/07 19:37:54 beck Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -102,4 +102,3 @@ EVP_SignFinal(EVP_MD_CTX *ctx, unsigned char *sigret, unsigned int *siglen, EVP_PKEY_CTX_free(pkctx); return ret; } -LCRYPTO_ALIAS(EVP_SignFinal); diff --git a/lib/libcrypto/evp/p_verify.c b/lib/libcrypto/evp/p_verify.c index 601b44e5e0b..da7ab5425a8 100644 --- a/lib/libcrypto/evp/p_verify.c +++ b/lib/libcrypto/evp/p_verify.c @@ -1,4 +1,4 @@ -/* $OpenBSD: p_verify.c,v 1.17 2023/07/07 13:54:46 beck Exp $ */ +/* $OpenBSD: p_verify.c,v 1.18 2023/07/07 19:37:54 beck Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -95,4 +95,3 @@ EVP_VerifyFinal(EVP_MD_CTX *ctx, const unsigned char *sigbuf, EVP_PKEY_CTX_free(pkctx); return ret; } -LCRYPTO_ALIAS(EVP_VerifyFinal); diff --git a/lib/libcrypto/evp/pmeth_fn.c b/lib/libcrypto/evp/pmeth_fn.c index 3025005034e..a304752e63c 100644 --- a/lib/libcrypto/evp/pmeth_fn.c +++ b/lib/libcrypto/evp/pmeth_fn.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pmeth_fn.c,v 1.8 2023/07/07 13:54:46 beck Exp $ */ +/* $OpenBSD: pmeth_fn.c,v 1.9 2023/07/07 19:37:54 beck Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 2006. */ @@ -98,7 +98,6 @@ EVP_PKEY_sign_init(EVP_PKEY_CTX *ctx) ctx->operation = EVP_PKEY_OP_UNDEFINED; return ret; } -LCRYPTO_ALIAS(EVP_PKEY_sign_init); int EVP_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, M_check_autoarg(ctx, sig, siglen, EVP_F_EVP_PKEY_SIGN) return ctx->pmeth->sign(ctx, sig, siglen, tbs, tbslen); } -LCRYPTO_ALIAS(EVP_PKEY_sign); int EVP_PKEY_verify_init(EVP_PKEY_CTX *ctx) @@ -134,7 +132,6 @@ EVP_PKEY_verify_init(EVP_PKEY_CTX *ctx) ctx->operation = EVP_PKEY_OP_UNDEFINED; return ret; } -LCRYPTO_ALIAS(EVP_PKEY_verify_init); int EVP_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, } return ctx->pmeth->verify(ctx, sig, siglen, tbs, tbslen); } -LCRYPTO_ALIAS(EVP_PKEY_verify); int EVP_PKEY_verify_recover_init(EVP_PKEY_CTX *ctx) @@ -169,7 +165,6 @@ EVP_PKEY_verify_recover_init(EVP_PKEY_CTX *ctx) ctx->operation = EVP_PKEY_OP_UNDEFINED; return ret; } -LCRYPTO_ALIAS(EVP_PKEY_verify_recover_init); int EVP_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, M_check_autoarg(ctx, rout, routlen, EVP_F_EVP_PKEY_VERIFY_RECOVER) return ctx->pmeth->verify_recover(ctx, rout, routlen, sig, siglen); } -LCRYPTO_ALIAS(EVP_PKEY_verify_recover); int EVP_PKEY_encrypt_init(EVP_PKEY_CTX *ctx) @@ -205,7 +199,6 @@ EVP_PKEY_encrypt_init(EVP_PKEY_CTX *ctx) ctx->operation = EVP_PKEY_OP_UNDEFINED; return ret; } -LCRYPTO_ALIAS(EVP_PKEY_encrypt_init); int EVP_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, M_check_autoarg(ctx, out, outlen, EVP_F_EVP_PKEY_ENCRYPT) return ctx->pmeth->encrypt(ctx, out, outlen, in, inlen); } -LCRYPTO_ALIAS(EVP_PKEY_encrypt); int EVP_PKEY_decrypt_init(EVP_PKEY_CTX *ctx) @@ -241,7 +233,6 @@ EVP_PKEY_decrypt_init(EVP_PKEY_CTX *ctx) ctx->operation = EVP_PKEY_OP_UNDEFINED; return ret; } -LCRYPTO_ALIAS(EVP_PKEY_decrypt_init); int EVP_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, M_check_autoarg(ctx, out, outlen, EVP_F_EVP_PKEY_DECRYPT) return ctx->pmeth->decrypt(ctx, out, outlen, in, inlen); } -LCRYPTO_ALIAS(EVP_PKEY_decrypt); int EVP_PKEY_derive_init(EVP_PKEY_CTX *ctx) @@ -277,7 +267,6 @@ EVP_PKEY_derive_init(EVP_PKEY_CTX *ctx) ctx->operation = EVP_PKEY_OP_UNDEFINED; return ret; } -LCRYPTO_ALIAS(EVP_PKEY_derive_init); int EVP_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) CRYPTO_add(&peer->references, 1, CRYPTO_LOCK_EVP_PKEY); return 1; } -LCRYPTO_ALIAS(EVP_PKEY_derive_set_peer); int EVP_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) M_check_autoarg(ctx, key, pkeylen, EVP_F_EVP_PKEY_DERIVE) return ctx->pmeth->derive(ctx, key, pkeylen); } -LCRYPTO_ALIAS(EVP_PKEY_derive); diff --git a/lib/libcrypto/evp/pmeth_gn.c b/lib/libcrypto/evp/pmeth_gn.c index 2b835cd8fe7..b4c0395d978 100644 --- a/lib/libcrypto/evp/pmeth_gn.c +++ b/lib/libcrypto/evp/pmeth_gn.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pmeth_gn.c,v 1.12 2023/07/07 13:54:46 beck Exp $ */ +/* $OpenBSD: pmeth_gn.c,v 1.13 2023/07/07 19:37:54 beck Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 2006. */ @@ -85,7 +85,6 @@ EVP_PKEY_paramgen_init(EVP_PKEY_CTX *ctx) ctx->operation = EVP_PKEY_OP_UNDEFINED; return ret; } -LCRYPTO_ALIAS(EVP_PKEY_paramgen_init); int EVP_PKEY_paramgen(EVP_PKEY_CTX *ctx, EVP_PKEY **ppkey) @@ -115,7 +114,6 @@ EVP_PKEY_paramgen(EVP_PKEY_CTX *ctx, EVP_PKEY **ppkey) } return ret; } -LCRYPTO_ALIAS(EVP_PKEY_paramgen); int EVP_PKEY_keygen_init(EVP_PKEY_CTX *ctx) @@ -134,7 +132,6 @@ EVP_PKEY_keygen_init(EVP_PKEY_CTX *ctx) ctx->operation = EVP_PKEY_OP_UNDEFINED; return ret; } -LCRYPTO_ALIAS(EVP_PKEY_keygen_init); int EVP_PKEY_keygen(EVP_PKEY_CTX *ctx, EVP_PKEY **ppkey) @@ -163,21 +160,18 @@ EVP_PKEY_keygen(EVP_PKEY_CTX *ctx, EVP_PKEY **ppkey) } return ret; } -LCRYPTO_ALIAS(EVP_PKEY_keygen); void EVP_PKEY_CTX_set_cb(EVP_PKEY_CTX *ctx, EVP_PKEY_gen_cb *cb) { ctx->pkey_gencb = cb; } -LCRYPTO_ALIAS(EVP_PKEY_CTX_set_cb); EVP_PKEY_gen_cb * EVP_PKEY_CTX_get_cb(EVP_PKEY_CTX *ctx) { return ctx->pkey_gencb; } -LCRYPTO_ALIAS(EVP_PKEY_CTX_get_cb); /* "translation callback" to call EVP_PKEY_CTX callbacks using BN_GENCB * style callbacks. @@ -207,7 +201,6 @@ EVP_PKEY_CTX_get_keygen_info(EVP_PKEY_CTX *ctx, int idx) return 0; return ctx->keygen_info[idx]; } -LCRYPTO_ALIAS(EVP_PKEY_CTX_get_keygen_info); EVP_PKEY * EVP_PKEY_new_mac_key(int type, ENGINE *e, const unsigned char *key, int keylen) @@ -230,7 +223,6 @@ merr: EVP_PKEY_CTX_free(mac_ctx); return mac_key; } -LCRYPTO_ALIAS(EVP_PKEY_new_mac_key); int EVP_PKEY_check(EVP_PKEY_CTX *ctx) @@ -252,7 +244,6 @@ EVP_PKEY_check(EVP_PKEY_CTX *ctx) return pkey->ameth->pkey_check(pkey); } -LCRYPTO_ALIAS(EVP_PKEY_check); int EVP_PKEY_public_check(EVP_PKEY_CTX *ctx) @@ -274,7 +265,6 @@ EVP_PKEY_public_check(EVP_PKEY_CTX *ctx) return pkey->ameth->pkey_public_check(pkey); } -LCRYPTO_ALIAS(EVP_PKEY_public_check); int EVP_PKEY_param_check(EVP_PKEY_CTX *ctx) @@ -296,4 +286,3 @@ EVP_PKEY_param_check(EVP_PKEY_CTX *ctx) return pkey->ameth->pkey_param_check(pkey); } -LCRYPTO_ALIAS(EVP_PKEY_param_check); diff --git a/lib/libcrypto/evp/pmeth_lib.c b/lib/libcrypto/evp/pmeth_lib.c index cad38d4fe96..b480a574fea 100644 --- a/lib/libcrypto/evp/pmeth_lib.c +++ b/lib/libcrypto/evp/pmeth_lib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pmeth_lib.c,v 1.32 2023/07/07 13:54:46 beck Exp $ */ +/* $OpenBSD: pmeth_lib.c,v 1.33 2023/07/07 19:37:54 beck Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 2006. */ @@ -149,7 +149,6 @@ EVP_PKEY_meth_find(int type) return NULL; } -LCRYPTO_ALIAS(EVP_PKEY_meth_find); static EVP_PKEY_CTX * evp_pkey_ctx_new(EVP_PKEY *pkey, ENGINE *engine, int id) @@ -226,7 +225,6 @@ EVP_PKEY_meth_new(int id, int flags) return pmeth; } -LCRYPTO_ALIAS(EVP_PKEY_meth_new); void EVP_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) if (pflags) *pflags = meth->flags; } -LCRYPTO_ALIAS(EVP_PKEY_meth_get0_info); void EVP_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) dst->pkey_id = preserve.pkey_id; dst->flags = preserve.flags; } -LCRYPTO_ALIAS(EVP_PKEY_meth_copy); void EVP_PKEY_meth_free(EVP_PKEY_METHOD *pmeth) @@ -259,21 +255,18 @@ EVP_PKEY_meth_free(EVP_PKEY_METHOD *pmeth) if (pmeth && (pmeth->flags & EVP_PKEY_FLAG_DYNAMIC)) free(pmeth); } -LCRYPTO_ALIAS(EVP_PKEY_meth_free); EVP_PKEY_CTX * EVP_PKEY_CTX_new(EVP_PKEY *pkey, ENGINE *engine) { return evp_pkey_ctx_new(pkey, engine, -1); } -LCRYPTO_ALIAS(EVP_PKEY_CTX_new); EVP_PKEY_CTX * EVP_PKEY_CTX_new_id(int id, ENGINE *engine) { return evp_pkey_ctx_new(NULL, engine, id); } -LCRYPTO_ALIAS(EVP_PKEY_CTX_new_id); EVP_PKEY_CTX * EVP_PKEY_CTX_dup(EVP_PKEY_CTX *pctx) @@ -315,7 +308,6 @@ EVP_PKEY_CTX_dup(EVP_PKEY_CTX *pctx) EVP_PKEY_CTX_free(rctx); return NULL; } -LCRYPTO_ALIAS(EVP_PKEY_CTX_dup); int EVP_PKEY_meth_add0(const EVP_PKEY_METHOD *pmeth) @@ -331,7 +323,6 @@ EVP_PKEY_meth_add0(const EVP_PKEY_METHOD *pmeth) return 1; } -LCRYPTO_ALIAS(EVP_PKEY_meth_add0); void EVP_PKEY_CTX_free(EVP_PKEY_CTX *ctx) @@ -347,7 +338,6 @@ EVP_PKEY_CTX_free(EVP_PKEY_CTX *ctx) #endif free(ctx); } -LCRYPTO_ALIAS(EVP_PKEY_CTX_free); int EVP_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, return ret; } -LCRYPTO_ALIAS(EVP_PKEY_CTX_ctrl); int EVP_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) } return ctx->pmeth->ctrl_str(ctx, name, value); } -LCRYPTO_ALIAS(EVP_PKEY_CTX_ctrl_str); int EVP_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) { return ctx->operation; } -LCRYPTO_ALIAS(EVP_PKEY_CTX_get_operation); void EVP_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) ctx->keygen_info = dat; ctx->keygen_info_count = datlen; } -LCRYPTO_ALIAS(EVP_PKEY_CTX_set0_keygen_info); void EVP_PKEY_CTX_set_data(EVP_PKEY_CTX *ctx, void *data) { ctx->data = data; } -LCRYPTO_ALIAS(EVP_PKEY_CTX_set_data); void * EVP_PKEY_CTX_get_data(EVP_PKEY_CTX *ctx) { return ctx->data; } -LCRYPTO_ALIAS(EVP_PKEY_CTX_get_data); EVP_PKEY * EVP_PKEY_CTX_get0_pkey(EVP_PKEY_CTX *ctx) { return ctx->pkey; } -LCRYPTO_ALIAS(EVP_PKEY_CTX_get0_pkey); EVP_PKEY * EVP_PKEY_CTX_get0_peerkey(EVP_PKEY_CTX *ctx) { return ctx->peerkey; } -LCRYPTO_ALIAS(EVP_PKEY_CTX_get0_peerkey); void EVP_PKEY_CTX_set_app_data(EVP_PKEY_CTX *ctx, void *data) { ctx->app_data = data; } -LCRYPTO_ALIAS(EVP_PKEY_CTX_set_app_data); void * EVP_PKEY_CTX_get_app_data(EVP_PKEY_CTX *ctx) { return ctx->app_data; } -LCRYPTO_ALIAS(EVP_PKEY_CTX_get_app_data); void EVP_PKEY_meth_set_init(EVP_PKEY_METHOD *pmeth, @@ -504,7 +484,6 @@ EVP_PKEY_meth_set_init(EVP_PKEY_METHOD *pmeth, { pmeth->init = init; } -LCRYPTO_ALIAS(EVP_PKEY_meth_set_init); void EVP_PKEY_meth_set_copy(EVP_PKEY_METHOD *pmeth, @@ -512,7 +491,6 @@ EVP_PKEY_meth_set_copy(EVP_PKEY_METHOD *pmeth, { pmeth->copy = copy; } -LCRYPTO_ALIAS(EVP_PKEY_meth_set_copy); void EVP_PKEY_meth_set_cleanup(EVP_PKEY_METHOD *pmeth, @@ -520,7 +498,6 @@ EVP_PKEY_meth_set_cleanup(EVP_PKEY_METHOD *pmeth, { pmeth->cleanup = cleanup; } -LCRYPTO_ALIAS(EVP_PKEY_meth_set_cleanup); void EVP_PKEY_meth_set_paramgen(EVP_PKEY_METHOD *pmeth, @@ -530,7 +507,6 @@ EVP_PKEY_meth_set_paramgen(EVP_PKEY_METHOD *pmeth, pmeth->paramgen_init = paramgen_init; pmeth->paramgen = paramgen; } -LCRYPTO_ALIAS(EVP_PKEY_meth_set_paramgen); void EVP_PKEY_meth_set_keygen(EVP_PKEY_METHOD *pmeth, @@ -540,7 +516,6 @@ EVP_PKEY_meth_set_keygen(EVP_PKEY_METHOD *pmeth, pmeth->keygen_init = keygen_init; pmeth->keygen = keygen; } -LCRYPTO_ALIAS(EVP_PKEY_meth_set_keygen); void EVP_PKEY_meth_set_sign(EVP_PKEY_METHOD *pmeth, @@ -551,7 +526,6 @@ EVP_PKEY_meth_set_sign(EVP_PKEY_METHOD *pmeth, pmeth->sign_init = sign_init; pmeth->sign = sign; } -LCRYPTO_ALIAS(EVP_PKEY_meth_set_sign); void EVP_PKEY_meth_set_verify(EVP_PKEY_METHOD *pmeth, @@ -562,7 +536,6 @@ EVP_PKEY_meth_set_verify(EVP_PKEY_METHOD *pmeth, pmeth->verify_init = verify_init; pmeth->verify = verify; } -LCRYPTO_ALIAS(EVP_PKEY_meth_set_verify); void EVP_PKEY_meth_set_verify_recover(EVP_PKEY_METHOD *pmeth, @@ -574,7 +547,6 @@ EVP_PKEY_meth_set_verify_recover(EVP_PKEY_METHOD *pmeth, pmeth->verify_recover_init = verify_recover_init; pmeth->verify_recover = verify_recover; } -LCRYPTO_ALIAS(EVP_PKEY_meth_set_verify_recover); void EVP_PKEY_meth_set_signctx(EVP_PKEY_METHOD *pmeth, @@ -585,7 +557,6 @@ EVP_PKEY_meth_set_signctx(EVP_PKEY_METHOD *pmeth, pmeth->signctx_init = signctx_init; pmeth->signctx = signctx; } -LCRYPTO_ALIAS(EVP_PKEY_meth_set_signctx); void EVP_PKEY_meth_set_verifyctx(EVP_PKEY_METHOD *pmeth, @@ -596,7 +567,6 @@ EVP_PKEY_meth_set_verifyctx(EVP_PKEY_METHOD *pmeth, pmeth->verifyctx_init = verifyctx_init; pmeth->verifyctx = verifyctx; } -LCRYPTO_ALIAS(EVP_PKEY_meth_set_verifyctx); void EVP_PKEY_meth_set_encrypt(EVP_PKEY_METHOD *pmeth, @@ -607,7 +577,6 @@ EVP_PKEY_meth_set_encrypt(EVP_PKEY_METHOD *pmeth, pmeth->encrypt_init = encrypt_init; pmeth->encrypt = encryptfn; } -LCRYPTO_ALIAS(EVP_PKEY_meth_set_encrypt); void EVP_PKEY_meth_set_decrypt(EVP_PKEY_METHOD *pmeth, @@ -618,7 +587,6 @@ EVP_PKEY_meth_set_decrypt(EVP_PKEY_METHOD *pmeth, pmeth->decrypt_init = decrypt_init; pmeth->decrypt = decrypt; } -LCRYPTO_ALIAS(EVP_PKEY_meth_set_decrypt); void EVP_PKEY_meth_set_derive(EVP_PKEY_METHOD *pmeth, @@ -628,7 +596,6 @@ EVP_PKEY_meth_set_derive(EVP_PKEY_METHOD *pmeth, pmeth->derive_init = derive_init; pmeth->derive = derive; } -LCRYPTO_ALIAS(EVP_PKEY_meth_set_derive); void EVP_PKEY_meth_set_ctrl(EVP_PKEY_METHOD *pmeth, @@ -638,14 +605,12 @@ EVP_PKEY_meth_set_ctrl(EVP_PKEY_METHOD *pmeth, pmeth->ctrl = ctrl; pmeth->ctrl_str = ctrl_str; } -LCRYPTO_ALIAS(EVP_PKEY_meth_set_ctrl); void EVP_PKEY_meth_set_check(EVP_PKEY_METHOD *pmeth, int (*check)(EVP_PKEY *pkey)) { pmeth->check = check; } -LCRYPTO_ALIAS(EVP_PKEY_meth_set_check); void EVP_PKEY_meth_set_public_check(EVP_PKEY_METHOD *pmeth, @@ -653,7 +618,6 @@ EVP_PKEY_meth_set_public_check(EVP_PKEY_METHOD *pmeth, { pmeth->public_check = public_check; } -LCRYPTO_ALIAS(EVP_PKEY_meth_set_public_check); void EVP_PKEY_meth_set_param_check(EVP_PKEY_METHOD *pmeth, @@ -661,4 +625,3 @@ EVP_PKEY_meth_set_param_check(EVP_PKEY_METHOD *pmeth, { pmeth->param_check = param_check; } -LCRYPTO_ALIAS(EVP_PKEY_meth_set_param_check); |