commit 9e4f77c6068a633b18f439d8e06670826c54a1d5
author Gilles Peskine <Gilles.Peskine@arm.com> Mon Jan 22 11:48:08 2018 +0100
committer Gilles Peskine <Gilles.Peskine@arm.com> Mon Jan 22 11:54:42 2018 +0100
tree 542a2fd783fcbc0bd1e9e8e0e190043215e37a03
parent 15932e0cbfd25ba044f0d38b24801829de7c1884

New MD API: rename functions from _ext to _ret

The _ext suffix suggests "new arguments", but the new functions have
the same arguments. Use _ret instead, to convey that the difference is
that the new functions return a value.

library/sha512.c

diff --git a/library/sha512.c b/library/sha512.c
index d0faba9..c99b6da 100644
--- a/library/sha512.c
+++ b/library/sha512.c
@@ -114,7 +114,7 @@
 /*
  * SHA-512 context setup
  */
-int mbedtls_sha512_starts_ext( mbedtls_sha512_context *ctx, int is384 )
+int mbedtls_sha512_starts_ret( mbedtls_sha512_context *ctx, int is384 )
 {
     ctx->total[0] = 0;
     ctx->total[1] = 0;
@@ -274,7 +274,7 @@
 /*
  * SHA-512 process buffer
  */
-int mbedtls_sha512_update_ext( mbedtls_sha512_context *ctx,
+int mbedtls_sha512_update_ret( mbedtls_sha512_context *ctx,
                                const unsigned char *input,
                                size_t ilen )
 {
@@ -335,7 +335,7 @@
 /*
  * SHA-512 final digest
  */
-int mbedtls_sha512_finish_ext( mbedtls_sha512_context *ctx,
+int mbedtls_sha512_finish_ret( mbedtls_sha512_context *ctx,
                                unsigned char output[64] )
 {
     int ret;
@@ -353,10 +353,10 @@
     last = (size_t)( ctx->total[0] & 0x7F );
     padn = ( last < 112 ) ? ( 112 - last ) : ( 240 - last );
 
-    if( ( ret = mbedtls_sha512_update_ext( ctx, sha512_padding, padn ) ) != 0 )
+    if( ( ret = mbedtls_sha512_update_ret( ctx, sha512_padding, padn ) ) != 0 )
             return( ret );
 
-    if( ( ret = mbedtls_sha512_update_ext( ctx, msglen, 16 ) ) != 0 )
+    if( ( ret = mbedtls_sha512_update_ret( ctx, msglen, 16 ) ) != 0 )
             return( ret );
 
     PUT_UINT64_BE( ctx->state[0], output,  0 );
@@ -380,7 +380,7 @@
 /*
  * output = SHA-512( input buffer )
  */
-int mbedtls_sha512_ext( const unsigned char *input,
+int mbedtls_sha512_ret( const unsigned char *input,
                     size_t ilen,
                     unsigned char output[64],
                     int is384 )
@@ -390,13 +390,13 @@
 
     mbedtls_sha512_init( &ctx );
 
-    if( ( ret = mbedtls_sha512_starts_ext( &ctx, is384 ) ) != 0 )
+    if( ( ret = mbedtls_sha512_starts_ret( &ctx, is384 ) ) != 0 )
         goto exit;
 
-    if( ( ret = mbedtls_sha512_update_ext( &ctx, input, ilen ) ) != 0 )
+    if( ( ret = mbedtls_sha512_update_ret( &ctx, input, ilen ) ) != 0 )
         goto exit;
 
-    if( ( ret = mbedtls_sha512_finish_ext( &ctx, output ) ) != 0 )
+    if( ( ret = mbedtls_sha512_finish_ret( &ctx, output ) ) != 0 )
         goto exit;
 
 exit:
@@ -505,7 +505,7 @@
         if( verbose != 0 )
             mbedtls_printf( "  SHA-%d test #%d: ", 512 - k * 128, j + 1 );
 
-        if( ( ret = mbedtls_sha512_starts_ext( &ctx, k ) ) != 0 )
+        if( ( ret = mbedtls_sha512_starts_ret( &ctx, k ) ) != 0 )
             goto fail;
 
         if( j == 2 )
@@ -514,20 +514,20 @@
 
             for( j = 0; j < 1000; j++ )
             {
-                ret = mbedtls_sha512_update_ext( &ctx, buf, buflen );
+                ret = mbedtls_sha512_update_ret( &ctx, buf, buflen );
                 if( ret != 0 )
                     goto fail;
             }
         }
         else
         {
-            ret = mbedtls_sha512_update_ext( &ctx, sha512_test_buf[j],
+            ret = mbedtls_sha512_update_ret( &ctx, sha512_test_buf[j],
                                              sha512_test_buflen[j] );
             if( ret != 0 )
                 goto fail;
         }
 
-        if( ( ret = mbedtls_sha512_finish_ext( &ctx, sha512sum ) ) != 0 )
+        if( ( ret = mbedtls_sha512_finish_ret( &ctx, sha512sum ) ) != 0 )
             goto fail;
 
         if( memcmp( sha512sum, sha512_test_sum[i], 64 - k * 16 ) != 0 )