Use official names for ANSI curves. Add (names for) the X9.63 curves.

diff --git a/ectab.in b/ectab.in
index 4436b7e..cfe3e00 100644 (file)
--- a/ectab.in
+++ b/ectab.in
@@ -242,7 +242,6 @@ curve sect283k1 binpoly
   h 4
   gx 0x0503213f78ca44883f1a3b8162f188e553cd265f23c1567a16876913b0c2ac2458492836
   gy 0x01ccda380f1c9e318d90f95d07e5426fe87e45c0e8184698e45962364e34116177dd2259
-
 curve sect283r1 binpoly
   p 0x800000000000000000000000000000000000000000000000000000000000000000010a1
   a 1
@@ -288,7 +287,7 @@ curve sect571r1 binpoly
 
 #----- Curves from ANSI X9.62 -----------------------------------------------
 
-curve ansi-b163-1 binpoly
+curve ansi-c2pnb163v1 binpoly
   p 0x080000000000000000000000000000000000000107
   a 0x072546b5435234a422e0789675f432c89435de5242
   b 0x00c9517d06d5240d3cff38c74b20b6cd4d6f9dd4d9
@@ -296,7 +295,7 @@ curve ansi-b163-1 binpoly
   h 2
   gx 0x07af69989546103d79329fcc3d74880f33bbe803cb
   gy 0x01ec23211b5966adea1d3f87f7ea5848aef0b7ca9f
-curve ansi-b163-2 binpoly
+curve ansi-c2pnb163v2 binpoly
   p 0x080000000000000000000000000000000000000107
   a 0x0108b39e77c4b108bed981ed0e890e117c511cf072
   b 0x0667aceb38af4e488c407433ffae4f1c811638df20
@@ -304,7 +303,7 @@ curve ansi-b163-2 binpoly
   h 2
   gx 0x0024266e4eb5106d0a964d92c4860e2671db9b6cc5
   gy 0x079f684ddf6684c5cd258b3890021b2386dfd19fc5
-curve ansi-b163-3 binpoly
+curve ansi-c2pnb163v3 binpoly
   p 0x080000000000000000000000000000000000000107
   a 0x07a526c63d3e25a256a007699f5447e32ae456b50e
   b 0x03f7061798eb99e238fd6f1bf95b48feeb4854252b
@@ -312,9 +311,10 @@ curve ansi-b163-3 binpoly
   h 2
   gx 0x02f9f87b7c574d0bdecf8a22e6524775f98cdebdcb
   gy 0x05b935590c155e17ea48eb3ff3718b893df59a05d0
-# ansi-b176 has an unacceptable cofactor
 
-curve ansi-b191-1 binpoly
+# ansi-c2pnb176w1 has an unacceptable cofactor; and 176 isn't prime anyway
+
+curve ansi-c2tnb191v1 binpoly
   p 0x800000000000000000000000000000000000000000000201
   a 0x2866537b676752636a68f56554e12640276b649ef7526267
   b 0x2e45ef571f00786f67b0081b9495a3d95462f5de0aa185ec
@@ -322,7 +322,7 @@ curve ansi-b191-1 binpoly
   h 2
   gx 0x36b3daf8a23206f9c4f299d7b21a9c369137f2c84ae1aa0d
   gy 0x765be73433b3f95e332932e70ea245ca2418ea0ef98018fb
-curve ansi-b191-2 binpoly
+curve ansi-c2tnb191v2 binpoly
   p 0x800000000000000000000000000000000000000000000201
   a 0x401028774d7777c7b7666d1366ea432071274f89ff01e718
   b 0x0620048d28bcbd03b6249c99182b7c8cd19700c362c46a01
@@ -330,12 +330,12 @@ curve ansi-b191-2 binpoly
   h 4
   gx 0x3809b2b7cc1b28cc5a87926aad83fd28789e81e2c9e3bf10
   gy 0x17434386626d14f3dbf01760d9213a3e1cf37aec437d668a
-# ansi-b191-3 has an unacceptable cofactor
-# ansi-b191n-{1,2} don't include conversion factors
+# ansi-c2tnb191v3 has an unacceptable cofactor
+# ansi-c2onb191v{4,5} don't include conversion factors
 
-# ansi-b208 has an unacceptable cofactor; and 208 isn't prime anyway
+# ansi-c2pnb208v1 has an unacceptable cofactor; and 208 isn't prime anyway
 
-curve ansi-b239-1 binpoly
+curve ansi-c2tnb239v1 binpoly
   p 0x800000000000000000000000000000000000000000000000001000000001
   a 0x32010857077c5431123a46b808906756f543423e8d27877578125778ac76
   b 0x790408f2eedaf392b012edefb3392f30f4327c0ca3f31fc383c422aa8c16
@@ -343,21 +343,21 @@ curve ansi-b239-1 binpoly
   h 4
   gx 0x57927098fa932e7c0a96d3fd5b706ef7e5f5c156e16b7e7c86038552e91d
   gy 0x61d8ee5077c33fecf6f1a16b268de469c3c7744ea9a971649fc7a9616305
-# ansi-b239-{2,3} have unacceptable cofactors
-# ansi-b239n-{1,2} don't include conversion factors
+# ansi-c2tnb239v{2,3} have unacceptable cofactors
+# ansi-c2onb239v{4,5} don't include conversion factors
 
-# ansi-b272-1 has an unacceptable cofactor; and 272 isn't prime anyway
+# ansi-c2pnb272w1 has an unacceptable cofactor; and 272 isn't prime anyway
 
