summaryrefslogtreecommitdiff
path: root/src/lib/libssl/t1_enc.c
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/lib/libssl/t1_enc.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/src/lib/libssl/t1_enc.c b/src/lib/libssl/t1_enc.c
index cccf17eab5..e4b54691c6 100644
--- a/src/lib/libssl/t1_enc.c
+++ b/src/lib/libssl/t1_enc.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: t1_enc.c,v 1.66 2014/07/10 08:51:15 tedu Exp $ */ 1/* $OpenBSD: t1_enc.c,v 1.67 2014/07/10 10:09:54 jsing Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -568,18 +568,11 @@ tls1_setup_key_block(SSL *s)
568 const EVP_CIPHER *cipher = NULL; 568 const EVP_CIPHER *cipher = NULL;
569 const EVP_AEAD *aead = NULL; 569 const EVP_AEAD *aead = NULL;
570 const EVP_MD *mac = NULL; 570 const EVP_MD *mac = NULL;
571 SSL_COMP *comp;
572 int ret = 0; 571 int ret = 0;
573 572
574 if (s->s3->tmp.key_block_length != 0) 573 if (s->s3->tmp.key_block_length != 0)
575 return (1); 574 return (1);
576 575
577 if (!ssl_cipher_get_comp(s->session, &comp)) {
578 SSLerr(SSL_F_TLS1_SETUP_KEY_BLOCK,
579 SSL_R_CIPHER_COMPRESSION_UNAVAILABLE);
580 return (0);
581 }
582
583 if (s->session->cipher && 576 if (s->session->cipher &&
584 (s->session->cipher->algorithm2 & SSL_CIPHER_ALGORITHM2_AEAD)) { 577 (s->session->cipher->algorithm2 & SSL_CIPHER_ALGORITHM2_AEAD)) {
585 if (!ssl_cipher_get_evp_aead(s->session, &aead)) { 578 if (!ssl_cipher_get_evp_aead(s->session, &aead)) {