cmd/cer-selfsigned-example/main.go | 5 ++--- cmd/streebog256/main.go | 4 +--- cmd/streebog512/main.go | 4 +--- gost28147/ctr_test.go | 1 + gost28147/mac.go | 10 ++++------ gost3410/vko2001_test.go | 2 +- gost3410/vko2012_test.go | 4 ++-- internal/gost34112012/precalc.go | 49 +++++++++++++++++++++++++++++++++---------------- diff --git a/cmd/cer-selfsigned-example/main.go b/cmd/cer-selfsigned-example/main.go index 2d165c9eb24a38ea5078a1e9d09e5511e2b4d98c42624cf15a06ef6f094d7ec5..448daa0097a26fa1de93a00333ca7bf7426a1371783c733afa9d3f9b7efe1e37 100644 --- a/cmd/cer-selfsigned-example/main.go +++ b/cmd/cer-selfsigned-example/main.go @@ -17,6 +17,8 @@ // Example X.509 certificate issuing utility. package main import ( + "crypto/go.cypherpunks.su/gogost/v6/gost3410" + "crypto/go.cypherpunks.su/gogost/v6/gost34112012256" "crypto/rand" "crypto/x509" "crypto/x509/pkix" @@ -27,9 +29,6 @@ "log" "math/big" "os" "time" - - "crypto/go.cypherpunks.su/gogost/v6/gost3410" - "crypto/go.cypherpunks.su/gogost/v6/gost34112012256" ) const ( diff --git a/cmd/streebog256/main.go b/cmd/streebog256/main.go index 408919e691d577120871be7e226d1a0c4aee5c35e5a979d015bae4c2b17391b8..4944981de1045d84ce239d9dcad1e0ad12aa4d1ecfebb6c8b4ddc4c3896157a1 100644 --- a/cmd/streebog256/main.go +++ b/cmd/streebog256/main.go @@ -27,9 +27,7 @@ "go.cypherpunks.su/gogost/v6" "go.cypherpunks.su/gogost/v6/gost34112012256" ) -var ( - version = flag.Bool("version", false, "Print version information") -) +var version = flag.Bool("version", false, "Print version information") func main() { flag.Parse() diff --git a/cmd/streebog512/main.go b/cmd/streebog512/main.go index 47baf0a5114ed08bdd6e528d2101be992db46e9576080192133a515cfeda83de..d10aff3b1d3a93bf1bdcad137412b47e60500bab7b1881c0c07b5f0790f13ceb 100644 --- a/cmd/streebog512/main.go +++ b/cmd/streebog512/main.go @@ -27,9 +27,7 @@ "go.cypherpunks.su/gogost/v6" "go.cypherpunks.su/gogost/v6/gost34112012512" ) -var ( - version = flag.Bool("version", false, "Print version information") -) +var version = flag.Bool("version", false, "Print version information") func main() { flag.Parse() diff --git a/gost28147/ctr_test.go b/gost28147/ctr_test.go index c6af00d014730bff425b4abd1b3907edc7017f4abd3f824e82b30d25bb92199b..42fffe853df37c8b799ac662af5b7349b7fc377f2d1554e50521fc33342961e2 100644 --- a/gost28147/ctr_test.go +++ b/gost28147/ctr_test.go @@ -172,6 +172,7 @@ if err := quick.Check(f, nil); err != nil { t.Error(err) } } + func TestCTRInterface(t *testing.T) { var key [KeySize]byte var iv [8]byte diff --git a/gost28147/mac.go b/gost28147/mac.go index b55e508f976123875c5585dfb521eb9e762a0220fb236759043109da8c2622ac..edb9fb9d26e71c20f545002d998897880c8d566832f148f03cfa25da2962e4fd 100644 --- a/gost28147/mac.go +++ b/gost28147/mac.go @@ -19,12 +19,10 @@ import ( "fmt" ) -var ( - SeqMAC = Seq([]uint8{ - 0, 1, 2, 3, 4, 5, 6, 7, - 0, 1, 2, 3, 4, 5, 6, 7, - }) -) +var SeqMAC = Seq([]uint8{ + 0, 1, 2, 3, 4, 5, 6, 7, + 0, 1, 2, 3, 4, 5, 6, 7, +}) type MAC struct { c *Cipher diff --git a/gost3410/vko2001_test.go b/gost3410/vko2001_test.go index e7e32edf9d693d3ac0096ebd3d067f4528cf1668058ba39a367c610bb10dfbf9..33688e2fa69307192fc688e8c3f8cf4a4f66a197488836c1f090e72e1e152c3f 100644 --- a/gost3410/vko2001_test.go +++ b/gost3410/vko2001_test.go @@ -66,7 +66,7 @@ } func TestRandomVKO2001(t *testing.T) { c := CurveIdGostR34102001TestParamSet() - f := func(prvRaw1 [32]byte, prvRaw2 [32]byte, ukmRaw [8]byte) bool { + f := func(prvRaw1, prvRaw2 [32]byte, ukmRaw [8]byte) bool { prv1, err := NewPrivateKey(c, prvRaw1[:]) if err != nil { return false diff --git a/gost3410/vko2012_test.go b/gost3410/vko2012_test.go index fe03ac77e97c130456907d6ad4c8e93febc050a11448ff36b5999625004b67c5..6240b96fc9c85e7979cb0e6e65f5230eec49f0312da1cc41d98935fffdb8a9cd 100644 --- a/gost3410/vko2012_test.go +++ b/gost3410/vko2012_test.go @@ -47,7 +47,7 @@ } func TestRandomVKO2012256(t *testing.T) { c := CurveIdtc26gost341012512paramSetA() - f := func(prvRaw1 [64]byte, prvRaw2 [64]byte, ukmRaw [8]byte) bool { + f := func(prvRaw1, prvRaw2 [64]byte, ukmRaw [8]byte) bool { prv1, err := NewPrivateKey(c, prvRaw1[:]) if err != nil { return false @@ -93,7 +93,7 @@ } func TestRandomVKO2012512(t *testing.T) { c := CurveIdtc26gost341012512paramSetA() - f := func(prvRaw1 [64]byte, prvRaw2 [64]byte, ukmRaw [8]byte) bool { + f := func(prvRaw1, prvRaw2 [64]byte, ukmRaw [8]byte) bool { prv1, err := NewPrivateKey(c, prvRaw1[:]) if err != nil { return false diff --git a/internal/gost34112012/precalc.go b/internal/gost34112012/precalc.go index 0f66c750cb973da2c681ac87b3d8718fe2ab8c447aeefeaa8631269355116f20..37f6919aab472ef76e20d768de96a9e7d3b1ffddf4a22456295193bac115db85 100644 --- a/internal/gost34112012/precalc.go +++ b/internal/gost34112012/precalc.go @@ -1,7 +1,8 @@ package gost34112012 var precalc = [8][256]uint64{ - {0xd01f715b5c7ef8e6, 0x16fa240980778325, 0xa8a42e857ee049c8, 0x6ac1068fa186465b, + { + 0xd01f715b5c7ef8e6, 0x16fa240980778325, 0xa8a42e857ee049c8, 0x6ac1068fa186465b, 0x6e417bd7a2e9320b, 0x665c8167a437daab, 0x7666681aa89617f6, 0x4b959163700bdcf5, 0xf14be6b78df36248, 0xc585bd689a625cff, 0x9557d7fca67d82cb, 0x89f0b969af6dd366, 0xb0833d48749f6c35, 0xa1998c23b1ecbc7c, 0x8d70c431ac02a736, 0xd6dfbc2fd0a8b69e, @@ -64,9 +65,11 @@ 0x2074cffa185f87ba, 0xbd3ee2b6b8fcedd1, 0xae64e3f1f23607b0, 0xfeb68965ce29d984, 0x55724fdaf6a2b770, 0x29496d5cd753720e, 0xa75941573d3af204, 0x8e102c0bea69800a, 0x111ab16bc573d049, 0xd7ffe439197aab8a, 0xefac380e0b5a09cd, 0x48f579593660fbc9, 0x22347fd697e6bd92, 0x61bc1405e13389c7, 0x4ab5c975b9d9c1e1, 0x80cd1bcf606126d2, - 0x7186fd78ed92449a, 0x93971a882aabccb3, 0x88d0e17f66bfce72, 0x27945a985d5bd4d6}, + 0x7186fd78ed92449a, 0x93971a882aabccb3, 0x88d0e17f66bfce72, 0x27945a985d5bd4d6, + }, - {0xde553f8c05a811c8, 0x1906b59631b4f565, 0x436e70d6b1964ff7, 0x36d343cb8b1e9d85, + { + 0xde553f8c05a811c8, 0x1906b59631b4f565, 0x436e70d6b1964ff7, 0x36d343cb8b1e9d85, 0x843dfacc858aab5a, 0xfdfc95c299bfc7f9, 0x0f634bdea1d51fa2, 0x6d458b3b76efb3cd, 0x85c3f77cf8593f80, 0x3c91315fbe737cb2, 0x2148b03366ace398, 0x18f8b8264c6761bf, 0xc830c1c495c9fb0f, 0x981a76102086a0aa, 0xaa16012142f35760, 0x35cc54060c763cf6, @@ -129,9 +132,11 @@ 0xf923a13870d4adb6, 0xa1aa7e050a4d228d, 0xa8f71b5cb84862c9, 0xb52e9a306097fde3, 0x0d8251a35b6e2a0b, 0x2257a7fee1c442eb, 0x73831d9a29588d94, 0x51d4ba64c89ccf7f, 0x502ab7d4b54f5ba5, 0x97793dce8153bf08, 0xe5042de4d5d8a646, 0x9687307efc802bd2, 0xa05473b5779eb657, 0xb4d097801d446939, 0xcff0e2f3fbca3033, 0xc38cbee0dd778ee2, - 0x464f499c252eb162, 0xcad1dbb96f72cea6, 0xba4dd1eec142e241, 0xb00fa37af42f0376}, + 0x464f499c252eb162, 0xcad1dbb96f72cea6, 0xba4dd1eec142e241, 0xb00fa37af42f0376, + }, - {0xcce4cd3aa968b245, 0x089d5484e80b7faf, 0x638246c1b3548304, 0xd2fe0ec8c2355492, + { + 0xcce4cd3aa968b245, 0x089d5484e80b7faf, 0x638246c1b3548304, 0xd2fe0ec8c2355492, 0xa7fbdf7ff2374eee, 0x4df1600c92337a16, 0x84e503ea523b12fb, 0x0790bbfd53ab0c4a, 0x198a780f38f6ea9d, 0x2ab30c8f55ec48cb, 0xe0f7fed6b2c49db5, 0xb6ecf3f422cadbdc, 0x409c9a541358df11, 0xd3ce8a56dfde3fe3, 0xc3e9224312c8c1a0, 0x0d6dfa58816ba507, @@ -194,9 +199,11 @@ 0x8f28c6d19d10d0c7, 0x85d587744fd0798a, 0xa20b71a39b579446, 0x684f83fa7c7f4138, 0xe507500adba4471d, 0x3f640a46f19a6c20, 0x1247bd34f7dd28a1, 0x2d23b77206474481, 0x93521002cc86e0f2, 0x572b89bc8de52d18, 0xfb1d93f8b0f9a1ca, 0xe95a2ecc4724896b, 0x3ba420048511ddf9, 0xd63e248ab6bee54b, 0x5dd6c8195f258455, 0x06a03f634e40673b, - 0x1f2a476c76b68da6, 0x217ec9b49ac78af7, 0xecaa80102e4453c3, 0x14e78257b99d4f9a}, + 0x1f2a476c76b68da6, 0x217ec9b49ac78af7, 0xecaa80102e4453c3, 0x14e78257b99d4f9a, + }, - {0x20329b2cc87bba05, 0x4f5eb6f86546a531, 0xd4f44775f751b6b1, 0x8266a47b850dfa8b, + { + 0x20329b2cc87bba05, 0x4f5eb6f86546a531, 0xd4f44775f751b6b1, 0x8266a47b850dfa8b, 0xbb986aa15a6ca985, 0xc979eb08f9ae0f99, 0x2da6f447a2375ea1, 0x1e74275dcd7d8576, 0xbc20180a800bc5f8, 0xb4a2f701b2dc65be, 0xe726946f981b6d66, 0x48e6c453bf21c94c, 0x42cad9930f0a4195, 0xefa47b64aacccd20, 0x71180a8960409a42, 0x8bb3329bf6a44e0c, @@ -259,9 +266,11 @@ 0xd5a33e9eb62fa270, 0x40642b588df6690a, 0x7f75eec2c98e42b8, 0x2cf18dace3494a60, 0x23cb100c0bf9865b, 0xeef3028febb2d9e1, 0x4425d2d394133929, 0xaad6d05c7fa1e0c8, 0xad6ea2f7a5c68cb5, 0xc2028f2308fb9381, 0x819f2f5b468fc6d5, 0xc5bafd88d29cfffc, 0x47dc59f357910577, 0x2b49ff07392e261d, 0x57c59ae5332258fb, 0x73b6f842e2bcb2dd, - 0xcf96e04862b77725, 0x4ca73dd8a6c4996f, 0x015779eb417e14c1, 0x37932a9176af8bf4}, + 0xcf96e04862b77725, 0x4ca73dd8a6c4996f, 0x015779eb417e14c1, 0x37932a9176af8bf4, + }, - {0x190a2c9b249df23e, 0x2f62f8b62263e1e9, 0x7a7f754740993655, 0x330b7ba4d5564d9f, + { + 0x190a2c9b249df23e, 0x2f62f8b62263e1e9, 0x7a7f754740993655, 0x330b7ba4d5564d9f, 0x4c17a16a46672582, 0xb22f08eb7d05f5b8, 0x535f47f40bc148cc, 0x3aec5d27d4883037, 0x10ed0a1825438f96, 0x516101f72c233d17, 0x13cc6f949fd04eae, 0x739853c441474bfd, 0x653793d90d3f5b1b, 0x5240647b96b0fc2f, 0x0c84890ad27623e0, 0xd7189b32703aaea3, @@ -324,9 +333,11 @@ 0xdfe09e3eec9567e8, 0x3214582b4827f97c, 0xb46dc2ee143e6ac8, 0xf6c0ac8da7cd1971, 0xebb60c10cd8901e4, 0xf7df8f023abcad92, 0x9c52d3d2c217a0b2, 0x6b8d5cd0f8ab0d20, 0x3777f7a29b8fa734, 0x011f238f9d71b4e3, 0xc1b75b2f3c42be45, 0x5de588fdfe551ef7, 0x6eeef3592b035368, 0xaa3a07ffc4e9b365, 0xecebe59a39c32a77, 0x5ba742f8976e8187, - 0x4b4a48e0b22d0e11, 0xddded83dcb771233, 0xa59feb79ac0c51bd, 0xc7f5912a55792135}, + 0x4b4a48e0b22d0e11, 0xddded83dcb771233, 0xa59feb79ac0c51bd, 0xc7f5912a55792135, + }, - {0x6d6ae04668a9b08a, 0x3ab3f04b0be8c743, 0xe51e166b54b3c908, 0xbe90a9eb35c2f139, + { + 0x6d6ae04668a9b08a, 0x3ab3f04b0be8c743, 0xe51e166b54b3c908, 0xbe90a9eb35c2f139, 0xb2c7066637f2bec1, 0xaa6945613392202c, 0x9a28c36f3b5201eb, 0xddce5a93ab536994, 0x0e34133ef6382827, 0x52a02ba1ec55048b, 0xa2f88f97c4b2a177, 0x8640e513ca2251a5, 0xcdf1d36258137622, 0xfe6cb708dedf8ddb, 0x8a174a9ec8121e5d, 0x679896036b81560e, @@ -389,9 +400,11 @@ 0x6082111c109d4293, 0xdad4dd8cd04f7d09, 0xefec602e579b2f8c, 0x1fb4c4187f7c8a70, 0xffd3e9dfa4db303a, 0x7bf0b07f9af10640, 0xf49ec14dddf76b5f, 0x8f6e713247066d1f, 0x339d646a86ccfbf9, 0x64447467e58d8c30, 0x2c29a072f9b07189, 0xd8b7613f24471ad6, 0x6627c8d41185ebef, 0xa347d140beb61c96, 0xde12b8f7255fb3aa, 0x9d324470404e1576, - 0x9306574eb6763d51, 0xa80af9d2c79a47f3, 0x859c0777442e8b9b, 0x69ac853d9db97e29}, + 0x9306574eb6763d51, 0xa80af9d2c79a47f3, 0x859c0777442e8b9b, 0x69ac853d9db97e29, + }, - {0xc3407dfc2de6377e, 0x5b9e93eea4256f77, 0xadb58fdd50c845e0, 0x5219ff11a75bed86, + { + 0xc3407dfc2de6377e, 0x5b9e93eea4256f77, 0xadb58fdd50c845e0, 0x5219ff11a75bed86, 0x356b61cfd90b1de9, 0xfb8f406e25abe037, 0x7a5a0231c0f60796, 0x9d3cd216e1f5020b, 0x0c6550fb6b48d8f3, 0xf57508c427ff1c62, 0x4ad35ffa71cb407d, 0x6290a2da1666aa6d, 0xe284ec2349355f9f, 0xb3c307c53d7c84ec, 0x05e23c0468365a02, 0x190bac4d6c9ebfa8, @@ -454,9 +467,11 @@ 0x1fb784bed7bad35f, 0x9b80fae55ad16efc, 0x77fe5e6c11b0cd36, 0xc858095247849129, 0x08466059b97090a2, 0x01c10ca6ba0e1253, 0x6988d6747c040c3a, 0x6849dad2c60a1e69, 0x5147ebe67449db73, 0xc99905f4fd8a837a, 0x991fe2b433cd4a5a, 0xf09734c04fc94660, 0xa28ecbd1e892abe6, 0xf1563866f5c75433, 0x4dae7baf70e13ed9, 0x7ce62ac27bd26b61, - 0x70837a39109ab392, 0x90988e4b30b3c8ab, 0xb2020b63877296bf, 0x156efcb607d6675b}, + 0x70837a39109ab392, 0x90988e4b30b3c8ab, 0xb2020b63877296bf, 0x156efcb607d6675b, + }, - {0xe63f55ce97c331d0, 0x25b506b0015bba16, 0xc8706e29e6ad9ba8, 0x5b43d3775d521f6a, + { + 0xe63f55ce97c331d0, 0x25b506b0015bba16, 0xc8706e29e6ad9ba8, 0x5b43d3775d521f6a, 0x0bfa3d577035106e, 0xab95fc172afb0e66, 0xf64b63979e7a3276, 0xf58b4562649dad4b, 0x48f7c3dbae0c83f1, 0xff31916642f5c8c5, 0xcbb048dc1c4a0495, 0x66b8f83cdf622989, 0x35c130e908e2b9b0, 0x7c761a61f0b34fa1, 0x3601161cf205268d, 0x9e54ccfe2219b7d6, @@ -519,4 +534,6 @@ 0xbaa1231d751f7820, 0xd17eaa81339b62bd, 0xb01bf71953771dae, 0x849a2ea30dc8d1fe, 0x705182923f080955, 0x0ea757556301ac29, 0x041d83514569c9a7, 0x0abad4042668658e, 0x49b72a88f851f611, 0x8a3d79f66ec97dd7, 0xcd2d042bf59927ef, 0xc930877ab0f0ee48, 0x9273540deda2f122, 0xc797d02fd3f14261, 0xe1e2f06a284d674a, 0xd2be8c74c97cfd80, - 0x9a494faf67707e71, 0xb3dbd1eca9908293, 0x72d14d3493b2e388, 0xd6a30f258c153427}} + 0x9a494faf67707e71, 0xb3dbd1eca9908293, 0x72d14d3493b2e388, 0xd6a30f258c153427, + }, +}