diff options
| author | simon <simon@FreeBSD.org> | 2006-10-01 07:46:16 +0000 |
|---|---|---|
| committer | simon <simon@FreeBSD.org> | 2006-10-01 07:46:16 +0000 |
| commit | de193995a6a9d9e27843cce071dfa49ae516f199 (patch) | |
| tree | b164db4488aaabb1052a147a47aba8c4edb39387 /crypto/openssl/ssl | |
| parent | b2881e9eb192a2eb3b0153ebffc29eb8504b2fd3 (diff) | |
| download | FreeBSD-src-de193995a6a9d9e27843cce071dfa49ae516f199.zip FreeBSD-src-de193995a6a9d9e27843cce071dfa49ae516f199.tar.gz | |
Resolve conflicts after import of OpenSSL 0.9.8d.
Diffstat (limited to 'crypto/openssl/ssl')
| -rw-r--r-- | crypto/openssl/ssl/s2_clnt.c | 3 | ||||
| -rw-r--r-- | crypto/openssl/ssl/s2_lib.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/crypto/openssl/ssl/s2_clnt.c b/crypto/openssl/ssl/s2_clnt.c index efb5248..ce60de6 100644 --- a/crypto/openssl/ssl/s2_clnt.c +++ b/crypto/openssl/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); diff --git a/crypto/openssl/ssl/s2_lib.c b/crypto/openssl/ssl/s2_lib.c index d2cce75..def3a6e 100644 --- a/crypto/openssl/ssl/s2_lib.c +++ b/crypto/openssl/ssl/s2_lib.c @@ -178,7 +178,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl2_ciphers[]={ SSL_ALL_STRENGTHS, }, /* RC4_64_WITH_MD5 */ -#if 1 +#if 0 { 1, SSL2_TXT_RC4_64_WITH_MD5, |
