summaryrefslogtreecommitdiff
path: root/src/lib/libssl/ssl_ciph.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/libssl/ssl_ciph.c')
-rw-r--r--src/lib/libssl/ssl_ciph.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/lib/libssl/ssl_ciph.c b/src/lib/libssl/ssl_ciph.c
index 2bf73c6606..2921933c28 100644
--- a/src/lib/libssl/ssl_ciph.c
+++ b/src/lib/libssl/ssl_ciph.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssl_ciph.c,v 1.87 2016/10/19 16:38:40 jsing Exp $ */ 1/* $OpenBSD: ssl_ciph.c,v 1.88 2016/11/06 11:58:13 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 *
@@ -711,14 +711,12 @@ ssl_cipher_get_evp_aead(const SSL_SESSION *s, const EVP_AEAD **aead)
711 *aead = EVP_aead_aes_256_gcm(); 711 *aead = EVP_aead_aes_256_gcm();
712 return 1; 712 return 1;
713#endif 713#endif
714#if !defined(OPENSSL_NO_CHACHA) && !defined(OPENSSL_NO_POLY1305)
715 case SSL_CHACHA20POLY1305: 714 case SSL_CHACHA20POLY1305:
716 *aead = EVP_aead_chacha20_poly1305(); 715 *aead = EVP_aead_chacha20_poly1305();
717 return 1; 716 return 1;
718 case SSL_CHACHA20POLY1305_OLD: 717 case SSL_CHACHA20POLY1305_OLD:
719 *aead = EVP_aead_chacha20_poly1305_old(); 718 *aead = EVP_aead_chacha20_poly1305_old();
720 return 1; 719 return 1;
721#endif
722 default: 720 default:
723 break; 721 break;
724 } 722 }