diff options
| author |   jsing <jsing@openbsd.org> | 2014-07-10 10:09:54 +0000 |
|---|---|---|
| committer | jsing <jsing@openbsd.org> | 2014-07-10 10:09:54 +0000 |
| commit | 17211dc3c17881438aa4de5506faa415c4604481 (patch) | |
| tree | 4deebaed5140a8d776608056a25a9a4c7307b550 /lib/libssl/src | |
| parent | Remove DEBUG_KEYGEN and DEBUG_DECRYPT support. (diff) | |
| download | wireguard-openbsd-17211dc3c17881438aa4de5506faa415c4604481.tar.xz wireguard-openbsd-17211dc3c17881438aa4de5506faa415c4604481.zip | |
Remove more compression related code.
Diffstat (limited to 'lib/libssl/src')
| -rw-r--r-- | lib/libssl/src/ssl/ssl_ciph.c | 11 | ||||
| -rw-r--r-- | lib/libssl/src/ssl/ssl_locl.h | 3 | ||||
| -rw-r--r-- | lib/libssl/src/ssl/t1_enc.c | 9 |
3 files changed, 3 insertions, 20 deletions
diff --git a/lib/libssl/src/ssl/ssl_ciph.c b/lib/libssl/src/ssl/ssl_ciph.c index 05fa290edf5..bcd9b500f48 100644 --- a/lib/libssl/src/ssl/ssl_ciph.c +++ b/lib/libssl/src/ssl/ssl_ciph.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssl_ciph.c,v 1.60 2014/07/10 09:26:08 jsing Exp $ */ +/* $OpenBSD: ssl_ciph.c,v 1.61 2014/07/10 10:09:54 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -641,15 +641,6 @@ ssl_load_ciphers(void) EVP_MD_size(ssl_digest_methods[SSL_MD_SHA384_IDX]); } -/* ssl_cipher_get_comp sets comp to the correct SSL_COMP for the given - * session and returns 1. On error it returns 0. */ -int -ssl_cipher_get_comp(const SSL_SESSION *s, SSL_COMP **comp) -{ - *comp = NULL; - return 1; -} - int ssl_cipher_get_evp(const SSL_SESSION *s, const EVP_CIPHER **enc, const EVP_MD **md, int *mac_pkey_type, int *mac_secret_size) diff --git a/lib/libssl/src/ssl/ssl_locl.h b/lib/libssl/src/ssl/ssl_locl.h index b3bc4f4ae4a..150f56e1d68 100644 --- a/lib/libssl/src/ssl/ssl_locl.h +++ b/lib/libssl/src/ssl/ssl_locl.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ssl_locl.h,v 1.57 2014/07/10 08:51:15 tedu Exp $ */ +/* $OpenBSD: ssl_locl.h,v 1.58 2014/07/10 10:09:54 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -579,7 +579,6 @@ STACK_OF(SSL_CIPHER) *ssl_create_cipher_list(const SSL_METHOD *meth, STACK_OF(SSL_CIPHER) **pref, STACK_OF(SSL_CIPHER) **sorted, const char *rule_str); void ssl_update_cache(SSL *s, int mode); -int ssl_cipher_get_comp(const SSL_SESSION *s, SSL_COMP **comp); int ssl_cipher_get_evp(const SSL_SESSION *s, const EVP_CIPHER **enc, const EVP_MD **md, int *mac_pkey_type, int *mac_secret_size); int ssl_cipher_get_evp_aead(const SSL_SESSION *s, const EVP_AEAD **aead); diff --git a/lib/libssl/src/ssl/t1_enc.c b/lib/libssl/src/ssl/t1_enc.c index cccf17eab5f..e4b54691c69 100644 --- a/lib/libssl/src/ssl/t1_enc.c +++ b/lib/libssl/src/ssl/t1_enc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: t1_enc.c,v 1.66 2014/07/10 08:51:15 tedu Exp $ */ +/* $OpenBSD: t1_enc.c,v 1.67 2014/07/10 10:09:54 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -568,18 +568,11 @@ tls1_setup_key_block(SSL *s) const EVP_CIPHER *cipher = NULL; const EVP_AEAD *aead = NULL; const EVP_MD *mac = NULL; - SSL_COMP *comp; int ret = 0; if (s->s3->tmp.key_block_length != 0) return (1); - if (!ssl_cipher_get_comp(s->session, &comp)) { - SSLerr(SSL_F_TLS1_SETUP_KEY_BLOCK, - SSL_R_CIPHER_COMPRESSION_UNAVAILABLE); - return (0); - } - if (s->session->cipher && (s->session->cipher->algorithm2 & SSL_CIPHER_ALGORITHM2_AEAD)) { if (!ssl_cipher_get_evp_aead(s->session, &aead)) { |