[openssl-commits] [openssl] OpenSSL_1_0_2-stable update

[Matt Caswell]

The branch OpenSSL_1_0_2-stable has been updated
       via  822d265cedd98a0dbf48b123a3a24f8528bb5842 (commit)
      from  903738ac63e60c10552741e2d6de9753c67e0ff3 (commit)


- Log -----------------------------------------------------------------
commit 822d265cedd98a0dbf48b123a3a24f8528bb5842
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>
    (cherry picked from commit 6329b6092b28b656be8a1e4a8363d2e3bcc32053)
    
    Conflicts:
    	ssl/t1_lib.c

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

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 ba09848..681e454 100644
--- a/ssl/t1_lib.c
+++ b/ssl/t1_lib.c
@@ -497,7 +497,7 @@ static int tls1_get_curvelist(SSL *s, int sess,
             } else
 # endif
             {
-                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 {