diff options
| author |   jsing <jsing@openbsd.org> | 2016-04-28 16:06:53 +0000 |
|---|---|---|
| committer | jsing <jsing@openbsd.org> | 2016-04-28 16:06:53 +0000 |
| commit | 685a9ab64edd719dcf849ea1e40db9967c885012 (patch) | |
| tree | 5265dd481a56ff65d354ea9075b164cf1079711d /lib/libssl/ssl_ciph.c | |
| parent | Rework handling of frames which fall beyond the block ack window. (diff) | |
| download | wireguard-openbsd-685a9ab64edd719dcf849ea1e40db9967c885012.tar.xz wireguard-openbsd-685a9ab64edd719dcf849ea1e40db9967c885012.zip | |
Rename EVP_aead_chacha20_poly1305() to EVP_aead_chacha20_poly1305_old()
and replace with EVP_aead_chacha20_poly1305_ietf(). The IETF version will
become the standard version.
Discussed with many.
Diffstat (limited to 'lib/libssl/ssl_ciph.c')
| -rw-r--r-- | lib/libssl/ssl_ciph.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/libssl/ssl_ciph.c b/lib/libssl/ssl_ciph.c index 05bfc47c1ed..5d1d568ff84 100644 --- a/lib/libssl/ssl_ciph.c +++ b/lib/libssl/ssl_ciph.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssl_ciph.c,v 1.84 2015/12/12 22:04:10 mmcc Exp $ */ +/* $OpenBSD: ssl_ciph.c,v 1.85 2016/04/28 16:06:53 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -731,7 +731,7 @@ ssl_cipher_get_evp_aead(const SSL_SESSION *s, const EVP_AEAD **aead) #endif #if !defined(OPENSSL_NO_CHACHA) && !defined(OPENSSL_NO_POLY1305) case SSL_CHACHA20POLY1305: - *aead = EVP_aead_chacha20_poly1305(); + *aead = EVP_aead_chacha20_poly1305_old(); return 1; #endif default: |