EC wNAF-related updates from bc-java

- better control of window size limits
- callers take advantage of available larger precomps
- provide ConfigureBasepoint to mark points for larger precomp
- mark built-in curve basepoints for larger default wNAF width

1 files changed, 65 insertions, 57 deletions

diff --git a/crypto/src/asn1/teletrust/TeleTrusTNamedCurves.cs b/crypto/src/asn1/teletrust/TeleTrusTNamedCurves.cs
index 9a82db319..8393f3ea5 100644
--- a/crypto/src/asn1/teletrust/TeleTrusTNamedCurves.cs
+++ b/crypto/src/asn1/teletrust/TeleTrusTNamedCurves.cs
@@ -3,6 +3,7 @@ using System.Collections;
 using Org.BouncyCastle.Asn1.X9;
 using Org.BouncyCastle.Math;
 using Org.BouncyCastle.Math.EC;
+using Org.BouncyCastle.Math.EC.Multiplier;
 using Org.BouncyCastle.Utilities;
 using Org.BouncyCastle.Utilities.Collections;
 using Org.BouncyCastle.Utilities.Encoders;
@@ -15,6 +16,13 @@ namespace Org.BouncyCastle.Asn1.TeleTrust
     */
     public class TeleTrusTNamedCurves
     {
+        private static X9ECPoint ConfigureBasepoint(ECCurve curve, string encoding)
+        {
+            X9ECPoint G = new X9ECPoint(curve, Hex.Decode(encoding));
+            WNafUtilities.ConfigureBasepoint(G.Point);
+            return G;
+        }
+
         private static ECCurve ConfigureCurve(ECCurve curve)
         {
             return curve;
@@ -38,10 +46,10 @@ namespace Org.BouncyCastle.Asn1.TeleTrust
                     new BigInteger("1E589A8595423412134FAA2DBDEC95C8D8675E58", 16), // b
                     n, h));
 
-                return new X9ECParameters(
-                    curve,
-                    new X9ECPoint(curve, Hex.Decode("04BED5AF16EA3F6A4F62938C4631EB5AF7BDBCDBC31667CB477A1A8EC338F94741669C976316DA6321")), // G
-                    n, h);
+                X9ECPoint G = ConfigureBasepoint(curve,
+                    "04BED5AF16EA3F6A4F62938C4631EB5AF7BDBCDBC31667CB477A1A8EC338F94741669C976316DA6321");
+
+                return new X9ECParameters(curve, G, n, h);
             }
         }
 
@@ -58,16 +66,16 @@ namespace Org.BouncyCastle.Asn1.TeleTrust
                 BigInteger h = new BigInteger("01", 16);
 
                 ECCurve curve = ConfigureCurve(new FpCurve(
-                    //   new BigInteger("24DBFF5DEC9B986BBFE5295A29BFBAE45E0F5D0B", 16), // Z
+                    //new BigInteger("24DBFF5DEC9B986BBFE5295A29BFBAE45E0F5D0B", 16), // Z
                     new BigInteger("E95E4A5F737059DC60DFC7AD95B3D8139515620F", 16), // q
                     new BigInteger("E95E4A5F737059DC60DFC7AD95B3D8139515620C", 16), // a'
                     new BigInteger("7A556B6DAE535B7B51ED2C4D7DAA7A0B5C55F380", 16), // b'
                     n, h));
 
-                return new X9ECParameters(
-                    curve,
-                    new X9ECPoint(curve, Hex.Decode("04B199B13B9B34EFC1397E64BAEB05ACC265FF2378ADD6718B7C7C1961F0991B842443772152C9E0AD")), // G
-                    n, h);
+                X9ECPoint G = ConfigureBasepoint(curve,
+                    "04B199B13B9B34EFC1397E64BAEB05ACC265FF2378ADD6718B7C7C1961F0991B842443772152C9E0AD");
+
+                return new X9ECParameters(curve, G, n, h);
             }
         }
 
@@ -89,10 +97,10 @@ namespace Org.BouncyCastle.Asn1.TeleTrust
                     new BigInteger("469A28EF7C28CCA3DC721D044F4496BCCA7EF4146FBF25C9", 16), // b
                     n, h));
 
