diff options
| author | Joel Sing <jsing@cvs.openbsd.org> | 2014-09-19 16:02:36 +0000 |
|---|---|---|
| committer | Joel Sing <jsing@cvs.openbsd.org> | 2014-09-19 16:02:36 +0000 |
| commit | 31cd09c1f81b9e85d89d8d5379330d503049a4f5 (patch) | |
| tree | 2efc0a10557fb344ddd11d1542b779556f6bf3ee /lib | |
| parent | 5f472d02ae931e2a6b870c49db836834a798d529 (diff) | |
Add CHACHA20 as a cipher symmetric encryption alias.
From Ming <gzchenym at 126.com>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libssl/src/ssl/ssl_ciph.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/libssl/src/ssl/ssl_ciph.c b/lib/libssl/src/ssl/ssl_ciph.c index 701d0f2277e..586ae139745 100644 --- a/lib/libssl/src/ssl/ssl_ciph.c +++ b/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 */ { |