diff --git a/library/psa_crypto.c b/library/psa_crypto.c
index 4ba9baf..6575ec4 100644
--- a/library/psa_crypto.c
+++ b/library/psa_crypto.c
@@ -4093,11 +4093,11 @@
 
     /* Try doing this through a driver before using software fallback */
     if( cipher_operation == MBEDTLS_ENCRYPT )
-        status = psa_driver_wrapper_cipher_encrypt_setup( operation,
+        status = psa_driver_wrapper_cipher_encrypt_setup( &operation->ctx.driver,
                                                           slot,
                                                           alg );
     else
-        status = psa_driver_wrapper_cipher_decrypt_setup( operation,
+        status = psa_driver_wrapper_cipher_decrypt_setup( &operation->ctx.driver,
                                                           slot,
                                                           alg );
 
@@ -4218,7 +4218,7 @@
 
     if( operation->accelerator_set == 1 )
     {
-        status = psa_driver_wrapper_cipher_generate_iv( operation,
+        status = psa_driver_wrapper_cipher_generate_iv( &operation->ctx.driver,
                                                         iv,
                                                         iv_size,
                                                         iv_length );
@@ -4260,7 +4260,7 @@
 
     if( operation->accelerator_set == 1 )
     {
-        status = psa_driver_wrapper_cipher_set_iv( operation,
+        status = psa_driver_wrapper_cipher_set_iv( &operation->ctx.driver,
                                                    iv,
                                                    iv_length );
         goto exit;
@@ -4385,7 +4385,7 @@
 
     if( operation->accelerator_set == 1 )
     {
-        status = psa_driver_wrapper_cipher_update( operation,
+        status = psa_driver_wrapper_cipher_update( &operation->ctx.driver,
                                                    input,
                                                    input_length,
                                                    output,
@@ -4459,7 +4459,7 @@
 
     if( operation->accelerator_set == 1 )
     {
-        status = psa_driver_wrapper_cipher_finish( operation,
+        status = psa_driver_wrapper_cipher_finish( &operation->ctx.driver,
                                                    output,
                                                    output_size,
                                                    output_length );
@@ -4536,7 +4536,7 @@
         return( PSA_ERROR_BAD_STATE );
 
     if( operation->accelerator_set == 1 )
-        psa_driver_wrapper_cipher_abort( operation );
+        psa_driver_wrapper_cipher_abort( &operation->ctx.driver );
     else
         mbedtls_cipher_free( &operation->ctx.cipher );