format Brainpool params as they are in RFC5639

Author: tomato42

src/ecdsa/ecdsa.py

@@ -589,38 +589,164 @@ def point_is_valid(generator, x, y):
 )
 
 # Brainpool P-320-r1
-_a = 0x3EE30B568FBAB0F883CCEBD46D3F3BB8A2A73513F5EB79DA66190EB085FFA9F492F375A97D860EB4
-_b = 0x520883949DFDBC42D3AD198640688A6FE13F41349554B49ACC31DCCD884539816F5EB4AC8FB1F1A6
-_p = 0xD35E472036BC4FB7E13C785ED201E065F98FCFA6F6F40DEF4F92B9EC7893EC28FCD412B1F1B32E27
-_Gx = 0x43BD7E9AFB53D8B85289BCC48EE5BFE6F20137D10A087EB6E7871E2A10A599C710AF8D0D39E20611
-_Gy = 0x14FDD05545EC1CC8AB4093247F77275E0743FFED117182EAA9C77877AAAC6AC7D35245D1692E8EE1
-_q = 0xD35E472036BC4FB7E13C785ED201E065F98FCFA5B68F12A32D482EC7EE8658E98691555B44C59311
+_a = int(
+    remove_whitespace(
+        """
+    3EE30B568FBAB0F883CCEBD46D3F3BB8A2A73513F5EB79DA66190EB085FFA9
+    F492F375A97D860EB4"""
+    ),
+    16,
+)
+_b = int(
+    remove_whitespace(
+        """
+    520883949DFDBC42D3AD198640688A6FE13F41349554B49ACC31DCCD884539
+    816F5EB4AC8FB1F1A6"""
+    ),
+    16,
+)
+_p = int(
+    remove_whitespace(
+        """
+    D35E472036BC4FB7E13C785ED201E065F98FCFA6F6F40DEF4F92B9EC7893EC
+    28FCD412B1F1B32E27"""
+    ),
+    16,
+)
+_Gx = int(
+    remove_whitespace(
+        """
+    43BD7E9AFB53D8B85289BCC48EE5BFE6F20137D10A087EB6E7871E2A10A599
+    C710AF8D0D39E20611"""
+    ),
+    16,
+)
+_Gy = int(
+    remove_whitespace(
+        """
+    14FDD05545EC1CC8AB4093247F77275E0743FFED117182EAA9C77877AAAC6A
+    C7D35245D1692E8EE1"""
+    ),
+    16,
+)
+_q = int(
+    remove_whitespace(
+        """
+    D35E472036BC4FB7E13C785ED201E065F98FCFA5B68F12A32D482EC7EE8658
+    E98691555B44C59311"""
+    ),
+    16,
+)
 
 curve_brainpoolp320r1 = ellipticcurve.CurveFp(_p, _a, _b, 1)
 generator_brainpoolp320r1 = ellipticcurve.PointJacobi(
     curve_brainpoolp320r1, _Gx, _Gy, 1, _q, generator=True
 )
 
 # Brainpool P-384-r1
-_a = 0x7BC382C63D8C150C3C72080ACE05AFA0C2BEA28E4FB22787139165EFBA91F90F8AA5814A503AD4EB04A8C7DD22CE2826
-_b = 0x04A8C7DD22CE28268B39B55416F0447C2FB77DE107DCD2A62E880EA53EEB62D57CB4390295DBC9943AB78696FA504C11
-_p = 0x8CB91E82A3386D280F5D6F7E50E641DF152F7109ED5456B412B1DA197FB71123ACD3A729901D1A71874700133107EC53
-_Gx = 0x1D1C64F068CF45FFA2A63A81B7C13F6B8847A3E77EF14FE3DB7FCAFE0CBD10E8E826E03436D646AAEF87B2E247D4AF1E
-_Gy = 0x8ABE1D7520F9C2A45CB1EB8E95CFD55262B70B29FEEC5864E19C054FF99129280E4646217791811142820341263C5315
-_q = 0x8CB91E82A3386D280F5D6F7E50E641DF152F7109ED5456B31F166E6CAC0425A7CF3AB6AF6B7FC3103B883202E9046565
+_a = int(
+    remove_whitespace(
+        """
+    7BC382C63D8C150C3C72080ACE05AFA0C2BEA28E4FB22787139165EFBA91F9
+    0F8AA5814A503AD4EB04A8C7DD22CE2826"""
+    ),
+    16,
+)
+_b = int(
+    remove_whitespace(
+        """
+    04A8C7DD22CE28268B39B55416F0447C2FB77DE107DCD2A62E880EA53EEB62
+    D57CB4390295DBC9943AB78696FA504C11"""
+    ),
+    16,
+)
+_p = int(
+    remove_whitespace(
+        """
+    8CB91E82A3386D280F5D6F7E50E641DF152F7109ED5456B412B1DA197FB711
+    23ACD3A729901D1A71874700133107EC53"""
+    ),
+    16,
+)
+_Gx = int(
+    remove_whitespace(
+        """
+    1D1C64F068CF45FFA2A63A81B7C13F6B8847A3E77EF14FE3DB7FCAFE0CBD10
+    E8E826E03436D646AAEF87B2E247D4AF1E"""
+    ),
+    16,
+)
+_Gy = int(
+    remove_whitespace(
+        """
+    8ABE1D7520F9C2A45CB1EB8E95CFD55262B70B29FEEC5864E19C054FF991292
+    80E4646217791811142820341263C5315"""
+    ),
+    16,
+)
+_q = int(
+    remove_whitespace(
+        """
+    8CB91E82A3386D280F5D6F7E50E641DF152F7109ED5456B31F166E6CAC0425
+    A7CF3AB6AF6B7FC3103B883202E9046565"""
+    ),
+    16,
+)
 
 curve_brainpoolp384r1 = ellipticcurve.CurveFp(_p, _a, _b, 1)
 generator_brainpoolp384r1 = ellipticcurve.PointJacobi(
     curve_brainpoolp384r1, _Gx, _Gy, 1, _q, generator=True
 )
 
 # Brainpool P-512-r1
