diff options
| author |   jsing <jsing@openbsd.org> | 2018-09-06 16:40:45 +0000 |
|---|---|---|
| committer | jsing <jsing@openbsd.org> | 2018-09-06 16:40:45 +0000 |
| commit | 4b5b5a86b0c009a81868251683c05e01fa190431 (patch) | |
| tree | ae7c80066a2cb38ffe4d764d226ccf5bf6f4f1f1 /lib/libssl/t1_enc.c | |
| parent | get rid of a temp file, noted by claudio@ (diff) | |
| download | wireguard-openbsd-4b5b5a86b0c009a81868251683c05e01fa190431.tar.xz wireguard-openbsd-4b5b5a86b0c009a81868251683c05e01fa190431.zip | |
Drop SSL_CIPHER_ALGORITHM2_AEAD flag.
All of our algorithm_mac == SSL_AEAD cipher suites use EVP_AEAD, so we can
condition on that rather than having a separate redundant flag.
ok tb@
Diffstat (limited to 'lib/libssl/t1_enc.c')
| -rw-r--r-- | lib/libssl/t1_enc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/libssl/t1_enc.c b/lib/libssl/t1_enc.c index 01ff05952c4..77ac5899acc 100644 --- a/lib/libssl/t1_enc.c +++ b/lib/libssl/t1_enc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: t1_enc.c,v 1.112 2018/09/05 16:58:59 jsing Exp $ */ +/* $OpenBSD: t1_enc.c,v 1.113 2018/09/06 16:40:45 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -661,7 +661,7 @@ tls1_setup_key_block(SSL *s) return (1); if (s->session->cipher && - (s->session->cipher->algorithm2 & SSL_CIPHER_ALGORITHM2_AEAD)) { + (s->session->cipher->algorithm_mac & SSL_AEAD)) { if (!ssl_cipher_get_evp_aead(s->session, &aead)) { SSLerror(s, SSL_R_CIPHER_OR_HASH_UNAVAILABLE); return (0); |