commit fc6e5a737220624ee0134ef0b41bd63226db68d7
author David Benjamin <davidben@chromium.org> Tue Jan 19 15:36:43 2016 -0500
committer Adam Langley <agl@google.com> Wed Jan 20 17:26:13 2016 +0000
tree fc4fb2b6c02772d213f458d1803dc30669b363f6
parent d2f0ce80a2b994c8aa246ac5e64bb0c27eb6a25b

Drop the silly 'ECDH_' prefix on X25519.

I got that from the TLS 1.3 draft, but it's kind of silly-looking. X25519
already refers to a Diffie-Hellman primitive.

Also hopefully the WG will split NamedGroups and SignatureAlgorithms per the
recent proposal, so it won't be needed anyway. (Most chatter is about what
hashes should be allowed with what NIST curves, so it seems like people like
the split itself? We'll see.)

Change-Id: I7bb713190001199a3ebd30b67df2c00d29132431
Reviewed-on: https://boringssl-review.googlesource.com/6912
Reviewed-by: Adam Langley <agl@google.com>

ssl/internal.h

diff --git a/ssl/internal.h b/ssl/internal.h
index ad76b8c..c3982d0 100644
--- a/ssl/internal.h
+++ b/ssl/internal.h
@@ -531,7 +531,7 @@
 #define SSL_CURVE_SECP256R1 23
 #define SSL_CURVE_SECP384R1 24
 #define SSL_CURVE_SECP521R1 25
-#define SSL_CURVE_ECDH_X25519 29
+#define SSL_CURVE_X25519 29
 
 /* An SSL_ECDH_METHOD is an implementation of ECDH-like key exchanges for
  * TLS. */

ssl/ssl_ecdh.c

diff --git a/ssl/ssl_ecdh.c b/ssl/ssl_ecdh.c
index 45c5b26..cad8ebc 100644
--- a/ssl/ssl_ecdh.c
+++ b/ssl/ssl_ecdh.c
@@ -298,7 +298,7 @@
     },
     {
         NID_x25519,
-        SSL_CURVE_ECDH_X25519,
+        SSL_CURVE_X25519,
         "X25519",
         ssl_x25519_cleanup,
         ssl_x25519_generate_keypair,

ssl/t1_lib.c

diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c
index 8cad57a..68c380a 100644
--- a/ssl/t1_lib.c
+++ b/ssl/t1_lib.c
@@ -294,7 +294,7 @@
 }
 
 static const uint16_t eccurves_default[] = {
-    SSL_CURVE_ECDH_X25519,
+    SSL_CURVE_X25519,
     SSL_CURVE_SECP256R1,
     SSL_CURVE_SECP384R1,
 #if defined(BORINGSSL_ANDROID_SYSTEM)