diff options
| author | Matt Caswell <matt@openssl.org> | 2015-12-17 10:01:14 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2015-12-17 13:45:23 +0000 |
| commit | 0d3587c7fcb45dbf111721ade1ccc2abf9dc3934 (patch) | |
| tree | 7ea7527a7ba968cbeaff4343fd5f7f8676558acf /ssl/ssl_ciph.c | |
| parent | ff8428561a4fa89423862f532436a9b109369d53 (diff) | |
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>
Diffstat (limited to 'ssl/ssl_ciph.c')
| -rw-r--r-- | ssl/ssl_ciph.c | 3 |
1 files changed, 3 insertions, 0 deletions
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; |