Commit 822d265c authored by Matt Caswell's avatar Matt Caswell
Browse files

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: default avatarTim Hudson <tjh@openssl.org>
(cherry picked from commit 6329b609)

Conflicts:
	ssl/t1_lib.c
parent 903738ac

ssl/t1_lib.c

+1 −1
Original line number Diff line number Diff line
@@ -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 {