[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  0d3587c7fcb45dbf111721ade1ccc2abf9dc3934 (commit)
      from  ff8428561a4fa89423862f532436a9b109369d53 (commit)


- Log -----------------------------------------------------------------
commit 0d3587c7fcb45dbf111721ade1ccc2abf9dc3934
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Dec 17 10:01:14 2015 +0000

    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 at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 ssl/ssl_ciph.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c
index ea6aba0..3939010 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;