reorder calls and simplify

Author: effbiae

src/internal.c

@@ -33252,15 +33252,13 @@ static int AddPSKtoPreMasterSecret(WOLFSSL* ssl)
 #if (defined(HAVE_ECC) || defined(HAVE_CURVE25519) || defined(HAVE_CURVE448) \
                        || !defined(NO_DH))\
   && !defined(NO_PSK)
-static int MakeDhePSKPreMasterSecret(WOLFSSL* ssl, byte addPSKtoPreMasterSecret)
+static void MakeDhePSKPreMasterSecret(WOLFSSL* ssl)
 {
     Arrays* arrays = ssl->arrays;
     byte* pms = arrays->preMasterSecret;
     c16toa((word16)arrays->preMasterSz, pms);
     arrays->preMasterSz += OPAQUE16_LEN;
     pms += arrays->preMasterSz;
-    if (addPSKtoPreMasterSecret && AddPSKtoPreMasterSecret(ssl))
-        return 1;
     if ((int)arrays->psk_keySz > 0) {
         c16toa((word16)arrays->psk_keySz, pms);
         pms += OPAQUE16_LEN;
@@ -33269,7 +33267,6 @@ static int MakeDhePSKPreMasterSecret(WOLFSSL* ssl, byte addPSKtoPreMasterSecret)
         ForceZero(arrays->psk_key, arrays->psk_keySz);
     }
     arrays->psk_keySz = 0; /* No further need */
-    return 0;
 }
 #endif
 
@@ -34250,7 +34247,7 @@ int SendClientKeyExchange(WOLFSSL* ssl)
                     c16toa((word16)args->length, args->output);
                     args->encSz += args->length + OPAQUE16_LEN;
 
-                    (void)MakeDhePSKPreMasterSecret(ssl, 0);
+                    MakeDhePSKPreMasterSecret(ssl);
                     break;
                 }
             #endif /* !NO_DH && !NO_PSK */
@@ -34269,7 +34266,7 @@ int SendClientKeyExchange(WOLFSSL* ssl)
 
                     /* Create pre master secret is the concatenation of
                      * eccSize + eccSharedKey + pskSize + pskKey */
-                    (void)MakeDhePSKPreMasterSecret(ssl, 0);
+                    MakeDhePSKPreMasterSecret(ssl);
                     break;
                 }
             #endif /* (HAVE_ECC || HAVE_CURVE25519 || HAVE_CURVE448) && !NO_PSK */
@@ -41902,8 +41899,9 @@ static int DefTicketEncCb(WOLFSSL* ssl, byte key_name[WOLFSSL_TICKET_NAME_SZ],
 
                         /* Use the PSK hint to look up the PSK and add it to the
                          * preMasterSecret here. */
-                        if (MakeDhePSKPreMasterSecret(ssl, 1))
+                        if (AddPSKtoPreMasterSecret(ssl))
                             ERROR_OUT(PSK_KEY_ERROR, exit_dcke);
+                        MakeDhePSKPreMasterSecret(ssl);
                         break;
                     }
                 #endif /* !NO_DH && !NO_PSK */
@@ -41921,8 +41919,9 @@ static int DefTicketEncCb(WOLFSSL* ssl, byte key_name[WOLFSSL_TICKET_NAME_SZ],
 
                         /* Use the PSK hint to look up the PSK and add it to the
                          * preMasterSecret here. */
-                        if (MakeDhePSKPreMasterSecret(ssl, 1))
+                        if (AddPSKtoPreMasterSecret(ssl))
                             ERROR_OUT(PSK_KEY_ERROR, exit_dcke);
+                        MakeDhePSKPreMasterSecret(ssl);
                         break;
                     }
                 #endif /* (HAVE_ECC || CURVE25519 || CURVE448) && !NO_PSK */