Apply brainpool to new files after merge

Author: Shrirang Bhate

src/ecdsa/curves.py

@@ -62,40 +62,40 @@ def __repr__(self):
                   ecdsa.generator_secp256k1,
                   (1, 3, 132, 0, 10), "secp256k1")
 BRAINPOOLP160r1 = Curve("BRAINPOOLP160r1",
-                    ecdsa.curve_brainpoolp160r1,
-                    ecdsa.generator_brainpoolp160r1,
-                    (1, 3, 36, 3, 3, 2, 8, 1, 1, 1),
-                    "brainpoolP160r1")
+                        ecdsa.curve_brainpoolp160r1,
+                        ecdsa.generator_brainpoolp160r1,
+                        (1, 3, 36, 3, 3, 2, 8, 1, 1, 1),
+                        "brainpoolP160r1")
 BRAINPOOLP192r1 = Curve("BRAINPOOLP192r1",
-                    ecdsa.curve_brainpoolp192r1,
-                    ecdsa.generator_brainpoolp192r1,
-                    (1, 3, 36, 3, 3, 2, 8, 1, 1, 3),
-                    "brainpoolP192r1")
+                        ecdsa.curve_brainpoolp192r1,
+                        ecdsa.generator_brainpoolp192r1,
+                        (1, 3, 36, 3, 3, 2, 8, 1, 1, 3),
+                        "brainpoolP192r1")
 BRAINPOOLP224r1 = Curve("BRAINPOOLP224r1",
-                    ecdsa.curve_brainpoolp224r1,
-                    ecdsa.generator_brainpoolp224r1,
-                    (1, 3, 36, 3, 3, 2, 8, 1, 1, 5),
-                    "brainpoolP224r1")
+                        ecdsa.curve_brainpoolp224r1,
+                        ecdsa.generator_brainpoolp224r1,
+                        (1, 3, 36, 3, 3, 2, 8, 1, 1, 5),
+                        "brainpoolP224r1")
 BRAINPOOLP256r1 = Curve("BRAINPOOLP256r1",
-                    ecdsa.curve_brainpoolp256r1,
-                    ecdsa.generator_brainpoolp256r1,
-                    (1, 3, 36, 3, 3, 2, 8, 1, 1, 7),
-                    "brainpoolP256r1")
+                        ecdsa.curve_brainpoolp256r1,
+                        ecdsa.generator_brainpoolp256r1,
+                        (1, 3, 36, 3, 3, 2, 8, 1, 1, 7),
+                        "brainpoolP256r1")
 BRAINPOOLP320r1 = Curve("BRAINPOOLP320r1",
-                    ecdsa.curve_brainpoolp320r1,
-                    ecdsa.generator_brainpoolp320r1,
-                    (1, 3, 36, 3, 3, 2, 8, 1, 1, 9),
-                    "brainpoolP320r1")
+                        ecdsa.curve_brainpoolp320r1,
+                        ecdsa.generator_brainpoolp320r1,
+                        (1, 3, 36, 3, 3, 2, 8, 1, 1, 9),
+                        "brainpoolP320r1")
 BRAINPOOLP384r1 = Curve("BRAINPOOLP384r1",
-                    ecdsa.curve_brainpoolp384r1,
-                    ecdsa.generator_brainpoolp384r1,
-                    (1, 3, 36, 3, 3, 2, 8, 1, 1, 11),
-                    "brainpoolP384r1")
+                        ecdsa.curve_brainpoolp384r1,
+                        ecdsa.generator_brainpoolp384r1,
+                        (1, 3, 36, 3, 3, 2, 8, 1, 1, 11),
+                        "brainpoolP384r1")
 BRAINPOOLP512r1 = Curve("BRAINPOOLP512r1",
-                    ecdsa.curve_brainpoolp512r1,
-                    ecdsa.generator_brainpoolp512r1,
-                    (1, 3, 36, 3, 3, 2, 8, 1, 1, 13),
-                    "brainpoolP512r1")
+                        ecdsa.curve_brainpoolp512r1,
+                        ecdsa.generator_brainpoolp512r1,
+                        (1, 3, 36, 3, 3, 2, 8, 1, 1, 13),
+                        "brainpoolP512r1")
 
 
 curves = [NIST192p, NIST224p, NIST256p, NIST384p, NIST521p, SECP256k1,

src/ecdsa/test_pyecdsa.py

@@ -103,9 +103,9 @@ def test_lengths(self):
         if BENCH:
             print_()
         for curve in (NIST192p, NIST224p, NIST256p, NIST384p, NIST521p,
-                BRAINPOOLP160r1, BRAINPOOLP192r1, BRAINPOOLP224r1,
-                BRAINPOOLP256r1, BRAINPOOLP320r1, BRAINPOOLP384r1,
-                BRAINPOOLP512r1):
+                      BRAINPOOLP160r1, BRAINPOOLP192r1, BRAINPOOLP224r1,
+                      BRAINPOOLP256r1, BRAINPOOLP320r1, BRAINPOOLP384r1,
+                      BRAINPOOLP512r1):
             start = time.time()
             priv = SigningKey.generate(curve=curve)
             pub1 = priv.get_verifying_key()
@@ -819,6 +819,10 @@ def test_from_openssl_brainpoolp512r1(self):
     def do_test_from_openssl(self, curve):
         curvename = curve.openssl_name
         assert curvename
+
+        if curvename not in OpenSSL.supported_curves:
+            return
+
         # OpenSSL: create sk, vk, sign.
         # Python: read vk(3), checksig(5), read sk(1), sign, check
         mdarg = self.get_openssl_messagedigest_arg()