X-Git-Url: http://www.git.cypherpunks.ru/?p=pygost.git;a=blobdiff_plain;f=pygost%2Ftest_gost3410.py;h=b69afae81cd13ffe8e5f15208e06bd5e95d68c8a;hp=684bc9b69c303431c28734efad751c7de6b7cdf5;hb=ff0ff768110b9bd69d030a1423bad515ea4c32bb;hpb=0fcc8bc147ada51d2a9a912f18ac362d54b7d49a diff --git a/pygost/test_gost3410.py b/pygost/test_gost3410.py index 684bc9b..b69afae 100644 --- a/pygost/test_gost3410.py +++ b/pygost/test_gost3410.py @@ -18,7 +18,7 @@ from os import urandom from unittest import TestCase -from pygost.gost3410 import CURVE_PARAMS +from pygost.gost3410 import CURVES from pygost.gost3410 import GOST3410Curve from pygost.gost3410 import public_key from pygost.gost3410 import sign @@ -69,7 +69,7 @@ class Test341001(TestCase): prv = bytes2long(prv) signature = signature[32:] + signature[:32] - c = GOST3410Curve(*CURVE_PARAMS["id-GostR3410-2001-TestParamSet"]) + c = CURVES["id-GostR3410-2001-TestParamSet"] pubX, pubY = public_key(c, prv) self.assertSequenceEqual(long2bytes(pubX), pub_x) self.assertSequenceEqual(long2bytes(pubY), pub_y) @@ -78,7 +78,7 @@ class Test341001(TestCase): self.assertTrue(verify(c, (pubX, pubY), digest, signature)) def test_sequence(self): - c = GOST3410Curve(*CURVE_PARAMS["id-GostR3410-2001-TestParamSet"]) + c = CURVES["id-GostR3410-2001-TestParamSet"] prv = bytes2long(urandom(32)) pubX, pubY = public_key(c, prv) for _ in range(20): @@ -91,7 +91,7 @@ class Test34102012(TestCase): def test_gcl3(self): """ Test vector from libgcl3 """ - p = bytes(bytearray(( + p = bytes2long(bytes(bytearray(( 0x45, 0x31, 0xAC, 0xD1, 0xFE, 0x00, 0x23, 0xC7, 0x55, 0x0D, 0x26, 0x7B, 0x6B, 0x2F, 0xEE, 0x80, 0x92, 0x2B, 0x14, 0xB2, 0xFF, 0xB9, 0x0F, 0x04, @@ -99,9 +99,9 @@ class Test34102012(TestCase): 0xF1, 0xD8, 0x52, 0x74, 0x1A, 0xF4, 0x70, 0x4A, 0x04, 0x58, 0x04, 0x7E, 0x80, 0xE4, 0x54, 0x6D, 0x35, 0xB8, 0x33, 0x6F, 0xAC, 0x22, 0x4D, 0xD8, - 0x16, 0x64, 0xBB, 0xF5, 0x28, 0xBE, 0x63, 0x73 - ))) - q = bytes(bytearray(( + 0x16, 0x64, 0xBB, 0xF5, 0x28, 0xBE, 0x63, 0x73, + )))) + q = bytes2long(bytes(bytearray(( 0x45, 0x31, 0xAC, 0xD1, 0xFE, 0x00, 0x23, 0xC7, 0x55, 0x0D, 0x26, 0x7B, 0x6B, 0x2F, 0xEE, 0x80, 0x92, 0x2B, 0x14, 0xB2, 0xFF, 0xB9, 0x0F, 0x04, @@ -109,9 +109,9 @@ class Test34102012(TestCase): 0xA8, 0x2F, 0x2D, 0x7E, 0xCB, 0x1D, 0xBA, 0xC7, 0x19, 0x90, 0x5C, 0x5E, 0xEC, 0xC4, 0x23, 0xF1, 0xD8, 0x6E, 0x25, 0xED, 0xBE, 0x23, 0xC5, 0x95, - 0xD6, 0x44, 0xAA, 0xF1, 0x87, 0xE6, 0xE6, 0xDF - ))) - a = bytes(bytearray(( + 0xD6, 0x44, 0xAA, 0xF1, 0x87, 0xE6, 0xE6, 0xDF, + )))) + a = bytes2long(bytes(bytearray(( 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -119,9 +119,9 @@ class Test34102012(TestCase): 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07 - ))) - b = bytes(bytearray(( + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, + )))) + b = bytes2long(bytes(bytearray(( 0x1C, 0xFF, 0x08, 0x06, 0xA3, 0x11, 0x16, 0xDA, 0x29, 0xD8, 0xCF, 0xA5, 0x4E, 0x57, 0xEB, 0x74, 0x8B, 0xC5, 0xF3, 0x77, 0xE4, 0x94, 0x00, 0xFD, @@ -129,9 +129,9 @@ class Test34102012(TestCase): 0x61, 0x83, 0x40, 0x13, 0xB2, 0xAD, 0x73, 0x22, 0x48, 0x0A, 0x89, 0xCA, 0x58, 0xE0, 0xCF, 0x74, 0xBC, 0x9E, 0x54, 0x0C, 0x2A, 0xDD, 0x68, 0x97, - 0xFA, 0xD0, 0xA3, 0x08, 0x4F, 0x30, 0x2A, 0xDC - ))) - x = bytes(bytearray(( + 0xFA, 0xD0, 0xA3, 0x08, 0x4F, 0x30, 0x2A, 0xDC, + )))) + x = bytes2long(bytes(bytearray(( 0x24, 0xD1, 0x9C, 0xC6, 0x45, 0x72, 0xEE, 0x30, 0xF3, 0x96, 0xBF, 0x6E, 0xBB, 0xFD, 0x7A, 0x6C, 0x52, 0x13, 0xB3, 0xB3, 0xD7, 0x05, 0x7C, 0xC8, @@ -139,9 +139,9 @@ class Test34102012(TestCase): 0xFD, 0x60, 0x61, 0x12, 0x62, 0xCD, 0x83, 0x8D, 0xC6, 0xB6, 0x0A, 0xA7, 0xEE, 0xE8, 0x04, 0xE2, 0x8B, 0xC8, 0x49, 0x97, 0x7F, 0xAC, 0x33, 0xB4, - 0xB5, 0x30, 0xF1, 0xB1, 0x20, 0x24, 0x8A, 0x9A - ))) - y = bytes(bytearray(( + 0xB5, 0x30, 0xF1, 0xB1, 0x20, 0x24, 0x8A, 0x9A, + )))) + y = bytes2long(bytes(bytearray(( 0x2B, 0xB3, 0x12, 0xA4, 0x3B, 0xD2, 0xCE, 0x6E, 0x0D, 0x02, 0x06, 0x13, 0xC8, 0x57, 0xAC, 0xDD, 0xCF, 0xBF, 0x06, 0x1E, 0x91, 0xE5, 0xF2, 0xC3, @@ -149,8 +149,8 @@ class Test34102012(TestCase): 0x83, 0xAB, 0x15, 0x6D, 0x77, 0xF1, 0x49, 0x6B, 0xF7, 0xEB, 0x33, 0x51, 0xE1, 0xEE, 0x4E, 0x43, 0xDC, 0x1A, 0x18, 0xB9, 0x1B, 0x24, 0x64, 0x0B, - 0x6D, 0xBB, 0x92, 0xCB, 0x1A, 0xDD, 0x37, 0x1E - ))) + 0x6D, 0xBB, 0x92, 0xCB, 0x1A, 0xDD, 0x37, 0x1E, + )))) prv = bytes(bytearray(( 0x0B, 0xA6, 0x04, 0x8A, 0xAD, 0xAE, 0x24, 0x1B, 0xA4, 0x09, 0x36, 0xD4, 0x77, 0x56, 0xD7, 0xC9, @@ -159,7 +159,7 @@ class Test34102012(TestCase): 0x72, 0xE8, 0x12, 0x3B, 0x22, 0x00, 0xA0, 0x56, 0x33, 0x22, 0xDA, 0xD2, 0x82, 0x7E, 0x27, 0x14, 0xA2, 0x63, 0x6B, 0x7B, 0xFD, 0x18, 0xAA, 0xDF, - 0xC6, 0x29, 0x67, 0x82, 0x1F, 0xA1, 0x8D, 0xD4 + 0xC6, 0x29, 0x67, 0x82, 0x1F, 0xA1, 0x8D, 0xD4, ))) pub_x = bytes(bytearray(( 0x11, 0x5D, 0xC5, 0xBC, 0x96, 0x76, 0x0C, 0x7B, @@ -169,7 +169,7 @@ class Test34102012(TestCase): 0x5A, 0x51, 0x58, 0x56, 0xD1, 0x33, 0x14, 0xAF, 0x69, 0xBC, 0x5B, 0x92, 0x4C, 0x8B, 0x4D, 0xDF, 0xF7, 0x5C, 0x45, 0x41, 0x5C, 0x1D, 0x9D, 0xD9, - 0xDD, 0x33, 0x61, 0x2C, 0xD5, 0x30, 0xEF, 0xE1 + 0xDD, 0x33, 0x61, 0x2C, 0xD5, 0x30, 0xEF, 0xE1, ))) pub_y = bytes(bytearray(( 0x37, 0xC7, 0xC9, 0x0C, 0xD4, 0x0B, 0x0F, 0x56, @@ -179,7 +179,7 @@ class Test34102012(TestCase): 0xEA, 0x19, 0x94, 0x41, 0xD9, 0x43, 0xFF, 0xE7, 0xF0, 0xC7, 0x0A, 0x27, 0x59, 0xA3, 0xCD, 0xB8, 0x4C, 0x11, 0x4E, 0x1F, 0x93, 0x39, 0xFD, 0xF2, - 0x7F, 0x35, 0xEC, 0xA9, 0x36, 0x77, 0xBE, 0xEC + 0x7F, 0x35, 0xEC, 0xA9, 0x36, 0x77, 0xBE, 0xEC, ))) digest = bytes(bytearray(( 0x37, 0x54, 0xF3, 0xCF, 0xAC, 0xC9, 0xE0, 0x61, @@ -189,7 +189,7 @@ class Test34102012(TestCase): 0x71, 0x84, 0xEE, 0x53, 0x65, 0x93, 0xF4, 0x41, 0x43, 0x39, 0x97, 0x6C, 0x64, 0x7C, 0x5D, 0x5A, 0x40, 0x7A, 0xDE, 0xDB, 0x1D, 0x56, 0x0C, 0x4F, - 0xC6, 0x77, 0x7D, 0x29, 0x72, 0x07, 0x5B, 0x8C + 0xC6, 0x77, 0x7D, 0x29, 0x72, 0x07, 0x5B, 0x8C, ))) signature = bytes(bytearray(( 0x2F, 0x86, 0xFA, 0x60, 0xA0, 0x81, 0x09, 0x1A, @@ -207,11 +207,10 @@ class Test34102012(TestCase): 0x82, 0x3C, 0xE2, 0x88, 0xE8, 0xC4, 0xF3, 0x62, 0x52, 0x60, 0x80, 0xDF, 0x7F, 0x70, 0xCE, 0x40, 0x6A, 0x6E, 0xEB, 0x1F, 0x56, 0x91, 0x9C, 0xB9, - 0x2A, 0x98, 0x53, 0xBD, 0xE7, 0x3E, 0x5B, 0x4A + 0x2A, 0x98, 0x53, 0xBD, 0xE7, 0x3E, 0x5B, 0x4A, ))) prv = bytes2long(prv) signature = signature[64:] + signature[:64] - c = GOST3410Curve(p, q, a, b, x, y) pubX, pubY = public_key(c, prv) self.assertSequenceEqual(long2bytes(pubX), pub_x) @@ -221,7 +220,7 @@ class Test34102012(TestCase): self.assertTrue(verify(c, (pubX, pubY), digest, signature, mode=2012)) def test_sequence(self): - c = GOST3410Curve(*CURVE_PARAMS["id-tc26-gost-3410-12-512-paramSetA"]) + c = CURVES["id-tc26-gost-3410-12-512-paramSetA"] prv = bytes2long(urandom(64)) pubX, pubY = public_key(c, prv) for _ in range(20): @@ -235,7 +234,7 @@ class Test34102012SESPAKE(TestCase): """Test vectors for multiplication from :rfc:`8133` """ def test_curve1(self): - c = GOST3410Curve(*CURVE_PARAMS["id-GostR3410-2001-CryptoPro-A-ParamSet"]) + c = CURVES["id-GostR3410-2001-CryptoPro-A-ParamSet"] q_ind = ( 0xA69D51CAF1A309FA9E9B66187759B0174C274E080356F23CFCBFE84D396AD7BB, 0x5D26F29ECC2E9AC0404DCF7986FA55FE94986362170F54B9616426A659786DAC, @@ -265,7 +264,7 @@ class Test34102012SESPAKE(TestCase): ) def test_curve2(self): - c = GOST3410Curve(*CURVE_PARAMS["id-GostR3410-2001-CryptoPro-B-ParamSet"]) + c = CURVES["id-GostR3410-2001-CryptoPro-B-ParamSet"] q_ind = ( 0x3D715A874A4B17CB3B517893A9794A2B36C89D2FFC693F01EE4CC27E7F49E399, 0x1C5A641FCF7CE7E87CDF8CEA38F3DB3096EACE2FAD158384B53953365F4FE7FE, @@ -295,7 +294,7 @@ class Test34102012SESPAKE(TestCase): ) def test_curve3(self): - c = GOST3410Curve(*CURVE_PARAMS["id-GostR3410-2001-CryptoPro-C-ParamSet"]) + c = CURVES["id-GostR3410-2001-CryptoPro-C-ParamSet"] q_ind = ( 0x1E36383E43BB6CFA2917167D71B7B5DD3D6D462B43D7C64282AE67DFBEC2559D, 0x137478A9F721C73932EA06B45CF72E37EB78A63F29A542E563C614650C8B6399, @@ -325,7 +324,7 @@ class Test34102012SESPAKE(TestCase): ) def test_curve4(self): - c = GOST3410Curve(*CURVE_PARAMS["id-tc26-gost-3410-12-512-paramSetA"]) + c = CURVES["id-tc26-gost-3410-12-512-paramSetA"] q_ind = ( 0x2A17F8833A32795327478871B5C5E88AEFB91126C64B4B8327289BEA62559425D18198F133F400874328B220C74497CD240586CB249E158532CB8090776CD61C, 0x728F0C4A73B48DA41CE928358FAD26B47A6E094E9362BAE82559F83CDDC4EC3A4676BD3707EDEAF4CD85E99695C64C241EDC622BE87DC0CF87F51F4367F723C5, @@ -355,7 +354,7 @@ class Test34102012SESPAKE(TestCase): ) def test_curve5(self): - c = GOST3410Curve(*CURVE_PARAMS["id-tc26-gost-3410-12-512-paramSetB"]) + c = CURVES["id-tc26-gost-3410-12-512-paramSetB"] q_ind = ( 0x7E1FAE8285E035BEC244BEF2D0E5EBF436633CF50E55231DEA9C9CF21D4C8C33DF85D4305DE92971F0A4B4C07E00D87BDBC720EB66E49079285AAF12E0171149, 0x2CC89998B875D4463805BA0D858A196592DB20AB161558FF2F4EF7A85725D20953967AE621AFDEAE89BB77C83A2528EF6FCE02F68BDA4679D7F2704947DBC408, @@ -385,7 +384,7 @@ class Test34102012SESPAKE(TestCase): ) def test_curve6(self): - c = GOST3410Curve(*CURVE_PARAMS["id-tc26-gost-3410-2012-256-paramSetA"]) + c = CURVES["id-tc26-gost-3410-2012-256-paramSetA"] q_ind = ( 0xB51ADF93A40AB15792164FAD3352F95B66369EB2A4EF5EFAE32829320363350E, 0x74A358CC08593612F5955D249C96AFB7E8B0BB6D8BD2BBE491046650D822BE18, @@ -415,7 +414,7 @@ class Test34102012SESPAKE(TestCase): ) def test_curve7(self): - c = GOST3410Curve(*CURVE_PARAMS["id-tc26-gost-3410-2012-512-paramSetC"]) + c = CURVES["id-tc26-gost-3410-2012-512-paramSetC"] q_ind = ( 0x489C91784E02E98F19A803ABCA319917F37689E5A18965251CE2FF4E8D8B298F5BA7470F9E0E713487F96F4A8397B3D09A270C9D367EB5E0E6561ADEEB51581D, 0x684EA885ACA64EAF1B3FEE36C0852A3BE3BD8011B0EF18E203FF87028D6EB5DB2C144A0DCC71276542BFD72CA2A43FA4F4939DA66D9A60793C704A8C94E16F18,