commit bcf258e07731b452e58be99bfffb753d08a7e936
author Manuel Pégourié-Gonnard <manuel.pegourie-gonnard@arm.com> Fri May 03 11:46:27 2019 +0200
committer Manuel Pégourié-Gonnard <manuel.pegourie-gonnard@arm.com> Tue May 07 09:59:40 2019 +0200
tree be9942c962063a47fd8c5320c026b9e3348787e4
parent a575975280bcacd212038298c3e6e21ea2546808

Remove duplicated branch in ssl_compute_master()

library/ssl_tls.c

diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index bf3896a..b2f6594 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -1138,19 +1138,15 @@
                                   "extended master secret",
                                   session_hash, hash_len,
                                   master, 48 );
-        if( ret != 0 )
-        {
-            MBEDTLS_SSL_DEBUG_RET( 1, "prf", ret );
-            return( ret );
-        }
-
     }
     else
 #endif
-    ret = handshake->tls_prf( handshake->premaster, handshake->pmslen,
-                              "master secret",
-                              handshake->randbytes, 64,
-                              master, 48 );
+    {
+        ret = handshake->tls_prf( handshake->premaster, handshake->pmslen,
+                                  "master secret",
+                                  handshake->randbytes, 64,
+                                  master, 48 );
+    }
     if( ret != 0 )
     {
         MBEDTLS_SSL_DEBUG_RET( 1, "prf", ret );