commit 3cbdc34619daafb9f8527fb9dd27afc8ee7dcf19
author Steven Valdez <svaldez@google.com> Thu Oct 06 14:59:23 2016 -0400
committer CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org> Thu Oct 06 19:37:40 2016 +0000
tree 71ec2fd485a1a2d035957e59db7bbedacbd2acf6
parent 93d242bdea79a30ae51655b9523c8d0dea3cb9a1

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

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>

ssl/ssl_cipher.c

diff --git a/ssl/ssl_cipher.c b/ssl/ssl_cipher.c
index 08a4e65..6d48c89 100644
--- a/ssl/ssl_cipher.c
+++ b/ssl/ssl_cipher.c
@@ -738,6 +738,9 @@
     {"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},

ssl/ssl_test.cc

diff --git a/ssl/ssl_test.cc b/ssl/ssl_test.cc
index f6d1732..419cce5 100644
--- a/ssl/ssl_test.cc
+++ b/ssl/ssl_test.cc
@@ -269,6 +269,7 @@
   "SSLv3",
   "TLSv1",
   "TLSv1.2",
+  "GENERIC",
 };
 
 static const char *kMustNotIncludeCECPQ1[] = {
@@ -293,6 +294,7 @@
   "AES256",
   "AESGCM",
   "CHACHA20",
+  "GENERIC",
 };
 
 static const CurveTest kCurveTests[] = {