From ff5ca5b45cd3a88df256cc064db92adafbfbada5 Mon Sep 17 00:00:00 2001
From: jsing <>
Date: Thu, 28 Apr 2016 16:06:53 +0000
Subject: 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.
---
 src/lib/libssl/ssl_ciph.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/lib/libssl/ssl_ciph.c')

diff --git a/src/lib/libssl/ssl_ciph.c b/src/lib/libssl/ssl_ciph.c
index 05bfc47c1e..5d1d568ff8 100644
--- a/src/lib/libssl/ssl_ciph.c
+++ b/src/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:
-- 
cgit v1.2.3-55-g6feb