diff options
| author | Tim Taubert <ttaubert@mozilla.com> | 2016-02-11 08:42:47 +0100 |
|---|---|---|
| committer | Tim Taubert <ttaubert@mozilla.com> | 2016-02-11 08:42:47 +0100 |
| commit | 81b51a48e5dcdaf0bd1c23e3525f712b2a75b0ec (patch) | |
| tree | a0bfdd404aafd0416fb64fafabefe1e57c0e7da1 /lib/pk11wrap/pk11pars.c | |
| parent | 7a60a8faa4344d7def3edcdc768d06424811be5f (diff) | |
| download | nss-hg-81b51a48e5dcdaf0bd1c23e3525f712b2a75b0ec.tar.gz | |
Bug 1227905 - Support ChaCha20+Poly1305 cipher suites r=mt,wtc,ekr
Diffstat (limited to 'lib/pk11wrap/pk11pars.c')
| -rw-r--r-- | lib/pk11wrap/pk11pars.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/pk11wrap/pk11pars.c b/lib/pk11wrap/pk11pars.c index 51160bbda..8dd07e7e5 100644 --- a/lib/pk11wrap/pk11pars.c +++ b/lib/pk11wrap/pk11pars.c @@ -354,6 +354,7 @@ static const oidValDef algOptList[] = { {CIPHER_NAME("CAMELLIA128-CBC"), SEC_OID_CAMELLIA_128_CBC, NSS_USE_ALG_IN_SSL}, {CIPHER_NAME("CAMELLIA192-CBC"), SEC_OID_CAMELLIA_192_CBC, NSS_USE_ALG_IN_SSL}, {CIPHER_NAME("CAMELLIA256-CBC"), SEC_OID_CAMELLIA_256_CBC, NSS_USE_ALG_IN_SSL}, + {CIPHER_NAME("CHACHA20-POLY1305"), SEC_OID_CHACHA20_POLY1305, NSS_USE_ALG_IN_SSL}, {CIPHER_NAME("SEED-CBC"), SEC_OID_SEED_CBC, NSS_USE_ALG_IN_SSL}, {CIPHER_NAME("DES-EDE3-CBC"), SEC_OID_DES_EDE3_CBC, NSS_USE_ALG_IN_SSL}, {CIPHER_NAME("DES-40-CBC"), SEC_OID_DES_40_CBC, NSS_USE_ALG_IN_SSL}, |