diff options
| author | Rob Austein <sra@hactrn.net> | 2006-10-09 16:47:10 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2006-10-09 16:47:10 +0000 |
| commit | 4043d7db4e466d15193c3bad3b204048fc13b785 (patch) | |
| tree | 8156ce31a6e4a155fc240551f48c23b5a42a6e5e /openssl/trunk/ssl/s2_clnt.c | |
| parent | aba277548b76071e75fc9478002a6fc2145f64f1 (diff) | |
Merged in changes from OpenSSL 0.9.8d
svn path=/openssl/trunk/CHANGES; revision=377
Diffstat (limited to 'openssl/trunk/ssl/s2_clnt.c')
| -rw-r--r-- | openssl/trunk/ssl/s2_clnt.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/openssl/trunk/ssl/s2_clnt.c b/openssl/trunk/ssl/s2_clnt.c index efb52485..ce60de63 100644 --- a/openssl/trunk/ssl/s2_clnt.c +++ b/openssl/trunk/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); |