diff --git a/.travis.yml b/.travis.yml index 4e28d0c..f77ad20 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,4 @@ language: go go: - - 1.11.x - 1.12.x + - 1.13.x diff --git a/dsa_test.go b/dsa_test.go index afaf146..dcf8cb4 100644 --- a/dsa_test.go +++ b/dsa_test.go @@ -59,7 +59,7 @@ var dsa2048 = &dsaKey{ var dsaFixtures = []dsaFixture{ // DSA, 1024 Bits // https://tools.ietf.org/html/rfc6979#appendix-A.2.1 - dsaFixture{ + { name: "1024/SHA-1 #1", key: dsa1024, alg: sha1.New, @@ -67,7 +67,7 @@ var dsaFixtures = []dsaFixture{ r: "2E1A0C2562B2912CAAF89186FB0F42001585DA55", s: "29EFB6B0AFF2D7A68EB70CA313022253B9A88DF5", }, - dsaFixture{ + { name: "1024/SHA-224 #1", key: dsa1024, alg: sha256.New224, @@ -75,7 +75,7 @@ var dsaFixtures = []dsaFixture{ r: "4BC3B686AEA70145856814A6F1BB53346F02101E", s: "410697B92295D994D21EDD2F4ADA85566F6F94C1", }, - dsaFixture{ + { name: "1024/SHA-256 #1", key: dsa1024, alg: sha256.New, @@ -83,7 +83,7 @@ var dsaFixtures = []dsaFixture{ r: "81F2F5850BE5BC123C43F71A3033E9384611C545", s: "4CDD914B65EB6C66A8AAAD27299BEE6B035F5E89", }, - dsaFixture{ + { name: "1024/SHA-384 #1", key: dsa1024, alg: sha512.New384, @@ -91,7 +91,7 @@ var dsaFixtures = []dsaFixture{ r: "07F2108557EE0E3921BC1774F1CA9B410B4CE65A", s: "54DF70456C86FAC10FAB47C1949AB83F2C6F7595", }, - dsaFixture{ + { name: "1024/SHA-512 #1", key: dsa1024, alg: sha512.New, @@ -99,7 +99,7 @@ var dsaFixtures = []dsaFixture{ r: "16C3491F9B8C3FBBDD5E7A7B667057F0D8EE8E1B", s: "02C36A127A7B89EDBB72E4FFBC71DABC7D4FC69C", }, - dsaFixture{ + { name: "1024/SHA-1 #2", key: dsa1024, alg: sha1.New, @@ -107,7 +107,7 @@ var dsaFixtures = []dsaFixture{ r: "42AB2052FD43E123F0607F115052A67DCD9C5C77", s: "183916B0230D45B9931491D4C6B0BD2FB4AAF088", }, - dsaFixture{ + { name: "1024/SHA-224 #2", key: dsa1024, alg: sha256.New224, @@ -115,7 +115,7 @@ var dsaFixtures = []dsaFixture{ r: "6868E9964E36C1689F6037F91F28D5F2C30610F2", s: "49CEC3ACDC83018C5BD2674ECAAD35B8CD22940F", }, - dsaFixture{ + { name: "1024/SHA-256 #2", key: dsa1024, alg: sha256.New, @@ -123,7 +123,7 @@ var dsaFixtures = []dsaFixture{ r: "22518C127299B0F6FDC9872B282B9E70D0790812", s: "6837EC18F150D55DE95B5E29BE7AF5D01E4FE160", }, - dsaFixture{ + { name: "1024/SHA-384 #2", key: dsa1024, alg: sha512.New384, @@ -131,7 +131,7 @@ var dsaFixtures = []dsaFixture{ r: "854CF929B58D73C3CBFDC421E8D5430CD6DB5E66", s: "91D0E0F53E22F898D158380676A871A157CDA622", }, - dsaFixture{ + { name: "1024/SHA-512 #2", key: dsa1024, alg: sha512.New, @@ -142,7 +142,7 @@ var dsaFixtures = []dsaFixture{ // DSA, 2048 Bits // https://tools.ietf.org/html/rfc6979#appendix-A.2.2 - dsaFixture{ + { name: "2048/SHA-1 #1", key: dsa2048, alg: sha1.New, @@ -150,7 +150,7 @@ var dsaFixtures = []dsaFixture{ r: "3A1B2DBD7489D6ED7E608FD036C83AF396E290DBD602408E8677DAABD6E7445A", s: "D26FCBA19FA3E3058FFC02CA1596CDBB6E0D20CB37B06054F7E36DED0CDBBCCF", }, - dsaFixture{ + { name: "2048/SHA-224 #1", key: dsa2048, alg: sha256.New224, @@ -158,7 +158,7 @@ var dsaFixtures = []dsaFixture{ r: "DC9F4DEADA8D8FF588E98FED0AB690FFCE858DC8C79376450EB6B76C24537E2C", s: "A65A9C3BC7BABE286B195D5DA68616DA8D47FA0097F36DD19F517327DC848CEC", }, - dsaFixture{ + { name: "2048/SHA-256 #1", key: dsa2048, alg: sha256.New, @@ -166,7 +166,7 @@ var dsaFixtures = []dsaFixture{ r: "EACE8BDBBE353C432A795D9EC556C6D021F7A03F42C36E9BC87E4AC7932CC809", s: "7081E175455F9247B812B74583E9E94F9EA79BD640DC962533B0680793A38D53", }, - dsaFixture{ + { name: "2048/SHA-384 #1", key: dsa2048, alg: sha512.New384, @@ -174,7 +174,7 @@ var dsaFixtures = []dsaFixture{ r: "B2DA945E91858834FD9BF616EBAC151EDBC4B45D27D0DD4A7F6A22739F45C00B", s: "19048B63D9FD6BCA1D9BAE3664E1BCB97F7276C306130969F63F38FA8319021B", }, - dsaFixture{ + { name: "2048/SHA-512 #1", key: dsa2048, alg: sha512.New, @@ -182,7 +182,7 @@ var dsaFixtures = []dsaFixture{ r: "2016ED092DC5FB669B8EFB3D1F31A91EECB199879BE0CF78F02BA062CB4C942E", s: "D0C76F84B5F091E141572A639A4FB8C230807EEA7D55C8A154A224400AFF2351", }, - dsaFixture{ + { name: "2048/SHA-1 #2", key: dsa2048, alg: sha1.New, @@ -190,7 +190,7 @@ var dsaFixtures = []dsaFixture{ r: "C18270A93CFC6063F57A4DFA86024F700D980E4CF4E2CB65A504397273D98EA0", s: "414F22E5F31A8B6D33295C7539C1C1BA3A6160D7D68D50AC0D3A5BEAC2884FAA", }, - dsaFixture{ + { name: "2048/SHA-224 #2", key: dsa2048, alg: sha256.New224, @@ -198,7 +198,7 @@ var dsaFixtures = []dsaFixture{ r: "272ABA31572F6CC55E30BF616B7A265312018DD325BE031BE0CC82AA17870EA3", s: "E9CC286A52CCE201586722D36D1E917EB96A4EBDB47932F9576AC645B3A60806", }, - dsaFixture{ + { name: "2048/SHA-256 #2", key: dsa2048, alg: sha256.New, @@ -206,7 +206,7 @@ var dsaFixtures = []dsaFixture{ r: "8190012A1969F9957D56FCCAAD223186F423398D58EF5B3CEFD5A4146A4476F0", s: "7452A53F7075D417B4B013B278D1BB8BBD21863F5E7B1CEE679CF2188E1AB19E", }, - dsaFixture{ + { name: "2048/SHA-384 #2", key: dsa2048, alg: sha512.New384, @@ -214,7 +214,7 @@ var dsaFixtures = []dsaFixture{ r: "239E66DDBE8F8C230A3D071D601B6FFBDFB5901F94D444C6AF56F732BEB954BE", s: "6BD737513D5E72FE85D1C750E0F73921FE299B945AAD1C802F15C26A43D34961", }, - dsaFixture{ + { name: "2048/SHA-512 #2", key: dsa2048, alg: sha512.New, diff --git a/ecdsa.go b/ecdsa.go index cfb3b7a..25a1660 100644 --- a/ecdsa.go +++ b/ecdsa.go @@ -14,7 +14,7 @@ import ( // Note that FIPS 186-3 section 4.6 specifies that the hash should be truncated // to the byte-length of the subgroup. This function does not perform that // truncation itself. -func SignECDSA(priv *ecdsa.PrivateKey, hash []byte, alg func() hash.Hash) (r, s *big.Int, err error) { +func SignECDSA(priv *ecdsa.PrivateKey, hash []byte, alg func() hash.Hash) (r, s *big.Int) { c := priv.PublicKey.Curve N := c.Params().N diff --git a/ecdsa_test.go b/ecdsa_test.go index a0434d4..aa90346 100644 --- a/ecdsa_test.go +++ b/ecdsa_test.go @@ -77,7 +77,7 @@ var p521 = &ecdsaKey{ var fixtures = []ecdsaFixture{ // ECDSA, 224 Bits (Prime Field) // https://tools.ietf.org/html/rfc6979#appendix-A.2.4 - ecdsaFixture{ + { name: "P224/SHA-1 #1", key: p224, alg: sha1.New, @@ -85,7 +85,7 @@ var fixtures = []ecdsaFixture{ r: "22226F9D40A96E19C4A301CE5B74B115303C0F3A4FD30FC257FB57AC", s: "66D1CDD83E3AF75605DD6E2FEFF196D30AA7ED7A2EDF7AF475403D69", }, - ecdsaFixture{ + { name: "P224/SHA-224 #1", key: p224, alg: sha256.New224, @@ -93,7 +93,7 @@ var fixtures = []ecdsaFixture{ r: "1CDFE6662DDE1E4A1EC4CDEDF6A1F5A2FB7FBD9145C12113E6ABFD3E", s: "A6694FD7718A21053F225D3F46197CA699D45006C06F871808F43EBC", }, - ecdsaFixture{ + { name: "P224/SHA-256 #1", key: p224, alg: sha256.New, @@ -101,7 +101,7 @@ var fixtures = []ecdsaFixture{ r: "61AA3DA010E8E8406C656BC477A7A7189895E7E840CDFE8FF42307BA", s: "BC814050DAB5D23770879494F9E0A680DC1AF7161991BDE692B10101", }, - ecdsaFixture{ + { name: "P224/SHA-384 #1", key: p224, alg: sha512.New384, @@ -109,7 +109,7 @@ var fixtures = []ecdsaFixture{ r: "0B115E5E36F0F9EC81F1325A5952878D745E19D7BB3EABFABA77E953", s: "830F34CCDFE826CCFDC81EB4129772E20E122348A2BBD889A1B1AF1D", }, - ecdsaFixture{ + { name: "P224/SHA-512 #1", key: p224, alg: sha512.New, @@ -117,7 +117,7 @@ var fixtures = []ecdsaFixture{ r: "074BD1D979D5F32BF958DDC61E4FB4872ADCAFEB2256497CDAC30397", s: "A4CECA196C3D5A1FF31027B33185DC8EE43F288B21AB342E5D8EB084", }, - ecdsaFixture{ + { name: "P224/SHA-1 #2", key: p224, alg: sha1.New, @@ -125,7 +125,7 @@ var fixtures = []ecdsaFixture{ r: "DEAA646EC2AF2EA8AD53ED66B2E2DDAA49A12EFD8356561451F3E21C", s: "95987796F6CF2062AB8135271DE56AE55366C045F6D9593F53787BD2", }, - ecdsaFixture{ + { name: "P224/SHA-224 #2", key: p224, alg: sha256.New224, @@ -133,7 +133,7 @@ var fixtures = []ecdsaFixture{ r: "C441CE8E261DED634E4CF84910E4C5D1D22C5CF3B732BB204DBEF019", s: "902F42847A63BDC5F6046ADA114953120F99442D76510150F372A3F4", }, - ecdsaFixture{ + { name: "P224/SHA-256 #2", key: p224, alg: sha256.New, @@ -141,7 +141,7 @@ var fixtures = []ecdsaFixture{ r: "AD04DDE87B84747A243A631EA47A1BA6D1FAA059149AD2440DE6FBA6", s: "178D49B1AE90E3D8B629BE3DB5683915F4E8C99FDF6E666CF37ADCFD", }, - ecdsaFixture{ + { name: "P224/SHA-384 #2", key: p224, alg: sha512.New384, @@ -149,7 +149,7 @@ var fixtures = []ecdsaFixture{ r: "389B92682E399B26518A95506B52C03BC9379A9DADF3391A21FB0EA4", s: "414A718ED3249FF6DBC5B50C27F71F01F070944DA22AB1F78F559AAB", }, - ecdsaFixture{ + { name: "P224/SHA-512 #2", key: p224, alg: sha512.New, @@ -159,7 +159,7 @@ var fixtures = []ecdsaFixture{ }, // ECDSA, 256 Bits (Prime Field) // https://tools.ietf.org/html/rfc6979#appendix-A.2.5 - ecdsaFixture{ + { name: "P256/SHA-1 #1", key: p256, alg: sha1.New, @@ -167,7 +167,7 @@ var fixtures = []ecdsaFixture{ r: "61340C88C3AAEBEB4F6D667F672CA9759A6CCAA9FA8811313039EE4A35471D32", s: "6D7F147DAC089441BB2E2FE8F7A3FA264B9C475098FDCF6E00D7C996E1B8B7EB", }, - ecdsaFixture{ + { name: "P256/SHA-224 #1", key: p256, alg: sha256.New224, @@ -175,7 +175,7 @@ var fixtures = []ecdsaFixture{ r: "53B2FFF5D1752B2C689DF257C04C40A587FABABB3F6FC2702F1343AF7CA9AA3F", s: "B9AFB64FDC03DC1A131C7D2386D11E349F070AA432A4ACC918BEA988BF75C74C", }, - ecdsaFixture{ + { name: "P256/SHA-256 #1", key: p256, alg: sha256.New, @@ -183,7 +183,7 @@ var fixtures = []ecdsaFixture{ r: "EFD48B2AACB6A8FD1140DD9CD45E81D69D2C877B56AAF991C34D0EA84EAF3716", s: "F7CB1C942D657C41D436C7A1B6E29F65F3E900DBB9AFF4064DC4AB2F843ACDA8", }, - ecdsaFixture{ + { name: "P256/SHA-384 #1", key: p256, alg: sha512.New384, @@ -191,7 +191,7 @@ var fixtures = []ecdsaFixture{ r: "0EAFEA039B20E9B42309FB1D89E213057CBF973DC0CFC8F129EDDDC800EF7719", s: "4861F0491E6998B9455193E34E7B0D284DDD7149A74B95B9261F13ABDE940954", }, - ecdsaFixture{ + { name: "P256/SHA-512 #1", key: p256, alg: sha512.New, @@ -199,7 +199,7 @@ var fixtures = []ecdsaFixture{ r: "8496A60B5E9B47C825488827E0495B0E3FA109EC4568FD3F8D1097678EB97F00", s: "2362AB1ADBE2B8ADF9CB9EDAB740EA6049C028114F2460F96554F61FAE3302FE", }, - ecdsaFixture{ + { name: "P256/SHA-1 #2", key: p256, alg: sha1.New, @@ -207,7 +207,7 @@ var fixtures = []ecdsaFixture{ r: "0CBCC86FD6ABD1D99E703E1EC50069EE5C0B4BA4B9AC60E409E8EC5910D81A89", s: "01B9D7B73DFAA60D5651EC4591A0136F87653E0FD780C3B1BC872FFDEAE479B1", }, - ecdsaFixture{ + { name: "P256/SHA-224 #2", key: p256, alg: sha256.New224, @@ -215,7 +215,7 @@ var fixtures = []ecdsaFixture{ r: "C37EDB6F0AE79D47C3C27E962FA269BB4F441770357E114EE511F662EC34A692", s: "C820053A05791E521FCAAD6042D40AEA1D6B1A540138558F47D0719800E18F2D", }, - ecdsaFixture{ + { name: "P256/SHA-256 #2", key: p256, alg: sha256.New, @@ -223,7 +223,7 @@ var fixtures = []ecdsaFixture{ r: "F1ABB023518351CD71D881567B1EA663ED3EFCF6C5132B354F28D3B0B7D38367", s: "019F4113742A2B14BD25926B49C649155F267E60D3814B4C0CC84250E46F0083", }, - ecdsaFixture{ + { name: "P256/SHA-384 #2", key: p256, alg: sha512.New384, @@ -231,7 +231,7 @@ var fixtures = []ecdsaFixture{ r: "83910E8B48BB0C74244EBDF7F07A1C5413D61472BD941EF3920E623FBCCEBEB6", s: "8DDBEC54CF8CD5874883841D712142A56A8D0F218F5003CB0296B6B509619F2C", }, - ecdsaFixture{ + { name: "P256/SHA-512 #2", key: p256, alg: sha512.New, @@ -241,7 +241,7 @@ var fixtures = []ecdsaFixture{ }, // ECDSA, 384 Bits (Prime Field) // https://tools.ietf.org/html/rfc6979#appendix-A.2.6 - ecdsaFixture{ + { name: "P384/SHA-1 #1", key: p384, alg: sha1.New, @@ -249,7 +249,7 @@ var fixtures = []ecdsaFixture{ r: "EC748D839243D6FBEF4FC5C4859A7DFFD7F3ABDDF72014540C16D73309834FA37B9BA002899F6FDA3A4A9386790D4EB2", s: "A3BCFA947BEEF4732BF247AC17F71676CB31A847B9FF0CBC9C9ED4C1A5B3FACF26F49CA031D4857570CCB5CA4424A443", }, - ecdsaFixture{ + { name: "P384/SHA-224 #1", key: p384, alg: sha256.New224, @@ -257,7 +257,7 @@ var fixtures = []ecdsaFixture{ r: "42356E76B55A6D9B4631C865445DBE54E056D3B3431766D0509244793C3F9366450F76EE3DE43F5A125333A6BE060122", s: "9DA0C81787064021E78DF658F2FBB0B042BF304665DB721F077A4298B095E4834C082C03D83028EFBF93A3C23940CA8D", }, - ecdsaFixture{ + { name: "P384/SHA-256 #1", key: p384, alg: sha256.New, @@ -265,7 +265,7 @@ var fixtures = []ecdsaFixture{ r: "21B13D1E013C7FA1392D03C5F99AF8B30C570C6F98D4EA8E354B63A21D3DAA33BDE1E888E63355D92FA2B3C36D8FB2CD", s: "F3AA443FB107745BF4BD77CB3891674632068A10CA67E3D45DB2266FA7D1FEEBEFDC63ECCD1AC42EC0CB8668A4FA0AB0", }, - ecdsaFixture{ + { name: "P384/SHA-384 #1", key: p384, alg: sha512.New384, @@ -273,7 +273,7 @@ var fixtures = []ecdsaFixture{ r: "94EDBB92A5ECB8AAD4736E56C691916B3F88140666CE9FA73D64C4EA95AD133C81A648152E44ACF96E36DD1E80FABE46", s: "99EF4AEB15F178CEA1FE40DB2603138F130E740A19624526203B6351D0A3A94FA329C145786E679E7B82C71A38628AC8", }, - ecdsaFixture{ + { name: "P384/SHA-512 #1", key: p384, alg: sha512.New, @@ -281,7 +281,7 @@ var fixtures = []ecdsaFixture{ r: "ED0959D5880AB2D869AE7F6C2915C6D60F96507F9CB3E047C0046861DA4A799CFE30F35CC900056D7C99CD7882433709", s: "512C8CCEEE3890A84058CE1E22DBC2198F42323CE8ACA9135329F03C068E5112DC7CC3EF3446DEFCEB01A45C2667FDD5", }, - ecdsaFixture{ + { name: "P384/SHA-1 #2", key: p384, alg: sha1.New, @@ -289,7 +289,7 @@ var fixtures = []ecdsaFixture{ r: "4BC35D3A50EF4E30576F58CD96CE6BF638025EE624004A1F7789A8B8E43D0678ACD9D29876DAF46638645F7F404B11C7", s: "D5A6326C494ED3FF614703878961C0FDE7B2C278F9A65FD8C4B7186201A2991695BA1C84541327E966FA7B50F7382282", }, - ecdsaFixture{ + { name: "P384/SHA-224 #2", key: p384, alg: sha256.New224, @@ -297,7 +297,7 @@ var fixtures = []ecdsaFixture{ r: "E8C9D0B6EA72A0E7837FEA1D14A1A9557F29FAA45D3E7EE888FC5BF954B5E62464A9A817C47FF78B8C11066B24080E72", s: "07041D4A7A0379AC7232FF72E6F77B6DDB8F09B16CCE0EC3286B2BD43FA8C6141C53EA5ABEF0D8231077A04540A96B66", }, - ecdsaFixture{ + { name: "P384/SHA-256 #2", key: p384, alg: sha256.New, @@ -305,7 +305,7 @@ var fixtures = []ecdsaFixture{ r: "6D6DEFAC9AB64DABAFE36C6BF510352A4CC27001263638E5B16D9BB51D451559F918EEDAF2293BE5B475CC8F0188636B", s: "2D46F3BECBCC523D5F1A1256BF0C9B024D879BA9E838144C8BA6BAEB4B53B47D51AB373F9845C0514EEFB14024787265", }, - ecdsaFixture{ + { name: "P384/SHA-384 #2", key: p384, alg: sha512.New384, @@ -313,7 +313,7 @@ var fixtures = []ecdsaFixture{ r: "8203B63D3C853E8D77227FB377BCF7B7B772E97892A80F36AB775D509D7A5FEB0542A7F0812998DA8F1DD3CA3CF023DB", s: "DDD0760448D42D8A43AF45AF836FCE4DE8BE06B485E9B61B827C2F13173923E06A739F040649A667BF3B828246BAA5A5", }, - ecdsaFixture{ + { name: "P384/SHA-512 #2", key: p384, alg: sha512.New, @@ -323,7 +323,7 @@ var fixtures = []ecdsaFixture{ }, // ECDSA, 521 Bits (Prime Field) // https://tools.ietf.org/html/rfc6979#appendix-A.2.7 - ecdsaFixture{ + { name: "P521/SHA-1 #1", key: p521, alg: sha1.New, @@ -331,7 +331,7 @@ var fixtures = []ecdsaFixture{ r: "0343B6EC45728975EA5CBA6659BBB6062A5FF89EEA58BE3C80B619F322C87910FE092F7D45BB0F8EEE01ED3F20BABEC079D202AE677B243AB40B5431D497C55D75D", s: "0E7B0E675A9B24413D448B8CC119D2BF7B2D2DF032741C096634D6D65D0DBE3D5694625FB9E8104D3B842C1B0E2D0B98BEA19341E8676AEF66AE4EBA3D5475D5D16", }, - ecdsaFixture{ + { name: "P521/SHA-224 #1", key: p521, alg: sha256.New224, @@ -339,7 +339,7 @@ var fixtures = []ecdsaFixture{ r: "1776331CFCDF927D666E032E00CF776187BC9FDD8E69D0DABB4109FFE1B5E2A30715F4CC923A4A5E94D2503E9ACFED92857B7F31D7152E0F8C00C15FF3D87E2ED2E", s: "050CB5265417FE2320BBB5A122B8E1A32BD699089851128E360E620A30C7E17BA41A666AF126CE100E5799B153B60528D5300D08489CA9178FB610A2006C254B41F", }, - ecdsaFixture{ + { name: "P521/SHA-256 #1", key: p521, alg: sha256.New, @@ -347,7 +347,7 @@ var fixtures = []ecdsaFixture{ r: "1511BB4D675114FE266FC4372B87682BAECC01D3CC62CF2303C92B3526012659D16876E25C7C1E57648F23B73564D67F61C6F14D527D54972810421E7D87589E1A7", s: "04A171143A83163D6DF460AAF61522695F207A58B95C0644D87E52AA1A347916E4F7A72930B1BC06DBE22CE3F58264AFD23704CBB63B29B931F7DE6C9D949A7ECFC", }, - ecdsaFixture{ + { name: "P521/SHA-384 #1", key: p521, alg: sha512.New384, @@ -355,7 +355,7 @@ var fixtures = []ecdsaFixture{ r: "1EA842A0E17D2DE4F92C15315C63DDF72685C18195C2BB95E572B9C5136CA4B4B576AD712A52BE9730627D16054BA40CC0B8D3FF035B12AE75168397F5D50C67451", s: "1F21A3CEE066E1961025FB048BD5FE2B7924D0CD797BABE0A83B66F1E35EEAF5FDE143FA85DC394A7DEE766523393784484BDF3E00114A1C857CDE1AA203DB65D61", }, - ecdsaFixture{ + { name: "P521/SHA-512 #1", key: p521, alg: sha512.New, @@ -363,7 +363,7 @@ var fixtures = []ecdsaFixture{ r: "0C328FAFCBD79DD77850370C46325D987CB525569FB63C5D3BC53950E6D4C5F174E25A1EE9017B5D450606ADD152B534931D7D4E8455CC91F9B15BF05EC36E377FA", s: "0617CCE7CF5064806C467F678D3B4080D6F1CC50AF26CA209417308281B68AF282623EAA63E5B5C0723D8B8C37FF0777B1A20F8CCB1DCCC43997F1EE0E44DA4A67A", }, - ecdsaFixture{ + { name: "P521/SHA-1 #2", key: p521, alg: sha1.New, @@ -371,7 +371,7 @@ var fixtures = []ecdsaFixture{ r: "13BAD9F29ABE20DE37EBEB823C252CA0F63361284015A3BF430A46AAA80B87B0693F0694BD88AFE4E661FC33B094CD3B7963BED5A727ED8BD6A3A202ABE009D0367", s: "1E9BB81FF7944CA409AD138DBBEE228E1AFCC0C890FC78EC8604639CB0DBDC90F717A99EAD9D272855D00162EE9527567DD6A92CBD629805C0445282BBC916797FF", }, - ecdsaFixture{ + { name: "P521/SHA-224 #2", key: p521, alg: sha256.New224, @@ -379,7 +379,7 @@ var fixtures = []ecdsaFixture{ r: "1C7ED902E123E6815546065A2C4AF977B22AA8EADDB68B2C1110E7EA44D42086BFE4A34B67DDC0E17E96536E358219B23A706C6A6E16BA77B65E1C595D43CAE17FB", s: "177336676304FCB343CE028B38E7B4FBA76C1C1B277DA18CAD2A8478B2A9A9F5BEC0F3BA04F35DB3E4263569EC6AADE8C92746E4C82F8299AE1B8F1739F8FD519A4", }, - ecdsaFixture{ + { name: "P521/SHA-256 #2", key: p521, alg: sha256.New, @@ -387,7 +387,7 @@ var fixtures = []ecdsaFixture{ r: "00E871C4A14F993C6C7369501900C4BC1E9C7B0B4BA44E04868B30B41D8071042EB28C4C250411D0CE08CD197E4188EA4876F279F90B3D8D74A3C76E6F1E4656AA8", s: "0CD52DBAA33B063C3A6CD8058A1FB0A46A4754B034FCC644766CA14DA8CA5CA9FDE00E88C1AD60CCBA759025299079D7A427EC3CC5B619BFBC828E7769BCD694E86", }, - ecdsaFixture{ + { name: "P521/SHA-384 #2", key: p521, alg: sha512.New384, @@ -395,7 +395,7 @@ var fixtures = []ecdsaFixture{ r: "14BEE21A18B6D8B3C93FAB08D43E739707953244FDBE924FA926D76669E7AC8C89DF62ED8975C2D8397A65A49DCC09F6B0AC62272741924D479354D74FF6075578C", s: "133330865C067A0EAF72362A65E2D7BC4E461E8C8995C3B6226A21BD1AA78F0ED94FE536A0DCA35534F0CD1510C41525D163FE9D74D134881E35141ED5E8E95B979", }, - ecdsaFixture{ + { name: "P521/SHA-512 #2", key: p521, alg: sha512.New, @@ -428,12 +428,7 @@ func testEcsaFixture(f *ecdsaFixture, t *testing.T) { digest = digest[0:g] } - r, s, err := rfc6979.SignECDSA(f.key.key, digest, f.alg) - if err != nil { - t.Error(err) - return - } - + r, s := rfc6979.SignECDSA(f.key.key, digest, f.alg) expectedR := ecdsaLoadInt(f.r) expectedS := ecdsaLoadInt(f.s) diff --git a/example_test.go b/example_test.go index 6abac92..bb26262 100644 --- a/example_test.go +++ b/example_test.go @@ -27,11 +27,7 @@ func ExampleSignECDSA() { hash := alg.Sum(nil) // Sign the message. You don't need a PRNG for this. - r, s, err := SignECDSA(k, hash, sha512.New) - if err != nil { - fmt.Println(err) - return - } + r, s := SignECDSA(k, hash, sha512.New) if !ecdsa.Verify(&k.PublicKey, hash, r, s) { fmt.Println("Invalid signature!") @@ -45,7 +41,10 @@ func ExampleSignDSA() { // Here I'm generating some DSA params, but you should really pre-generate // these and re-use them, since this takes a long time and isn't necessary. k := new(dsa.PrivateKey) - dsa.GenerateParameters(&k.Parameters, rand.Reader, dsa.L1024N160) + if err := dsa.GenerateParameters(&k.Parameters, rand.Reader, dsa.L1024N160); err != nil { + fmt.Println(err) + return + } // Generate a key pair. // You need a high-quality PRNG for this.