2 files changed, 10 insertions, 2 deletions

diff --git a/src/lib/libssl/src/ssl/ssl_ciph.c b/src/lib/libssl/src/ssl/ssl_ciph.c
index 701d0f2277..586ae13974 100644
--- a/src/lib/libssl/src/ssl/ssl_ciph.c
+++ b/src/lib/libssl/src/ssl/ssl_ciph.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssl_ciph.c,v 1.67 2014/09/07 12:16:23 jsing Exp $ */
+/* $OpenBSD: ssl_ciph.c,v 1.68 2014/09/19 16:02:35 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -413,6 +413,10 @@ static const SSL_CIPHER cipher_aliases[] = {
                 .name = SSL_TXT_CAMELLIA,
                 .algorithm_enc = SSL_CAMELLIA128|SSL_CAMELLIA256,
         },
+        {
+                .name = SSL_TXT_CHACHA20,
+                .algorithm_enc = SSL_CHACHA20POLY1305,
+        },
         
         /* MAC aliases */
         {
diff --git a/src/lib/libssl/ssl_ciph.c b/src/lib/libssl/ssl_ciph.c
index 701d0f2277..586ae13974 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.67 2014/09/07 12:16:23 jsing Exp $ */
+/* $OpenBSD: ssl_ciph.c,v 1.68 2014/09/19 16:02:35 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -413,6 +413,10 @@ static const SSL_CIPHER cipher_aliases[] = {
                 .name = SSL_TXT_CAMELLIA,
                 .algorithm_enc = SSL_CAMELLIA128|SSL_CAMELLIA256,
         },
+        {
+                .name = SSL_TXT_CHACHA20,
+                .algorithm_enc = SSL_CHACHA20POLY1305,
+        },
         
         /* MAC aliases */
         {