From: Vitaly Chikunov Date: Mon, 23 Jul 2018 17:27:14 +0000 (+0300) Subject: test_grasshopper: Remove long IV test for CTR mode X-Git-Url: http://www.wagner.pp.ru/gitweb/?a=commitdiff_plain;h=a88269f1a61b9ca0cfa6e652b3f7a956228ddb97;p=openssl-gost%2Fengine.git test_grasshopper: Remove long IV test for CTR mode (cherry picked from commit a53589ac2f9dffe4ef3c7f92d11d1d1a04cf0c49) --- diff --git a/test_grasshopper.c b/test_grasshopper.c index 0033f24..c71649d 100644 --- a/test_grasshopper.c +++ b/test_grasshopper.c @@ -33,7 +33,6 @@ enum e_mode { E_ECB = 0, E_CTR, - E_CTR_IV2, E_OFB, E_CBC, E_CFB, @@ -67,12 +66,6 @@ static const unsigned char E[6][sizeof(P)] = { 0xa5,0xea,0xe8,0x8b,0xe6,0x35,0x6e,0xd3,0xd5,0xe8,0x77,0xf1,0x35,0x64,0xa3,0xa5, 0xcb,0x91,0xfa,0xb1,0xf2,0x0c,0xba,0xb6,0xd1,0xc6,0xd1,0x58,0x20,0xbd,0xba,0x73, }, - { /* CTR test vectors again for IV2 test */ - 0xf1,0x95,0xd8,0xbe,0xc1,0x0e,0xd1,0xdb,0xd5,0x7b,0x5f,0xa2,0x40,0xbd,0xa1,0xb8, - 0x85,0xee,0xe7,0x33,0xf6,0xa1,0x3e,0x5d,0xf3,0x3c,0xe4,0xb3,0x3c,0x45,0xde,0xe4, - 0xa5,0xea,0xe8,0x8b,0xe6,0x35,0x6e,0xd3,0xd5,0xe8,0x77,0xf1,0x35,0x64,0xa3,0xa5, - 0xcb,0x91,0xfa,0xb1,0xf2,0x0c,0xba,0xb6,0xd1,0xc6,0xd1,0x58,0x20,0xbd,0xba,0x73, - }, { /* OFB test vector generated from canonical implementation */ 0x81,0x80,0x0a,0x59,0xb1,0x84,0x2b,0x24,0xff,0x1f,0x79,0x5e,0x89,0x7a,0xbd,0x95, 0x77,0x91,0x46,0xdb,0x2d,0x93,0xa9,0x4e,0xd9,0x3c,0xf6,0x8b,0x32,0x39,0x7f,0x19, @@ -93,14 +86,11 @@ static const unsigned char E[6][sizeof(P)] = { }, }; static const unsigned char iv_ctr[] = { 0x12,0x34,0x56,0x78,0x90,0xab,0xce,0xf0 }; -/* right [8] part of IV should be ignored by ctr */ -static const unsigned char iv_ctr_iv2[] = { 0x12,0x34,0x56,0x78,0x90,0xab,0xce,0xf0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff }; /* truncated to 128-bits IV */ static const unsigned char iv_128bit[] = { 0x12,0x34,0x56,0x78,0x90,0xab,0xce,0xf0,0xa1,0xb2,0xc3,0xd4,0xe5,0xf0,0x01,0x12 }; static const unsigned char *iv[6] = { NULL, /* ecb */ iv_ctr, - iv_ctr_iv2, iv_128bit, /* ofb */ iv_128bit, /* cbc*/ iv_128bit, /* cfb */ @@ -269,7 +259,6 @@ int main(int argc, char **argv) ret |= test_block(cipher_gost_grasshopper_ecb(), "ecb", E_ECB); ret |= test_block(cipher_gost_grasshopper_ctr(), "ctr", E_CTR); - ret |= test_block(cipher_gost_grasshopper_ctr(), "ctr iv2", E_CTR_IV2); ret |= test_stream(cipher_gost_grasshopper_ctr(), "ctr", E_CTR); /* * Other modes (ofb, cbc, cfb) is impossible to test to match GOST R