-                return new X9ECParameters(
-                    curve,
-                    new X9ECPoint(curve, Hex.Decode("04C0A0647EAAB6A48753B033C56CB0F0900A2F5C4853375FD614B690866ABD5BB88B5F4828C1490002E6773FA2FA299B8F")), // G
-                    n, h);
+                X9ECPoint G = ConfigureBasepoint(curve,
+                    "04C0A0647EAAB6A48753B033C56CB0F0900A2F5C4853375FD614B690866ABD5BB88B5F4828C1490002E6773FA2FA299B8F");
+
+                return new X9ECParameters(curve, G, n, h);
             }
         }
 
@@ -115,10 +123,10 @@ namespace Org.BouncyCastle.Asn1.TeleTrust
                     new BigInteger("13D56FFAEC78681E68F9DEB43B35BEC2FB68542E27897B79", 16), // b'
                     n, h));
 
-                return new X9ECParameters(
-                    curve,
-                    new X9ECPoint(curve, Hex.Decode("043AE9E58C82F63C30282E1FE7BBF43FA72C446AF6F4618129097E2C5667C2223A902AB5CA449D0084B7E5B3DE7CCC01C9")), // G'
-                    n, h);
+                X9ECPoint G = ConfigureBasepoint(curve,
+                    "043AE9E58C82F63C30282E1FE7BBF43FA72C446AF6F4618129097E2C5667C2223A902AB5CA449D0084B7E5B3DE7CCC01C9");
+
+                return new X9ECParameters(curve, G, n, h);
             }
         }
 
@@ -140,10 +148,10 @@ namespace Org.BouncyCastle.Asn1.TeleTrust
                     new BigInteger("2580F63CCFE44138870713B1A92369E33E2135D266DBB372386C400B", 16), // b
                     n, h));
 
-                return new X9ECParameters(
-                    curve,
-                    new X9ECPoint(curve, Hex.Decode("040D9029AD2C7E5CF4340823B2A87DC68C9E4CE3174C1E6EFDEE12C07D58AA56F772C0726F24C6B89E4ECDAC24354B9E99CAA3F6D3761402CD")), // G
-                    n, h);
+                X9ECPoint G = ConfigureBasepoint(curve,
+                    "040D9029AD2C7E5CF4340823B2A87DC68C9E4CE3174C1E6EFDEE12C07D58AA56F772C0726F24C6B89E4ECDAC24354B9E99CAA3F6D3761402CD");
+
+                return new X9ECParameters(curve, G, n, h);
             }
         }
 
@@ -166,10 +174,10 @@ namespace Org.BouncyCastle.Asn1.TeleTrust
                     new BigInteger("4B337D934104CD7BEF271BF60CED1ED20DA14C08B3BB64F18A60888D", 16), // b'
                     n, h));
 
-                return new X9ECParameters(
-                    curve,
-                    new X9ECPoint(curve, Hex.Decode("046AB1E344CE25FF3896424E7FFE14762ECB49F8928AC0C76029B4D5800374E9F5143E568CD23F3F4D7C0D4B1E41C8CC0D1C6ABD5F1A46DB4C")), // G'
-                    n, h);
+                X9ECPoint G = ConfigureBasepoint(curve,
+                    "046AB1E344CE25FF3896424E7FFE14762ECB49F8928AC0C76029B4D5800374E9F5143E568CD23F3F4D7C0D4B1E41C8CC0D1C6ABD5F1A46DB4C");
+
+                return new X9ECParameters(curve, G, n, h);
             }
         }
 
@@ -191,10 +199,10 @@ namespace Org.BouncyCastle.Asn1.TeleTrust
                     new BigInteger("26DC5C6CE94A4B44F330B5D9BBD77CBF958416295CF7E1CE6BCCDC18FF8C07B6", 16), // b
                     n, h));
 
-                return new X9ECParameters(
-                    curve,
-                    new X9ECPoint(curve, Hex.Decode("048BD2AEB9CB7E57CB2C4B482FFC81B7AFB9DE27E1E3BD23C23A4453BD9ACE3262547EF835C3DAC4FD97F8461A14611DC9C27745132DED8E545C1D54C72F046997")), // G
-                    n, h);
+                X9ECPoint G = ConfigureBasepoint(curve,
+                    "048BD2AEB9CB7E57CB2C4B482FFC81B7AFB9DE27E1E3BD23C23A4453BD9ACE3262547EF835C3DAC4FD97F8461A14611DC9C27745132DED8E545C1D54C72F046997");
+
+                return new X9ECParameters(curve, G, n, h);
             }
         }
 
@@ -217,10 +225,10 @@ namespace Org.BouncyCastle.Asn1.TeleTrust
                     new BigInteger("662C61C430D84EA4FE66A7733D0B76B7BF93EBC4AF2F49256AE58101FEE92B04", 16), // b'
                     n, h));
 
