Remove engine_table_select_int

Add missing file/line args and call it engine_table_select

Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15419)

diff --git a/crypto/engine/eng_local.h b/crypto/engine/eng_local.h
index 1862920157c4de704a99af6ac22fe6521986a0fd..ef96a5769fdb3b74e4131b6346b77c643ff1c4e7 100644 (file)
--- 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 63d32e524d63abac8602f4bae9c9d4a752bd2f75..a8209d9e71760b2806fe6b8bad79f7be177f89f1 100644 (file)
--- 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 5212ec39b759b76c00224c0744d2538220c257b4..fffd4888f9c2bca1ffc7f95274136577cf1b71c0 100644 (file)
--- 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 cb17508ac8cfc4a01fe7817c25bce7a14efd89aa..5938b4e2926ed158463d29316a53957ff676ec25 100644 (file)
--- 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 6ba2c0a859dcbe01fcf2ab797ea6cf4a9736c658..1da3b60587dc333cc6679e54561345f8958785f6 100644 (file)
--- 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 6b1cc05ab4cd312c763ca39e20b2361f9237a950..a7c78d3d7c9cbf8282ef3d6d987588c787b80d83 100644 (file)
--- 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 f3b1b6820c590711756fd0217e6850fe01bfc272..acbaf877ac84df908caed4a80d4ebafe916386d2 100644 (file)
--- 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 c58037ea8939af329823e6538d34a69b7920a646..3e7c7eed89d7b0fba41d49be8dae0dc86b6f106a 100644 (file)
--- 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 ad7f2d764fe397ed8e0d5d45f5b21f99fadaefe4..a19784d049daa4a6df944682551e632a910408c3 100644 (file)
--- 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 c7fdf8b268f21078674de939dfe9e4086d08011d..173fe4efb1b2ff134705c7fc10a6113d85d43b9b 100644 (file)
--- 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 9b1329a2e0c4121c6bf99f7141defe9bac397a7a..41c002ba93ea7654ce575542de82018348c4fb6c 100644 (file)
--- 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 */