From 1b2aa7959c86a835491c8cfca8c0683b747c1855 Mon Sep 17 00:00:00 2001 From: Rob Austein Date: Mon, 9 Oct 2006 16:29:05 +0000 Subject: Merge in vendor branch OpenSSL changes 0.9.8b -> 0.9.8d svn path=/openssl/vendor/current/CHANGES; revision=375 --- openssl/vendor/current/ssl/s2_clnt.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'openssl/vendor/current/ssl/s2_clnt.c') diff --git a/openssl/vendor/current/ssl/s2_clnt.c b/openssl/vendor/current/ssl/s2_clnt.c index efb52485..ce60de63 100644 --- a/openssl/vendor/current/ssl/s2_clnt.c +++ b/openssl/vendor/current/ssl/s2_clnt.c @@ -520,7 +520,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); -- cgit v1.2.3