diff --git a/library/psa_crypto.c b/library/psa_crypto.c
index c35b2a6..adc730b 100644
--- a/library/psa_crypto.c
+++ b/library/psa_crypto.c
@@ -1758,10 +1758,12 @@
 
         /* Need to export the public part of a private key,
          * so conversion is needed. Try the accelerators first. */
-        psa_status_t status = psa_driver_wrapper_export_public_key( slot,
-                                                                    data,
-                                                                    data_size,
-                                                                    data_length );
+        psa_key_attributes_t attributes = {
+          .core = slot->attr
+        };
+        psa_status_t status = psa_driver_wrapper_export_public_key(
+            &attributes, slot->key.data, slot->key.bytes,
+            data, data_size, data_length );
 
         if( status != PSA_ERROR_NOT_SUPPORTED ||
             psa_key_lifetime_is_external( slot->attr.lifetime ) )