Add SSL_CIPHER_description() for Chacha20/Poly1305
authorMatt Caswell <matt@openssl.org>
Thu, 17 Dec 2015 10:01:14 +0000 (10:01 +0000)
committerMatt Caswell <matt@openssl.org>
Thu, 17 Dec 2015 13:45:23 +0000 (13:45 +0000)
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>
ssl/ssl_ciph.c

index ea6aba0..3939010 100644 (file)
@@ -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;