From bcf258e07731b452e58be99bfffb753d08a7e936 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20P=C3=A9gouri=C3=A9-Gonnard?=
 <manuel.pegourie-gonnard@arm.com>
Date: Fri, 3 May 2019 11:46:27 +0200
Subject: [PATCH] Remove duplicated branch in ssl_compute_master()

---
 library/ssl_tls.c | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index bf3896ab6..b2f65944f 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -1138,19 +1138,15 @@ static int ssl_compute_master( mbedtls_ssl_handshake_params *handshake,
                                   "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 );