diff options
| author |   mmcc <mmcc@openbsd.org> | 2016-03-11 07:08:44 +0000 |
|---|---|---|
| committer | mmcc <mmcc@openbsd.org> | 2016-03-11 07:08:44 +0000 |
| commit | 0ce686e5e4c5919f4f3e73d9063f75b32e92aedb (patch) | |
| tree | dfe711c755e7cf84eaa9cf9ec8f4dd0998c96641 /lib/libssl/src/ssl/s3_srvr.c | |
| parent | missing article in previous; (diff) | |
| download | wireguard-openbsd-0ce686e5e4c5919f4f3e73d9063f75b32e92aedb.tar.xz wireguard-openbsd-0ce686e5e4c5919f4f3e73d9063f75b32e92aedb.zip | |
X509_free(3) is NULL-safe, so remove NULL checks before its calls.
ok doug@
Diffstat (limited to 'lib/libssl/src/ssl/s3_srvr.c')
| -rw-r--r-- | lib/libssl/src/ssl/s3_srvr.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/lib/libssl/src/ssl/s3_srvr.c b/lib/libssl/src/ssl/s3_srvr.c index c992406ca8f..10b6312834f 100644 --- a/lib/libssl/src/ssl/s3_srvr.c +++ b/lib/libssl/src/ssl/s3_srvr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: s3_srvr.c,v 1.124 2016/01/27 02:06:16 beck Exp $ */ +/* $OpenBSD: s3_srvr.c,v 1.125 2016/03/11 07:08:45 mmcc Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -2376,8 +2376,7 @@ ssl3_get_client_certificate(SSL *s) } } - if (s->session->peer != NULL) /* This should not be needed */ - X509_free(s->session->peer); + X509_free(s->session->peer); s->session->peer = sk_X509_shift(sk); s->session->verify_result = s->verify_result; @@ -2414,8 +2413,7 @@ f_err: ssl3_send_alert(s, SSL3_AL_FATAL, al); } err: - if (x != NULL) - X509_free(x); + X509_free(x); if (sk != NULL) sk_X509_pop_free(sk, X509_free); return (ret); |