Remove public key output parameters from p_generate

Author: dgreen-arm

include/psa/crypto_se_driver.h

@@ -849,19 +849,11 @@ typedef psa_status_t (*psa_drv_se_export_key_t)(psa_key_slot_number_t key,
  *                          Driver developers should endeavor to match the
  *                          usages as close as possible.
  * \param[in] bits          The size in bits of the key to be generated.
- * \param[out] p_pubkey_out The buffer where the public key information will
- *                          be placed
- * \param[in] pubkey_out_size   The size in bytes of the `p_pubkey_out` buffer
- * \param[out] p_pubkey_length  Upon successful completion, will contain the
- *                              size of the data placed in `p_pubkey_out`.
  */
 typedef psa_status_t (*psa_drv_se_generate_key_t)(psa_key_slot_number_t key_slot,
                                                   psa_key_type_t type,
                                                   psa_key_usage_t usage,
-                                                  size_t bits,
-                                                  uint8_t *p_pubkey_out,
-                                                  size_t pubkey_out_size,
-                                                  size_t *p_pubkey_length);
+                                                  size_t bits);
 
 /**
  * \brief A struct containing all of the function pointers needed to for secure

library/psa_crypto.c

@@ -5331,9 +5331,6 @@ psa_status_t psa_generate_key( const psa_key_attributes_t *attributes,
     psa_status_t status;
     psa_key_slot_t *slot = NULL;
     const psa_se_drv_table_entry_t *driver = NULL;
-    uint8_t p_pubkey_out;
-    size_t pubkey_out_size;
-    size_t p_pubkey_length;
 
     status = psa_start_key_creation( attributes, handle, &slot, &driver );
     if( status != PSA_SUCCESS )
@@ -5350,7 +5347,7 @@ psa_status_t psa_generate_key( const psa_key_attributes_t *attributes,
         }
         status = drv->key_management->p_generate(
             slot->data.se.slot_number, slot->type, slot->policy.usage,
-            attributes->bits, &p_pubkey_out, pubkey_out_size, &p_pubkey_length);
+            attributes->bits);
         if( status != PSA_SUCCESS )
             goto exit;
     }

tests/suites/test_suite_psa_crypto_se_driver_hal_mocks.function

@@ -92,20 +92,13 @@ static void mock_teardown( void )
 static psa_status_t mock_generate( psa_key_slot_number_t key_slot,
                                    psa_key_type_t type,
                                    psa_key_usage_t usage,
-                                   size_t bits,
-                                   uint8_t *p_pubkey_out,
-                                   size_t pubkey_out_size,
-                                   size_t *p_pubkey_length )
+                                   size_t bits )
 {
-    (void) p_pubkey_out;
-    (void) p_pubkey_length;
-
     mock_generate_data.called++;
     mock_generate_data.key_slot = key_slot;
     mock_generate_data.type = type;
     mock_generate_data.usage = usage;
     mock_generate_data.bits = bits;
-    mock_generate_data.pubkey_out_size = pubkey_out_size;
 
     return( mock_generate_data.return_value );
 }