test_grasshopper: Stream modes testing

Make sure stream modes can encrypt any block size.

diff --git a/test_grasshopper.c b/test_grasshopper.c
index e5a09887b6eb848ef4caaf08ff72a338ed7014e0..3385be5c733d3eb58c5201280f8fad67ce33c713 100644 (file)
--- a/test_grasshopper.c
+++ b/test_grasshopper.c
@@ -49,6 +49,23 @@ static const unsigned char P[] = {
     0x11,0x22,0x33,0x44,0x55,0x66,0x77,0x88,0x99,0xaa,0xbb,0xcc,0xee,0xff,0x0a,0x00,
     0x22,0x33,0x44,0x55,0x66,0x77,0x88,0x99,0xaa,0xbb,0xcc,0xee,0xff,0x0a,0x00,0x11,
 };
+static const unsigned char E[4][sizeof(P)] = {
+    { /* ECB test vectors from GOST R 34.13-2015  A.1.1 */
+       /* first 16 bytes is vector (b) from GOST R 34.12-2015 A.1 */
+       0x7f,0x67,0x9d,0x90,0xbe,0xbc,0x24,0x30,0x5a,0x46,0x8d,0x42,0xb9,0xd4,0xed,0xcd,
+       0xb4,0x29,0x91,0x2c,0x6e,0x00,0x32,0xf9,0x28,0x54,0x52,0xd7,0x67,0x18,0xd0,0x8b,
+       0xf0,0xca,0x33,0x54,0x9d,0x24,0x7c,0xee,0xf3,0xf5,0xa5,0x31,0x3b,0xd4,0xb1,0x57,
+       0xd0,0xb0,0x9c,0xcd,0xe8,0x30,0xb9,0xeb,0x3a,0x02,0xc4,0xc5,0xaa,0x8a,0xda,0x98,
+    },
+    { /* CTR test vectors from GOST R 34.13-2015  A.1.2 */
+       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,
+    },
+};
+static const unsigned char iv_ctr[] = { 0x12,0x34,0x56,0x78,0x90,0xab,0xce,0xf0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 };
+static const unsigned char *iv[4] = { NULL, iv_ctr, };
 
 static void hexdump(const void *ptr, size_t len)
 {
@@ -64,26 +81,9 @@ static void hexdump(const void *ptr, size_t len)
 
 /* Test vectors from GOST R 34.13-2015 A.1 which* includes vectors
  * from GOST R 34.12-2015 A.1 as first block of ecb mode. */
-static int test_modes(const EVP_CIPHER *type, const char *mode, enum e_mode t)
+static int test_block(const EVP_CIPHER *type, const char *mode, enum e_mode t)
 {
     EVP_CIPHER_CTX ctx;
-    unsigned char e[4][sizeof(P)] = {
-       { /* ECB test vectors from GOST R 34.13-2015  A.1.1 */
-           /* first 16 bytes is vector (b) from GOST R 34.12-2015 A.1 */
-           0x7f,0x67,0x9d,0x90,0xbe,0xbc,0x24,0x30,0x5a,0x46,0x8d,0x42,0xb9,0xd4,0xed,0xcd,
-           0xb4,0x29,0x91,0x2c,0x6e,0x00,0x32,0xf9,0x28,0x54,0x52,0xd7,0x67,0x18,0xd0,0x8b,
-           0xf0,0xca,0x33,0x54,0x9d,0x24,0x7c,0xee,0xf3,0xf5,0xa5,0x31,0x3b,0xd4,0xb1,0x57,
-           0xd0,0xb0,0x9c,0xcd,0xe8,0x30,0xb9,0xeb,0x3a,0x02,0xc4,0xc5,0xaa,0x8a,0xda,0x98,
-       },
-       { /* CTR test vectors from GOST R 34.13-2015  A.1.2 */
-           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,
-       },
-    };
-    unsigned char iv_ctr[] = { 0x12,0x34,0x56,0x78,0x90,0xab,0xce,0xf0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 };
-    unsigned char *iv[4] = { NULL, iv_ctr, };
     unsigned char c[sizeof(P)];
     int outlen, tmplen;
     int ret = 0, test;
@@ -104,40 +104,15 @@ static int test_modes(const EVP_CIPHER *type, const char *mode, enum e_mode t)
     hexdump(c, outlen);
 
     TEST_ASSERT(outlen != sizeof(P) ||
-       memcmp(c, e[t], sizeof(P)));
+       memcmp(c, E[t], sizeof(P)));
     ret |= test;
 
-    if (t == E_CTR) {
-       int i;
-
-       printf("Stream encryption test from GOST R 34.13-2015 [%s] \n", mode);
-       EVP_CIPHER_CTX_init(&ctx);
-       EVP_CipherInit_ex(&ctx, type, NULL, K, iv[t], 1);
-       EVP_CIPHER_CTX_set_padding(&ctx, 0);
-       memset(c, 0, sizeof(c));
-       for (i = 0; i < sizeof(P); i++) {
-           EVP_CipherUpdate(&ctx, c + i, &outlen, P + i, 1);
-           OPENSSL_assert(outlen == 1);
-       }
-       outlen = i;
-       EVP_CipherFinal_ex(&ctx, c + outlen, &tmplen);
-       EVP_CIPHER_CTX_cleanup(&ctx);
-       printf("  c[%d] =\n", outlen);
-       hexdump(c, outlen);
-
-       TEST_ASSERT(outlen != sizeof(P) ||
-           memcmp(c, e[t], sizeof(P)));
-#if 0
-       ret |= test;
-#endif
-    }
-
     printf("Decryption test from GOST R 34.13-2015 [%s] \n", mode);
     EVP_CIPHER_CTX_init(&ctx);
     T(EVP_CipherInit_ex(&ctx, type, NULL, K, iv[t], 0));
     T(EVP_CIPHER_CTX_set_padding(&ctx, 0));
     memset(c, 0, sizeof(c));
-    T(EVP_CipherUpdate(&ctx, c, &outlen, e[t], sizeof(P)));
+    T(EVP_CipherUpdate(&ctx, c, &outlen, E[t], sizeof(P)));
     T(EVP_CipherFinal_ex(&ctx, c + outlen, &tmplen));
     EVP_CIPHER_CTX_cleanup(&ctx);
     printf("  d[%d] =\n", outlen);
@@ -150,10 +125,51 @@ static int test_modes(const EVP_CIPHER *type, const char *mode, enum e_mode t)
     return ret;
 }
 
