diff options
| author | Matt Caswell <matt@openssl.org> | 2015-11-09 17:37:33 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2015-11-10 00:07:57 +0100 |
| commit | 6329b6092b28b656be8a1e4a8363d2e3bcc32053 (patch) | |
| tree | 0efcf435a51855c4264dac744a7a7784321c899f /ssl | |
| parent | Continue malloc standardisation in engines (diff) | |
| download | openssl-6329b6092b28b656be8a1e4a8363d2e3bcc32053.tar.xz openssl-6329b6092b28b656be8a1e4a8363d2e3bcc32053.zip | |
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@openssl.org>
Diffstat (limited to 'ssl')
| -rw-r--r-- | ssl/t1_lib.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c index 9607c2e02a..943d4733f4 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 { |