-                return new X9ECParameters(
-                    curve,
-                    new X9ECPoint(curve, Hex.Decode("04A3E8EB3CC1CFE7B7732213B23A656149AFA142C47AAFBC2B79A191562E1305F42D996C823439C56D7F7B22E14644417E69BCB6DE39D027001DABE8F35B25C9BE")), // G'
-                    n, h);
+                X9ECPoint G = ConfigureBasepoint(curve,
+                    "04A3E8EB3CC1CFE7B7732213B23A656149AFA142C47AAFBC2B79A191562E1305F42D996C823439C56D7F7B22E14644417E69BCB6DE39D027001DABE8F35B25C9BE");
+
+                return new X9ECParameters(curve, G, n, h);
             }
         }
 
@@ -242,10 +250,10 @@ namespace Org.BouncyCastle.Asn1.TeleTrust
                     new BigInteger("520883949DFDBC42D3AD198640688A6FE13F41349554B49ACC31DCCD884539816F5EB4AC8FB1F1A6", 16), // b
                     n, h));
 
-                return new X9ECParameters(
-                    curve,
-                    new X9ECPoint(curve, Hex.Decode("0443BD7E9AFB53D8B85289BCC48EE5BFE6F20137D10A087EB6E7871E2A10A599C710AF8D0D39E2061114FDD05545EC1CC8AB4093247F77275E0743FFED117182EAA9C77877AAAC6AC7D35245D1692E8EE1")), // G
-                    n, h);
+                X9ECPoint G = ConfigureBasepoint(curve,
+                    "0443BD7E9AFB53D8B85289BCC48EE5BFE6F20137D10A087EB6E7871E2A10A599C710AF8D0D39E2061114FDD05545EC1CC8AB4093247F77275E0743FFED117182EAA9C77877AAAC6AC7D35245D1692E8EE1");
+
+                return new X9ECParameters(curve, G, n, h);
             }
         }
 
@@ -268,10 +276,10 @@ namespace Org.BouncyCastle.Asn1.TeleTrust
                     new BigInteger("A7F561E038EB1ED560B3D147DB782013064C19F27ED27C6780AAF77FB8A547CEB5B4FEF422340353", 16), // b'
                     n, h));
 
-                return new X9ECParameters(
-                    curve,
-                    new X9ECPoint(curve, Hex.Decode("04925BE9FB01AFC6FB4D3E7D4990010F813408AB106C4F09CB7EE07868CC136FFF3357F624A21BED5263BA3A7A27483EBF6671DBEF7ABB30EBEE084E58A0B077AD42A5A0989D1EE71B1B9BC0455FB0D2C3")), // G'
-                    n, h);
+                X9ECPoint G = ConfigureBasepoint(curve,
+                    "04925BE9FB01AFC6FB4D3E7D4990010F813408AB106C4F09CB7EE07868CC136FFF3357F624A21BED5263BA3A7A27483EBF6671DBEF7ABB30EBEE084E58A0B077AD42A5A0989D1EE71B1B9BC0455FB0D2C3");
+
+                return new X9ECParameters(curve, G, n, h);
             }
         }
 
@@ -293,10 +301,10 @@ namespace Org.BouncyCastle.Asn1.TeleTrust
                     new BigInteger("4A8C7DD22CE28268B39B55416F0447C2FB77DE107DCD2A62E880EA53EEB62D57CB4390295DBC9943AB78696FA504C11", 16), // b
                     n, h));
 
-                return new X9ECParameters(
-                    curve,
-                    new X9ECPoint(curve, Hex.Decode("041D1C64F068CF45FFA2A63A81B7C13F6B8847A3E77EF14FE3DB7FCAFE0CBD10E8E826E03436D646AAEF87B2E247D4AF1E8ABE1D7520F9C2A45CB1EB8E95CFD55262B70B29FEEC5864E19C054FF99129280E4646217791811142820341263C5315")), // G
-                    n, h);
+                X9ECPoint G = ConfigureBasepoint(curve,
+                    "041D1C64F068CF45FFA2A63A81B7C13F6B8847A3E77EF14FE3DB7FCAFE0CBD10E8E826E03436D646AAEF87B2E247D4AF1E8ABE1D7520F9C2A45CB1EB8E95CFD55262B70B29FEEC5864E19C054FF99129280E4646217791811142820341263C5315");
+
+                return new X9ECParameters(curve, G, n, h);
             }
         }
 