-# ansi-b304-1 has an unacceptable cofactor; and 304 isn't prime anyway
+# ansi-c2pnb304w1 has an unacceptable cofactor; and 304 isn't prime anyway
 
-# ansi-b359-1 has an unacceptable cofactor
+# ansi-c2tnb359v1 has an unacceptable cofactor
 
-# ansi-b368-1 has an unacceptable cofactor; and 368 isn't prime anyway
+# ansi-c2pnb368w1 has an unacceptable cofactor; and 368 isn't prime anyway
 
-# ansi-b431-1 has an unacceptable cofactor
+# ansi-c2tnb431v1 has an unacceptable cofactor
 
-alias ansi-p192-1 secp192r1
-curve ansi-p192-2 niceprime
+alias ansi-prime192v1 secp192r1
+curve ansi-prime192v2 niceprime
   p 0xfffffffffffffffffffffffffffffffeffffffffffffffff
   a 0xfffffffffffffffffffffffffffffffefffffffffffffffc
   b 0xcc22d6dfb95c6b25e49c0d6364a4e5980c393aa21668d953
@@ -365,7 +365,7 @@ curve ansi-p192-2 niceprime
   h 1
   gx 0xeea2bae7e1497842f2de7769cfe9c989c072ad696f48034a
   gy 0x6574d11d69b6ec7a672bb82a083df2f2b0847de970b2de15
-curve ansi-p192-3 niceprime
+curve ansi-prime192v3 niceprime
   p 0xfffffffffffffffffffffffffffffffeffffffffffffffff
   a 0xfffffffffffffffffffffffffffffffefffffffffffffffc
   b 0x22123dc2395a05caa7423daeccc94760a7d462256bd56916
@@ -374,7 +374,7 @@ curve ansi-p192-3 niceprime
   gx 0x7d29778100c65a1da1783716588dce2b8b4aee8e228f1896
   gy 0x38a90f22637337334b49dcb66a6dc8f9978aca7648a943b0
 
-curve ansi-p239-1 niceprime
+curve ansi-prime239v1 niceprime
   p 0x7fffffffffffffffffffffff7fffffffffff8000000000007fffffffffff
   a 0x7fffffffffffffffffffffff7fffffffffff8000000000007ffffffffffc
   b 0x6b016c3bdcf18941d0d654921475ca71a9db2fb27d1d37796185c2942c0a
@@ -382,7 +382,7 @@ curve ansi-p239-1 niceprime
   h 1
   gx 0x0ffa963cdca8816ccc33b8642bedf905c3d358573d3f27fbbd3b3cb9aaaf
   gy 0x7debe8e4e90a5dae6e4054ca530ba04654b36818ce226b39fccb7b02f1ae
-curve ansi-p239-2 niceprime
+curve ansi-prime239v2 niceprime
   p 0x7fffffffffffffffffffffff7fffffffffff8000000000007fffffffffff
   a 0x7fffffffffffffffffffffff7fffffffffff8000000000007ffffffffffc
   b 0x617fab6832576cbbfed50d99f0249c3fee58b94ba0038c7ae84c8c832f2c
@@ -390,7 +390,7 @@ curve ansi-p239-2 niceprime
   h 1
   gx 0x38af09d98727705120c921bb5e9e26296a3cdcf2f35757a0eafd87b830e7
   gy 0x5b0125e4dbea0ec7206da0fc01d9b081329fb555de6ef460237dff8be4ba
-curve ansi-p239-3 niceprime
+curve ansi-prime239v3 niceprime
   p 0x7fffffffffffffffffffffff7fffffffffff8000000000007fffffffffff
   a 0x7fffffffffffffffffffffff7fffffffffff8000000000007ffffffffffc
   b 0x255705fa2a306654b1f4cb03d6a750a30c250102d4988717d9ba15ab6d3e
@@ -399,7 +399,38 @@ curve ansi-p239-3 niceprime
   gx 0x6768ae8e18bb92cfcf005c949aa2c6d94853d0e660bbf854b1c9505fe95a
   gy 0x1607e6898f390c06bc1d552bad226f3b6fcfe48b6e818499af18e3ed6cf3
 
-alias ansi-p256-1 secp256r1
+alias ansi-prime256v1 secp256r1
+
+#----- Curves from ANSI X9.63 -----------------------------------------------
+#
+# These are just duplicates of the SEC curves.
+
+alias ansit163k1 sect163k1
+alias ansit163r1 sect163r1
+alias ansit163r2 sect163r2
+alias ansit193r1 sect193r1
+alias ansit193r2 sect193r2
+alias ansit233k1 sect233k1
+alias ansit233r1 sect233r1
+alias ansit239k1 sect239k1
+alias ansit283k1 sect283k1
+alias ansit283r1 sect283r1
+alias ansit409k1 sect409k1
+alias ansit409r1 sect409r1
+alias ansit571k1 sect571k1
+alias ansit571r1 sect571r1
+
+alias ansip160k1 secp160k1
+alias ansip160r1 secp160r1
+alias ansip160r2 secp160r2
+alias ansip192k1 secp192k1
+alias ansip192r1 secp192r1
+alias ansip224k1 secp224k1
+alias ansip224r1 secp224r1
+alias ansip256k1 secp256k1
+alias ansip256r1 secp256r1
+alias ansip384r1 secp384r1
+alias ansip521r1 secp521r1
 
 #----- Curves from RFC2414 (Oakley) -----------------------------------------
 #