Commit d32e8acf authored by Geoff Thorpe's avatar Geoff Thorpe
Browse files

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

correct the DSO-dependant code in the engine code.
parent d8c4d0e8

crypto/engine/hw_atalla.c

+3 −3
Original line number Diff line number Diff line
@@ -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);

crypto/engine/hw_cswift.c

+4 −4
Original line number Diff line number Diff line
@@ -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;