[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  6329b6092b28b656be8a1e4a8363d2e3bcc32053 (commit)
      from  55646005a9ce3c85e394c6afae5f6ed6045494c6 (commit)


- Log -----------------------------------------------------------------
commit 6329b6092b28b656be8a1e4a8363d2e3bcc32053
Author: Matt Caswell <matt at openssl.org>
Date:   Mon Nov 9 16:37:33 2015 +0000

    Remove redundant check from tls1_get_curvelist
    
    The function tls1_get_curvelist() has an explicit check to see if s->cert
    is NULL or not. However the check appears *after* calling the tls1_suiteb
    macro which derefs s->cert. In reality s->cert can never be NULL because
    it is created in SSL_new(). If the malloc fails then the SSL_new call fails
    and no SSL object is created.
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 ssl/t1_lib.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c
index 9607c2e..943d473 100644
--- a/ssl/t1_lib.c
+++ b/ssl/t1_lib.c
@@ -441,7 +441,7 @@ static int tls1_get_curvelist(SSL *s, int sess,
             pcurveslen = s->tlsext_ellipticcurvelist_length;
         }
         if (!*pcurves) {
-            if (!s->server || (s->cert && s->cert->ecdh_tmp_auto)) {
+            if (!s->server || s->cert->ecdh_tmp_auto) {
                 *pcurves = eccurves_auto;
                 pcurveslen = sizeof(eccurves_auto);
             } else {