commit 2f41b248c1c470da0d1e141d341e0c8cf094d021
author Hanno Becker <hanno.becker@arm.com> Thu Aug 15 17:29:43 2019 +0100
committer Hanno Becker <hanno.becker@arm.com> Thu Aug 29 16:01:32 2019 +0100
tree 3b5c72abafee8fa66ebb34ddb31deb07aaa3d64a
parent 8443491280a81dc53faf056a2f02f2f3d2de0936

Remove calc_verify SSL function pointer

library/ssl_srv.c

diff --git a/library/ssl_srv.c b/library/ssl_srv.c
index 3b9b70e..39edd83 100644
--- a/library/ssl_srv.c
+++ b/library/ssl_srv.c
@@ -4524,7 +4524,14 @@
          */
         md_alg = mbedtls_ssl_md_alg_from_hash( ssl->in_msg[i] );
 
-        if( md_alg == MBEDTLS_MD_NONE || mbedtls_ssl_set_calc_verify_md( ssl, ssl->in_msg[i] ) )
+        if(
+#if defined(MBEDTLS_SHA512_C)
+            md_alg != MBEDTLS_MD_SHA384 &&
+#endif
+#if defined(MBEDTLS_SHA256_C)
+            md_alg != MBEDTLS_MD_SHA256 &&
+#endif
+            1 )
         {
             MBEDTLS_SSL_DEBUG_MSG( 1, ( "peer not adhering to requested sig_alg"
                                 " for verify message" ) );
@@ -4593,7 +4600,9 @@
     /* Calculate hash and verify signature */
     {
         size_t dummy_hlen;
-        ssl->handshake->calc_verify( ssl, hash, &dummy_hlen );
+        mbedtls_ssl_calc_verify(
+            mbedtls_ssl_get_minor_ver( ssl ),
+            md_alg, ssl, hash, &dummy_hlen );
     }
 
     if( ( ret = mbedtls_pk_verify( peer_pk,