summaryrefslogtreecommitdiffstats
path: root/lib/libssl/src/ssl/s2_clnt.c
diff options
context:
space:
mode:
authorpvalchev <pvalchev@openbsd.org>2006-10-04 07:10:32 +0000
committerpvalchev <pvalchev@openbsd.org>2006-10-04 07:10:32 +0000
commitee1f122a7f1aa1b18c5a7868e2e1f6aebc126d33 (patch)
treeda8a6539140cd3cd80f46a3f048137c68abdbd84 /lib/libssl/src/ssl/s2_clnt.c
parentExit when asked to. OK by deraadt, spotted by lumpy. (diff)
downloadwireguard-openbsd-ee1f122a7f1aa1b18c5a7868e2e1f6aebc126d33.tar.xz
wireguard-openbsd-ee1f122a7f1aa1b18c5a7868e2e1f6aebc126d33.zip
openssl security fixes, diff from markus@, ok & "commit it" djm@
http://www.openssl.org/news/secadv_20060928.txt for more
Diffstat (limited to 'lib/libssl/src/ssl/s2_clnt.c')
-rw-r--r--lib/libssl/src/ssl/s2_clnt.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/libssl/src/ssl/s2_clnt.c b/lib/libssl/src/ssl/s2_clnt.c
index eba04c715b3..003809271be 100644
--- a/lib/libssl/src/ssl/s2_clnt.c
+++ b/lib/libssl/src/ssl/s2_clnt.c
@@ -538,7 +538,8 @@ static int get_server_hello(SSL *s)
CRYPTO_add(&s->session->peer->references, 1, CRYPTO_LOCK_X509);
}
- if (s->session->peer != s->session->sess_cert->peer_key->x509)
+ if (s->session->sess_cert == NULL ||
+ s->session->peer != s->session->sess_cert->peer_key->x509)
/* can't happen */
{
ssl2_return_error(s, SSL2_PE_UNDEFINED_ERROR);