diff options
| author | jsing <> | 2014-09-19 16:02:35 +0000 |
|---|---|---|
| committer | jsing <> | 2014-09-19 16:02:35 +0000 |
| commit | f030ebd6e5a2b5a2c1a69afffe78fecd4c76d717 (patch) | |
| tree | 2919630532b1a7de8f7f0433ab3cf37201d90e4d /src | |
| parent | ddabb314aa9f75db7efa299f3bf6f42df71cedad (diff) | |
| download | openbsd-f030ebd6e5a2b5a2c1a69afffe78fecd4c76d717.tar.gz openbsd-f030ebd6e5a2b5a2c1a69afffe78fecd4c76d717.tar.bz2 openbsd-f030ebd6e5a2b5a2c1a69afffe78fecd4c76d717.zip | |
Add CHACHA20 as a cipher symmetric encryption alias.
From Ming <gzchenym at 126.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/libssl/src/ssl/ssl_ciph.c | 6 | ||||
| -rw-r--r-- | src/lib/libssl/ssl_ciph.c | 6 |
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 @@ | |||
| 1 | /* $OpenBSD: ssl_ciph.c,v 1.67 2014/09/07 12:16:23 jsing Exp $ */ | 1 | /* $OpenBSD: ssl_ciph.c,v 1.68 2014/09/19 16:02:35 jsing Exp $ */ |
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
| 3 | * All rights reserved. | 3 | * All rights reserved. |
| 4 | * | 4 | * |
| @@ -413,6 +413,10 @@ static const SSL_CIPHER cipher_aliases[] = { | |||
| 413 | .name = SSL_TXT_CAMELLIA, | 413 | .name = SSL_TXT_CAMELLIA, |
| 414 | .algorithm_enc = SSL_CAMELLIA128|SSL_CAMELLIA256, | 414 | .algorithm_enc = SSL_CAMELLIA128|SSL_CAMELLIA256, |
| 415 | }, | 415 | }, |
| 416 | { | ||
| 417 | .name = SSL_TXT_CHACHA20, | ||
| 418 | .algorithm_enc = SSL_CHACHA20POLY1305, | ||
| 419 | }, | ||
| 416 | 420 | ||
| 417 | /* MAC aliases */ | 421 | /* MAC aliases */ |
| 418 | { | 422 | { |
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 @@ | |||
| 1 | /* $OpenBSD: ssl_ciph.c,v 1.67 2014/09/07 12:16:23 jsing Exp $ */ | 1 | /* $OpenBSD: ssl_ciph.c,v 1.68 2014/09/19 16:02:35 jsing Exp $ */ |
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
| 3 | * All rights reserved. | 3 | * All rights reserved. |
| 4 | * | 4 | * |
| @@ -413,6 +413,10 @@ static const SSL_CIPHER cipher_aliases[] = { | |||
| 413 | .name = SSL_TXT_CAMELLIA, | 413 | .name = SSL_TXT_CAMELLIA, |
| 414 | .algorithm_enc = SSL_CAMELLIA128|SSL_CAMELLIA256, | 414 | .algorithm_enc = SSL_CAMELLIA128|SSL_CAMELLIA256, |
| 415 | }, | 415 | }, |
| 416 | { | ||
| 417 | .name = SSL_TXT_CHACHA20, | ||
| 418 | .algorithm_enc = SSL_CHACHA20POLY1305, | ||
| 419 | }, | ||
| 416 | 420 | ||
| 417 | /* MAC aliases */ | 421 | /* MAC aliases */ |
| 418 | { | 422 | { |