From f030ebd6e5a2b5a2c1a69afffe78fecd4c76d717 Mon Sep 17 00:00:00 2001 From: jsing <> Date: Fri, 19 Sep 2014 16:02:35 +0000 Subject: Add CHACHA20 as a cipher symmetric encryption alias. From Ming --- src/lib/libssl/src/ssl/ssl_ciph.c | 6 +++++- src/lib/libssl/ssl_ciph.c | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) (limited to 'src') 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 */ { -- cgit v1.2.3-55-g6feb