-_a = 0x7830A3318B603B89E2327145AC234CC594CBDD8D3DF91610A83441CAEA9863BC2DED5D5AA8253AA10A2EF1C98B9AC8B57F1117A72BF2C7B9E7C1AC4D77FC94CA
-_b = 0x3DF91610A83441CAEA9863BC2DED5D5AA8253AA10A2EF1C98B9AC8B57F1117A72BF2C7B9E7C1AC4D77FC94CADC083E67984050B75EBAE5DD2809BD638016F723
-_p = 0xAADD9DB8DBE9C48B3FD4E6AE33C9FC07CB308DB3B3C9D20ED6639CCA703308717D4D9B009BC66842AECDA12AE6A380E62881FF2F2D82C68528AA6056583A48F3
-_Gx = 0x81AEE4BDD82ED9645A21322E9C4C6A9385ED9F70B5D916C1B43B62EEF4D0098EFF3B1F78E2D0D48D50D1687B93B97D5F7C6D5047406A5E688B352209BCB9F822
-_Gy = 0x7DDE385D566332ECC0EABFA9CF7822FDF209F70024A57B1AA000C55B881F8111B2DCDE494A5F485E5BCA4BD88A2763AED1CA2B2FA8F0540678CD1E0F3AD80892
-_q = 0xAADD9DB8DBE9C48B3FD4E6AE33C9FC07CB308DB3B3C9D20ED6639CCA70330870553E5C414CA92619418661197FAC10471DB1D381085DDADDB58796829CA90069
+_a = int(
+    remove_whitespace(
+        """
+    7830A3318B603B89E2327145AC234CC594CBDD8D3DF91610A83441CAEA9863
+    BC2DED5D5AA8253AA10A2EF1C98B9AC8B57F1117A72BF2C7B9E7C1AC4D77FC94CA"""
+    ),
+    16,
+)
+_b = int(
+    remove_whitespace(
+        """
+    3DF91610A83441CAEA9863BC2DED5D5AA8253AA10A2EF1C98B9AC8B57F1117
+    A72BF2C7B9E7C1AC4D77FC94CADC083E67984050B75EBAE5DD2809BD638016F723"""
+    ),
+    16,
+)
+_p = int(
+    remove_whitespace(
+        """
+    AADD9DB8DBE9C48B3FD4E6AE33C9FC07CB308DB3B3C9D20ED6639CCA703308
+    717D4D9B009BC66842AECDA12AE6A380E62881FF2F2D82C68528AA6056583A48F3"""
+    ),
+    16,
+)
+_Gx = int(
+    remove_whitespace(
+        """
+    81AEE4BDD82ED9645A21322E9C4C6A9385ED9F70B5D916C1B43B62EEF4D009
+    8EFF3B1F78E2D0D48D50D1687B93B97D5F7C6D5047406A5E688B352209BCB9F822"""
+    ),
+    16,
+)
+_Gy = int(
+    remove_whitespace(
+        """
+    7DDE385D566332ECC0EABFA9CF7822FDF209F70024A57B1AA000C55B881F81
+    11B2DCDE494A5F485E5BCA4BD88A2763AED1CA2B2FA8F0540678CD1E0F3AD80892"""
+    ),
+    16,
+)
+_q = int(
+    remove_whitespace(
+        """
+    AADD9DB8DBE9C48B3FD4E6AE33C9FC07CB308DB3B3C9D20ED6639CCA703308
+    70553E5C414CA92619418661197FAC10471DB1D381085DDADDB58796829CA90069"""
+    ),
+    16,
+)
 
 curve_brainpoolp512r1 = ellipticcurve.CurveFp(_p, _a, _b, 1)
 generator_brainpoolp512r1 = ellipticcurve.PointJacobi(