Now that the branch has been updated with the DSO changes in the head,

correct the DSO-dependant code in the engine code.

diff --git a/crypto/engine/hw_atalla.c b/crypto/engine/hw_atalla.c
index b0edf74a168216f4ab29009731822ddc522673e0..3e1beedb0719b07127fa56cae4c6943d9d6e1049 100644 (file)
--- a/crypto/engine/hw_atalla.c
+++ b/crypto/engine/hw_atalla.c
@@ -235,11 +235,11 @@ static int atalla_init()
                ENGINEerr(ENGINE_F_ATALLA_INIT,ENGINE_R_DSO_FAILURE);
                goto err;
                }
-       if(!(p1 = (tfnASI_GetHardwareConfig *)DSO_bind(
+       if(!(p1 = (tfnASI_GetHardwareConfig *)DSO_bind_func(
                                atalla_dso, ATALLA_F1)) ||
-                       !(p2 = (tfnASI_RSAPrivateKeyOpFn *)DSO_bind(
+                       !(p2 = (tfnASI_RSAPrivateKeyOpFn *)DSO_bind_func(
                                atalla_dso, ATALLA_F2)) ||
-                       !(p3 = (tfnASI_GetPerformanceStatistics *)DSO_bind(
+                       !(p3 = (tfnASI_GetPerformanceStatistics *)DSO_bind_func(
                                atalla_dso, ATALLA_F3)))
                {
                ENGINEerr(ENGINE_F_ATALLA_INIT,ENGINE_R_DSO_FAILURE);

diff --git a/crypto/engine/hw_cswift.c b/crypto/engine/hw_cswift.c
index e85dee1511a9b7167d8b9d9bf985d9cc9604d48b..bf2f0b694fad95a73ca82a929391e194f15ee9d3 100644 (file)
--- a/crypto/engine/hw_cswift.c
+++ b/crypto/engine/hw_cswift.c
@@ -264,13 +264,13 @@ static int cswift_init()
                goto err;
                }
        if(!(p1 = (t_swAcquireAccContext *)
-                               DSO_bind(cswift_dso, CSWIFT_F1)) ||
+                               DSO_bind_func(cswift_dso, CSWIFT_F1)) ||
                        !(p2 = (t_swAttachKeyParam *)
-                               DSO_bind(cswift_dso, CSWIFT_F2)) ||
+                               DSO_bind_func(cswift_dso, CSWIFT_F2)) ||
                        !(p3 = (t_swSimpleRequest *)
-                               DSO_bind(cswift_dso, CSWIFT_F3)) ||
+                               DSO_bind_func(cswift_dso, CSWIFT_F3)) ||
                        !(p4 = (t_swReleaseAccContext *)
-                               DSO_bind(cswift_dso, CSWIFT_F4)))
+                               DSO_bind_func(cswift_dso, CSWIFT_F4)))
                {
                ENGINEerr(ENGINE_F_CSWIFT_INIT,ENGINE_R_DSO_FAILURE);
                goto err;