commit bd096101b5fb292642b15a0255800dc6f3664f17
author Janos Follath <janos.follath@arm.com> Tue Jul 30 12:57:15 2019 +0100
committer Janos Follath <janos.follath@arm.com> Fri Aug 16 11:45:55 2019 +0100
tree d8d58ca489ac3204108cc74d6b7057cf02f3fa34
parent 6de99db44971e30c8b25a81dabee17d87db30b4e

Update psa_generator_abort to PSA 1.0

library/ssl_cli.c

diff --git a/library/ssl_cli.c b/library/ssl_cli.c
index e69aa27..46456c1 100644
--- a/library/ssl_cli.c
+++ b/library/ssl_cli.c
@@ -3320,11 +3320,11 @@
                                                   ssl->handshake->pmslen );
         if( status != PSA_SUCCESS )
         {
-            psa_generator_abort( &generator );
+            psa_key_derivation_abort( &generator );
             return( MBEDTLS_ERR_SSL_HW_ACCEL_FAILED );
         }
 
-        status = psa_generator_abort( &generator );
+        status = psa_key_derivation_abort( &generator );
         if( status != PSA_SUCCESS )
             return( MBEDTLS_ERR_SSL_HW_ACCEL_FAILED );
 

library/ssl_tls.c

diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index 4b36c4c..944907d 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -663,7 +663,7 @@
                                  dlen );
     if( status != PSA_SUCCESS )
     {
-        psa_generator_abort( &generator );
+        psa_key_derivation_abort( &generator );
         psa_destroy_key( master_slot );
         return( MBEDTLS_ERR_SSL_HW_ACCEL_FAILED );
     }
@@ -671,12 +671,12 @@
     status = psa_key_derivation_output_bytes( &generator, dstbuf, dlen );
     if( status != PSA_SUCCESS )
     {
-        psa_generator_abort( &generator );
+        psa_key_derivation_abort( &generator );
         psa_destroy_key( master_slot );
         return( MBEDTLS_ERR_SSL_HW_ACCEL_FAILED );
     }
 
-    status = psa_generator_abort( &generator );
+    status = psa_key_derivation_abort( &generator );
     if( status != PSA_SUCCESS )
     {
         psa_destroy_key( master_slot );
@@ -1131,7 +1131,7 @@
                                          master_secret_len );
             if( status != PSA_SUCCESS )
             {
-                psa_generator_abort( &generator );
+                psa_key_derivation_abort( &generator );
                 return( MBEDTLS_ERR_SSL_HW_ACCEL_FAILED );
             }
 
@@ -1140,11 +1140,11 @@
                                                       master_secret_len );
             if( status != PSA_SUCCESS )
             {
-                psa_generator_abort( &generator );
+                psa_key_derivation_abort( &generator );
                 return( MBEDTLS_ERR_SSL_HW_ACCEL_FAILED );
             }
 
-            status = psa_generator_abort( &generator );
+            status = psa_key_derivation_abort( &generator );
             if( status != PSA_SUCCESS )
                 return( MBEDTLS_ERR_SSL_HW_ACCEL_FAILED );
         }