From: Matt Caswell <matt@openssl.org>
Date: Thu, 17 Dec 2015 10:01:14 +0000 (+0000)
Subject: Add SSL_CIPHER_description() for Chacha20/Poly1305
X-Git-Tag: OpenSSL_1_1_0-pre2~198
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=0d3587c7fcb45dbf111721ade1ccc2abf9dc3934;p=oweals%2Fopenssl.git

Add SSL_CIPHER_description() for Chacha20/Poly1305

SSL_CIPHER_description() was returning "unknown" for the encryption
in the new ChaCha20/Poly1305 TLS ciphersuites.

RT#4183

Reviewed-by: Richard Levitte <levitte@openssl.org>
---

diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c
index ea6aba04f4..3939010515 100644
--- a/ssl/ssl_ciph.c
+++ b/ssl/ssl_ciph.c
@@ -1747,6 +1747,9 @@ char *SSL_CIPHER_description(const SSL_CIPHER *cipher, char *buf, int len)
     case SSL_eGOST2814789CNT12:
         enc = "GOST89(256)";
         break;
+    case SSL_CHACHA20POLY1305:
+        enc = "CHACHA20/POLY1305(256)";
+        break;
     default:
         enc = "unknown";
         break;