+static int test_stream(const EVP_CIPHER *type, const char *mode, enum e_mode t)
+{
+    int ret = 0, test;
+    int z;
+
+    /* Cycle through all lengths from 1 upto maximum size */
+    printf("Stream encryption test from GOST R 34.13-2015 [%s] \n", mode);
+    for (z = 1; z <= sizeof(P); z++) {
+       EVP_CIPHER_CTX ctx;
+       unsigned char c[sizeof(P)];
+       int outlen, tmplen;
+       int sz;
+       int i;
+
+       EVP_CIPHER_CTX_init(&ctx);
+       EVP_CipherInit_ex(&ctx, type, NULL, K, iv[t], 1);
+       EVP_CIPHER_CTX_set_padding(&ctx, 0);
+       memset(c, 0xff, sizeof(c));
+       for (i = 0; i < sizeof(P); i += z) {
+           if (i + z > sizeof(P))
+               sz = sizeof(P) - i;
+           else
+               sz = z;
+           EVP_CipherUpdate(&ctx, c + i, &outlen, P + i, sz);
+           OPENSSL_assert(outlen == sz);
+       }
+       outlen = i - z + sz;
+       EVP_CipherFinal_ex(&ctx, c + outlen, &tmplen);
+       EVP_CIPHER_CTX_cleanup(&ctx);
+
+       test = outlen != sizeof(P) ||
+           memcmp(c, E[t], sizeof(P));
+       printf("%c", test ? 'E' : '+');
+       ret |= test;
+    }
+    printf("\n");
+    TEST_ASSERT(ret);
+
+    return ret;
+}
+
 static int test_omac()
 {
     EVP_MD_CTX ctx;
-    unsigned char e[] = { 0x33,0x6f,0x4d,0x29,0x60,0x59,0xfb,0xe3 };
+    unsigned char mac[] = { 0x33,0x6f,0x4d,0x29,0x60,0x59,0xfb,0xe3 };
     unsigned char md_value[EVP_MAX_MD_SIZE];
     unsigned int md_len;
     int test;
@@ -175,8 +191,8 @@ static int test_omac()
     printf("  MAC[%u] =\n", md_len);
     hexdump(md_value, md_len);
 
-    TEST_ASSERT(md_len != sizeof(e) ||
-       memcmp(e, md_value, md_len));
+    TEST_ASSERT(md_len != sizeof(mac) ||
+       memcmp(mac, md_value, md_len));
 
     return test;
 }
@@ -185,8 +201,9 @@ int main(int argc, char **argv)
 {
     int ret = 0;
 
-    ret |= test_modes(cipher_gost_grasshopper_ecb(), "ecb", E_ECB);
-    ret |= test_modes(cipher_gost_grasshopper_ctr(), "ctr", E_CTR);
+    ret |= test_block(cipher_gost_grasshopper_ecb(), "ecb", E_ECB);
+    ret |= test_block(cipher_gost_grasshopper_ctr(), "ctr", E_CTR);
+    ret |= test_stream(cipher_gost_grasshopper_ctr(), "ctr", E_CTR);
     /*
      * Other modes (ofb, cbc, cfb) is impossible to test to match GOST R
      * 34.13-2015 test vectors due to these vectors having exceeding IV