diff options
| author | jkim <jkim@FreeBSD.org> | 2014-04-10 22:39:22 +0000 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2014-04-10 22:39:22 +0000 |
| commit | aeb5a4ff70fa036e3502afc9daf7d02795216340 (patch) | |
| tree | c5b5657bc6509d897204957128bcbeac4535b4b7 /crypto/openssl/ssl/ssl_lib.c | |
| parent | 8f4a94c1c91787a4ac5272d05fa061275e720a27 (diff) | |
| download | FreeBSD-src-aeb5a4ff70fa036e3502afc9daf7d02795216340.zip FreeBSD-src-aeb5a4ff70fa036e3502afc9daf7d02795216340.tar.gz | |
MFC: r261037, r264278
Merge OpenSSL 1.0.1f and 1.0.1g.
Diffstat (limited to 'crypto/openssl/ssl/ssl_lib.c')
| -rw-r--r-- | crypto/openssl/ssl/ssl_lib.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crypto/openssl/ssl/ssl_lib.c b/crypto/openssl/ssl/ssl_lib.c index 14d143d..6dbc3c1 100644 --- a/crypto/openssl/ssl/ssl_lib.c +++ b/crypto/openssl/ssl/ssl_lib.c @@ -1797,7 +1797,9 @@ SSL_CTX *SSL_CTX_new(const SSL_METHOD *meth) CRYPTO_new_ex_data(CRYPTO_EX_INDEX_SSL_CTX, ret, &ret->ex_data); ret->extra_certs=NULL; - ret->comp_methods=SSL_COMP_get_compression_methods(); + /* No compression for DTLS */ + if (meth->version != DTLS1_VERSION) + ret->comp_methods=SSL_COMP_get_compression_methods(); ret->max_send_fragment = SSL3_RT_MAX_PLAIN_LENGTH; @@ -2792,9 +2794,7 @@ void ssl_clear_cipher_ctx(SSL *s) /* Fix this function so that it takes an optional type parameter */ X509 *SSL_get_certificate(const SSL *s) { - if (s->server) - return(ssl_get_server_send_cert(s)); - else if (s->cert != NULL) + if (s->cert != NULL) return(s->cert->key->x509); else return(NULL); |