@@ -319,10 +327,10 @@ namespace Org.BouncyCastle.Asn1.TeleTrust
                     new BigInteger("7F519EADA7BDA81BD826DBA647910F8C4B9346ED8CCDC64E4B1ABD11756DCE1D2074AA263B88805CED70355A33B471EE", 16), // b'
                     n, h));
 
-                return new X9ECParameters(
-                    curve,
-                    new X9ECPoint(curve, Hex.Decode("0418DE98B02DB9A306F2AFCD7235F72A819B80AB12EBD653172476FECD462AABFFC4FF191B946A5F54D8D0AA2F418808CC25AB056962D30651A114AFD2755AD336747F93475B7A1FCA3B88F2B6A208CCFE469408584DC2B2912675BF5B9E582928")), // G'
-                    n, h);
+                X9ECPoint G = ConfigureBasepoint(curve,
+                    "0418DE98B02DB9A306F2AFCD7235F72A819B80AB12EBD653172476FECD462AABFFC4FF191B946A5F54D8D0AA2F418808CC25AB056962D30651A114AFD2755AD336747F93475B7A1FCA3B88F2B6A208CCFE469408584DC2B2912675BF5B9E582928");
+
+                return new X9ECParameters(curve, G, n, h);
             }
         }
 
@@ -344,10 +352,10 @@ namespace Org.BouncyCastle.Asn1.TeleTrust
                     new BigInteger("3DF91610A83441CAEA9863BC2DED5D5AA8253AA10A2EF1C98B9AC8B57F1117A72BF2C7B9E7C1AC4D77FC94CADC083E67984050B75EBAE5DD2809BD638016F723", 16), // b
                     n, h));
 
-                return new X9ECParameters(
-                    curve,
-                    new X9ECPoint(curve, Hex.Decode("0481AEE4BDD82ED9645A21322E9C4C6A9385ED9F70B5D916C1B43B62EEF4D0098EFF3B1F78E2D0D48D50D1687B93B97D5F7C6D5047406A5E688B352209BCB9F8227DDE385D566332ECC0EABFA9CF7822FDF209F70024A57B1AA000C55B881F8111B2DCDE494A5F485E5BCA4BD88A2763AED1CA2B2FA8F0540678CD1E0F3AD80892")), // G
-                    n, h);
+                X9ECPoint G = ConfigureBasepoint(curve,
+                    "0481AEE4BDD82ED9645A21322E9C4C6A9385ED9F70B5D916C1B43B62EEF4D0098EFF3B1F78E2D0D48D50D1687B93B97D5F7C6D5047406A5E688B352209BCB9F8227DDE385D566332ECC0EABFA9CF7822FDF209F70024A57B1AA000C55B881F8111B2DCDE494A5F485E5BCA4BD88A2763AED1CA2B2FA8F0540678CD1E0F3AD80892");
+
+                return new X9ECParameters(curve, G, n, h);
             }
         }
 
@@ -370,10 +378,10 @@ namespace Org.BouncyCastle.Asn1.TeleTrust
                     new BigInteger("7CBBBCF9441CFAB76E1890E46884EAE321F70C0BCB4981527897504BEC3E36A62BCDFA2304976540F6450085F2DAE145C22553B465763689180EA2571867423E", 16), // b'
                     n, h));
 
-                return new X9ECParameters(
-                    curve,
-                    new X9ECPoint(curve, Hex.Decode("04640ECE5C12788717B9C1BA06CBC2A6FEBA85842458C56DDE9DB1758D39C0313D82BA51735CDB3EA499AA77A7D6943A64F7A3F25FE26F06B51BAA2696FA9035DA5B534BD595F5AF0FA2C892376C84ACE1BB4E3019B71634C01131159CAE03CEE9D9932184BEEF216BD71DF2DADF86A627306ECFF96DBB8BACE198B61E00F8B332")), // G'
-                    n, h);
+                X9ECPoint G = ConfigureBasepoint(curve,
+                    "04640ECE5C12788717B9C1BA06CBC2A6FEBA85842458C56DDE9DB1758D39C0313D82BA51735CDB3EA499AA77A7D6943A64F7A3F25FE26F06B51BAA2696FA9035DA5B534BD595F5AF0FA2C892376C84ACE1BB4E3019B71634C01131159CAE03CEE9D9932184BEEF216BD71DF2DADF86A627306ECFF96DBB8BACE198B61E00F8B332");
+
+                return new X9ECParameters(curve, G, n, h);
             }
         }