Added curve SECP512R1.

diff --git a/lib/gnutls_algorithms.c b/lib/gnutls_algorithms.c
index f66164ed7dd55c647dde325d7cbc320109f2b03a..3c89e30bb0f571c615b4f9ded6b5c6bdb1de8750 100644 (file)
--- a/lib/gnutls_algorithms.c
+++ b/lib/gnutls_algorithms.c
@@ -2220,6 +2220,17 @@ static const gnutls_ecc_curve_entry_st ecc_curves[] = {
     .Gx = "AA87CA22BE8B05378EB1C71EF320AD746E1D3B628BA79B9859F741E082542A385502F25DBF55296C3A545E3872760AB7",
     .Gy = "3617DE4A96262C6F5D9E98BF9292DC29F8F41DBD289A147CE9DA3113B5F0B8C00A60B1CE1D7E819D7A431D7C90EA0E5F"
   },
+  {
+    .name = "SECP521R1",
+    .id = GNUTLS_ECC_CURVE_SECP521R1,
+    .size = 66,
+    .prime = "01FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF",
+    .A = "01FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFC",
+    .B = "0051953EB9618E1C9A1F929A21A0B68540EEA2DA725B99B315F3B8B489918EF109E156193951EC7E937B1652C0BD3BB1BF073573DF883D2C34F1EF451FD46B503F00",
+    .order = "01FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFA51868783BF2F966B7FCC0148F709A5D03BB5C9B8899C47AEBB6FB71E91386409",
+    .Gx =    "00C6858E06B70404E9CD9E3ECB662395B4429C648139053FB521F828AF606B4D3DBAA14B5E77EFE75928FE1DC127A2FFA8DE3348B3C1856A429BF97E7E31C2E5BD66",
+    .Gy =    "011839296A789A3BC0045C8A5FB42C7D1BD998F54449579B446817AFBD17273E662C97EE72995EF42640C550B9013FAD0761353C7086A272C24088BE94769FD16650",
+  },
   {0, 0, 0}
 };
 

diff --git a/lib/gnutls_int.h b/lib/gnutls_int.h
index d67bddb0b37d57774ae92a9940f6519c1f548e46..5ccdc96aefe82a1107d5824ea9148714dd43f87e 100644 (file)
--- a/lib/gnutls_int.h
+++ b/lib/gnutls_int.h
@@ -230,6 +230,7 @@ typedef enum
   GNUTLS_ECC_CURVE_INVALID=0,
   GNUTLS_ECC_CURVE_SECP256R1,
   GNUTLS_ECC_CURVE_SECP384R1,
+  GNUTLS_ECC_CURVE_SECP521R1,
 } ecc_curve_t;
 
 typedef enum

diff --git a/lib/gnutls_priority.c b/lib/gnutls_priority.c
index c06a22dc28c3f0960fd9474d90ea12e3e8fc6a05..501c1a2cd31655be3e44f36d4c75d3be251bad53 100644 (file)
--- a/lib/gnutls_priority.c
+++ b/lib/gnutls_priority.c
@@ -218,6 +218,7 @@ gnutls_certificate_type_set_priority (gnutls_session_t session,
 static const int supported_ecc_default[] = {
   GNUTLS_ECC_CURVE_SECP256R1,
   GNUTLS_ECC_CURVE_SECP384R1,
+  GNUTLS_ECC_CURVE_SECP521R1,
   0
 };
 

diff --git a/lib/nettle/ecc_test.c b/lib/nettle/ecc_test.c
index ff41b1d43332b8992a2d1a7fd318ed0695aa2439..7e854ec9b238125de5c6e1460de109c19c70e800 100644 (file)
--- a/lib/nettle/ecc_test.c
+++ b/lib/nettle/ecc_test.c
@@ -52,7 +52,7 @@ ecc_test (void)
       return -1;
     }
 
-  for (i = 1; i <= 2; i++)
+  for (i = 1; i <= 3; i++)
     {
       const gnutls_ecc_curve_entry_st *st = _gnutls_ecc_curve_get_params (i);