From 9a44a4afe1bf261a873d8ee52ba67d19156d12af Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Thu, 10 Dec 2020 21:55:10 +0100
Subject: [PATCH] recover_pk: more curvs

---
 tools/recover_pk.py | 70 ++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 66 insertions(+), 4 deletions(-)

diff --git a/tools/recover_pk.py b/tools/recover_pk.py
index 610d785e9..45b0805be 100755
--- a/tools/recover_pk.py
+++ b/tools/recover_pk.py
@@ -199,6 +199,39 @@ CURVES = {
             0xCF5AC8395BAFEB13C02DA292DDED7A83
         )
     ),
+    "secp192k1": (
+        711,
+        0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFEE37,
+        0xFFFFFFFFFFFFFFFFFFFFFFFE26F2FC170F69466A74DEFD8D,
+        0x000000000000000000000000000000000000000000000000,
+        0x000000000000000000000000000000000000000000000003,
+        (
+            0xDB4FF10EC057E9AE26B07D0280B7F4341DA5D1B1EAE06C7D,
+            0x9B2F2F6D9C5628A7844163D015BE86344082AA88D95E2F9D
+        )
+    ),
+    "secp192r1": (
+        409,
+        0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFF,
+        0xFFFFFFFFFFFFFFFFFFFFFFFF99DEF836146BC9B1B4D22831,
+        0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFC,
+        0x64210519E59C80E70FA7E9AB72243049FEB8DEECC146B9B1,
+        (
+            0x188DA80EB03090F67CBF20EB43A18800F4FF0AFD82FF1012,
+            0x07192B95FFC8DA78631011ED6B24CDD573F977A11E794811
+        )
+    ),
+    "secp224k1": (
+        712,
+        0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFE56D,
+        0x10000000000000000000000000001DCE8D2EC6184CAF0A971769FB1F7,
+        0x00000000000000000000000000000000000000000000000000000000,
+        0x00000000000000000000000000000000000000000000000000000005,
+        (
+            0xA1455B334DF099DF30FC28A169A467E9E47075A90F7E650EB6B7A45C,
+            0x7E089FED7FBA344282CAFBD6F7E319F7C0B0BD59E2CA4BDB556D61A5
+        )
+    ),
     "secp224r1": (
         713,
         0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000001,
@@ -233,6 +266,28 @@ CURVES = {
             0x4FE342E2FE1A7F9B8EE7EB4A7C0F9E162BCE33576B315ECECBB6406837BF51F5
         )
     ),
+    "secp384r1": (
+        715,
+        0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFF0000000000000000FFFFFFFF,
+        0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFC7634D81F4372DDF581A0DB248B0A77AECEC196ACCC52973,
+        0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFF0000000000000000FFFFFFFC,
+        0xB3312FA7E23EE7E4988E056BE3F82D19181D9C6EFE8141120314088F5013875AC656398D8A2ED19D2A85C8EDD3EC2AEF,
+        (
+            0xAA87CA22BE8B05378EB1C71EF320AD746E1D3B628BA79B9859F741E082542A385502F25DBF55296C3A545E3872760AB7,
+            0x3617DE4A96262C6F5D9E98BF9292DC29F8F41DBD289A147CE9DA3113B5F0B8C00A60B1CE1D7E819D7A431D7C90EA0E5F
+        )
+    ),
+    "secp521r1": (
+        716,
+        0x01FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
+        0x01FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFA51868783BF2F966B7FCC0148F709A5D03BB5C9B8899C47AEBB6FB71E91386409,
+        0x01FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFC,
+        0x0051953EB9618E1C9A1F929A21A0B68540EEA2DA725B99B315F3B8B489918EF109E156193951EC7E937B1652C0BD3BB1BF073573DF883D2C34F1EF451FD46B503F00,
+        (
+            0x00C6858E06B70404E9CD9E3ECB662395B4429C648139053FB521F828AF606B4D3DBAA14B5E77EFE75928FE1DC127A2FFA8DE3348B3C1856A429BF97E7E31C2E5BD66,
+            0x011839296A789A3BC0045C8A5FB42C7D1BD998F54449579B446817AFBD17273E662C97EE72995EF42640C550B9013FAD0761353C7086A272C24088BE94769FD16650
+        )
+    )
 }
 
 def get_curve(name):
@@ -324,12 +379,19 @@ class EllipticCurve:
 #######################################################################
 
 def guess_curvename(signature):
-    if (len(signature) // 2) & 0xfe == 32 :
+    l = (len(signature) // 2) & 0xfe
+    if   l == 32 :
         curves = [ "secp128r1" ]
-    elif (len(signature) // 2) & 0xfe == 56:
-        curves = [ "secp224r1" ]
-    elif (len(signature) // 2) & 0xfe == 64:
+    elif l == 48:
+        curves = [ "secp192k1", "secp192r1" ]
+    elif l == 56:
+        curves = [ "secp224k1", "secp224r1" ]
+    elif l == 64:
         curves = [ "secp256k1", "secp256r1" ]
+    elif l == 96:
+        curves = [ "secp384r1" ]
+    elif l == 132:
+        curves = [ "secp521r1" ]
     else:
         raise ValueError("Unsupported signature size %i" % len(signature))
     return curves