kris/boringssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add GENERIC selector for TLS 1.3 AEAD-only cipher suites.

Browse Source 
Change-Id: Ib499b3393962a4d41cf9694e055ed3eb869d91a2
Reviewed-on: https://boringssl-review.googlesource.com/11504
Reviewed-by: David Benjamin <davidben@google.com>
Commit-Queue: David Benjamin <davidben@google.com>
CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
This commit is contained in:
Steven Valdez 2016-10-06 14:59:23 -04:00 committed by CQ bot account: commit-bot@chromium.org
parent 93d242bdea
commit 3cbdc34619
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ssl/ssl_cipher.c
View File

@ -738,6 +738,9 @@ static const CIPHER_ALIAS kCipherAliases[] = {
{"TLSv1", ~SSL_kCECPQ1, ~0u, ~SSL_eNULL, ~0u, SSL3_VERSION},
{"TLSv1.2", ~SSL_kCECPQ1, ~0u, ~SSL_eNULL, ~0u, TLS1_2_VERSION},
/* AEAD-only ciphers for TLS 1.3. */
{"GENERIC", SSL_kGENERIC, SSL_aGENERIC, ~0u, ~0u, 0},
/* Legacy strength classes. */
{"HIGH", ~SSL_kCECPQ1, ~0u, ~SSL_eNULL, ~0u, 0},
{"FIPS", ~SSL_kCECPQ1, ~0u, ~SSL_eNULL, ~0u, 0},

2
ssl/ssl_test.cc
View File

@ -269,6 +269,7 @@ static const char *kMustNotIncludeNull[] = {
"SSLv3",
"TLSv1",
"TLSv1.2",
"GENERIC",
};
static const char *kMustNotIncludeCECPQ1[] = {
@ -293,6 +294,7 @@ static const char *kMustNotIncludeCECPQ1[] = {
"AES256",
"AESGCM",
"CHACHA20",
"GENERIC",
};
static const CurveTest kCurveTests[] = {