From: Rich Salz Date: Sat, 22 May 2021 19:57:07 +0000 (-0400) Subject: Remove engine_table_select_int X-Git-Tag: openssl-3.0.0-beta1~402 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a861711bcded8e259156342be697d72ec65f0aa2;p=thirdparty%2Fopenssl.git Remove engine_table_select_int Add missing file/line args and call it engine_table_select Reviewed-by: Richard Levitte Reviewed-by: Paul Dale (Merged from https://github.com/openssl/openssl/pull/15419) --- diff --git a/crypto/engine/eng_local.h b/crypto/engine/eng_local.h index 1862920157c..ef96a5769fd 100644 --- a/crypto/engine/eng_local.h +++ b/crypto/engine/eng_local.h @@ -62,10 +62,8 @@ int engine_table_register(ENGINE_TABLE **table, ENGINE_CLEANUP_CB *cleanup, int setdefault); void engine_table_unregister(ENGINE_TABLE **table, ENGINE *e); void engine_table_cleanup(ENGINE_TABLE **table); -ENGINE *engine_table_select_int(ENGINE_TABLE **table, int nid, const char *f, - int l); -# define engine_table_select(t,n) \ - engine_table_select_int(t,n,OPENSSL_FILE,OPENSSL_LINE) +ENGINE *ossl_engine_table_select(ENGINE_TABLE **table, int nid, + const char *f, int l); typedef void (engine_table_doall_cb) (int nid, STACK_OF(ENGINE) *sk, ENGINE *def, void *arg); void engine_table_doall(ENGINE_TABLE *table, engine_table_doall_cb *cb, diff --git a/crypto/engine/eng_table.c b/crypto/engine/eng_table.c index 63d32e524d6..a8209d9e717 100644 --- a/crypto/engine/eng_table.c +++ b/crypto/engine/eng_table.c @@ -194,8 +194,8 @@ void engine_table_cleanup(ENGINE_TABLE **table) } /* return a functional reference for a given 'nid' */ -ENGINE *engine_table_select_int(ENGINE_TABLE **table, int nid, const char *f, - int l) +ENGINE *ossl_engine_table_select(ENGINE_TABLE **table, int nid, + const char *f, int l) { ENGINE *ret = NULL; ENGINE_PILE tmplate, *fnd = NULL; diff --git a/crypto/engine/tb_asnmth.c b/crypto/engine/tb_asnmth.c index 5212ec39b75..fffd4888f9c 100644 --- a/crypto/engine/tb_asnmth.c +++ b/crypto/engine/tb_asnmth.c @@ -76,7 +76,8 @@ int ENGINE_set_default_pkey_asn1_meths(ENGINE *e) */ ENGINE *ENGINE_get_pkey_asn1_meth_engine(int nid) { - return engine_table_select(&pkey_asn1_meth_table, nid); + return ossl_engine_table_select(&pkey_asn1_meth_table, nid, + OPENSSL_FILE, OPENSSL_LINE); } /* diff --git a/crypto/engine/tb_cipher.c b/crypto/engine/tb_cipher.c index cb17508ac8c..5938b4e2926 100644 --- a/crypto/engine/tb_cipher.c +++ b/crypto/engine/tb_cipher.c @@ -65,7 +65,8 @@ int ENGINE_set_default_ciphers(ENGINE *e) */ ENGINE *ENGINE_get_cipher_engine(int nid) { - return engine_table_select(&cipher_table, nid); + return ossl_engine_table_select(&cipher_table, nid, + OPENSSL_FILE, OPENSSL_LINE); } /* Obtains a cipher implementation from an ENGINE functional reference */ diff --git a/crypto/engine/tb_dh.c b/crypto/engine/tb_dh.c index 6ba2c0a859d..1da3b60587d 100644 --- a/crypto/engine/tb_dh.c +++ b/crypto/engine/tb_dh.c @@ -58,7 +58,8 @@ int ENGINE_set_default_DH(ENGINE *e) */ ENGINE *ENGINE_get_default_DH(void) { - return engine_table_select(&dh_table, dummy_nid); + return ossl_engine_table_select(&dh_table, dummy_nid, + OPENSSL_FILE, OPENSSL_LINE); } /* Obtains an DH implementation from an ENGINE functional reference */ diff --git a/crypto/engine/tb_digest.c b/crypto/engine/tb_digest.c index 6b1cc05ab4c..a7c78d3d7c9 100644 --- a/crypto/engine/tb_digest.c +++ b/crypto/engine/tb_digest.c @@ -65,7 +65,8 @@ int ENGINE_set_default_digests(ENGINE *e) */ ENGINE *ENGINE_get_digest_engine(int nid) { - return engine_table_select(&digest_table, nid); + return ossl_engine_table_select(&digest_table, nid, + OPENSSL_FILE, OPENSSL_LINE); } /* Obtains a digest implementation from an ENGINE functional reference */ diff --git a/crypto/engine/tb_dsa.c b/crypto/engine/tb_dsa.c index f3b1b6820c5..acbaf877ac8 100644 --- a/crypto/engine/tb_dsa.c +++ b/crypto/engine/tb_dsa.c @@ -58,7 +58,8 @@ int ENGINE_set_default_DSA(ENGINE *e) */ ENGINE *ENGINE_get_default_DSA(void) { - return engine_table_select(&dsa_table, dummy_nid); + return ossl_engine_table_select(&dsa_table, dummy_nid, + OPENSSL_FILE, OPENSSL_LINE); } /* Obtains an DSA implementation from an ENGINE functional reference */ diff --git a/crypto/engine/tb_eckey.c b/crypto/engine/tb_eckey.c index c58037ea893..3e7c7eed89d 100644 --- a/crypto/engine/tb_eckey.c +++ b/crypto/engine/tb_eckey.c @@ -58,7 +58,8 @@ int ENGINE_set_default_EC(ENGINE *e) */ ENGINE *ENGINE_get_default_EC(void) { - return engine_table_select(&dh_table, dummy_nid); + return ossl_engine_table_select(&dh_table, dummy_nid, + OPENSSL_FILE, OPENSSL_LINE); } /* Obtains an EC_KEY implementation from an ENGINE functional reference */ diff --git a/crypto/engine/tb_pkmeth.c b/crypto/engine/tb_pkmeth.c index ad7f2d764fe..a19784d049d 100644 --- a/crypto/engine/tb_pkmeth.c +++ b/crypto/engine/tb_pkmeth.c @@ -66,7 +66,8 @@ int ENGINE_set_default_pkey_meths(ENGINE *e) */ ENGINE *ENGINE_get_pkey_meth_engine(int nid) { - return engine_table_select(&pkey_meth_table, nid); + return ossl_engine_table_select(&pkey_meth_table, nid, + OPENSSL_FILE, OPENSSL_LINE); } /* Obtains a pkey_meth implementation from an ENGINE functional reference */ diff --git a/crypto/engine/tb_rand.c b/crypto/engine/tb_rand.c index c7fdf8b268f..173fe4efb1b 100644 --- a/crypto/engine/tb_rand.c +++ b/crypto/engine/tb_rand.c @@ -58,7 +58,8 @@ int ENGINE_set_default_RAND(ENGINE *e) */ ENGINE *ENGINE_get_default_RAND(void) { - return engine_table_select(&rand_table, dummy_nid); + return ossl_engine_table_select(&rand_table, dummy_nid, + OPENSSL_FILE, OPENSSL_LINE); } /* Obtains an RAND implementation from an ENGINE functional reference */ diff --git a/crypto/engine/tb_rsa.c b/crypto/engine/tb_rsa.c index 9b1329a2e0c..41c002ba93e 100644 --- a/crypto/engine/tb_rsa.c +++ b/crypto/engine/tb_rsa.c @@ -58,7 +58,8 @@ int ENGINE_set_default_RSA(ENGINE *e) */ ENGINE *ENGINE_get_default_RSA(void) { - return engine_table_select(&rsa_table, dummy_nid); + return ossl_engine_table_select(&rsa_table, dummy_nid, + OPENSSL_FILE, OPENSSL_LINE); } /* Obtains an RSA implementation from an ENGINE functional reference */