commit 7da726bb53d83f1b2b66750fd215b7781f11e3be
author Manuel Pégourié-Gonnard <mpg@elzevir.fr> Tue Mar 24 18:08:19 2015 +0100
committer Manuel Pégourié-Gonnard <mpg@elzevir.fr> Wed Mar 25 21:55:56 2015 +0100
tree 9ae1bfe0f908095fac444de7e58e26b55dc00658
parent 0a8896ad6faeab60cfa08c42db76124c26646891

Remove calls to xxx_hmac() from SSL modules

library/ssl_srv.c

diff --git a/library/ssl_srv.c b/library/ssl_srv.c
index b7c0335..250f95f 100644
--- a/library/ssl_srv.c
+++ b/library/ssl_srv.c
@@ -236,7 +236,12 @@
     p = state + enc_len;
 
     /* Compute and write MAC( key_name + iv + enc_state_len + enc_state ) */
-    sha256_hmac( ssl->ticket_keys->mac_key, 16, start, p - start, p, 0 );
+    if( ( ret = md_hmac( md_info_from_type( POLARSSL_MD_SHA256 ),
+                         ssl->ticket_keys->mac_key, 16,
+                         start, p - start, p ) ) != 0 )
+    {
+        return( ret );
+    }
     p += 32;
 
     *tlen = p - start;
@@ -282,8 +287,12 @@
     /* don't return yet, check the MAC anyway */
 
     /* Check mac, with constant-time buffer comparison */
-    sha256_hmac( ssl->ticket_keys->mac_key, 16, buf, len - 32,
-                 computed_mac, 0 );
+    if( ( ret = md_hmac( md_info_from_type( POLARSSL_MD_SHA256 ),
+                         ssl->ticket_keys->mac_key, 16,
+                         buf, len - 32, computed_mac ) ) != 0 )
+    {
+        return( ret );
+    }
 
     for( i = 0; i < 32; i++ )
         diff |= mac[i] ^ computed_mac[i];