X-Git-Url: http://wagner.pp.ru/gitweb/?a=blobdiff_plain;f=test_grasshopper.c;h=f11f04943ba27f19fb7a15e3090204e381e17c55;hb=3b31dea89630ecd3f741171ed3e1d4259adabf0e;hp=0134c67e53d8f76cef89fab160f03106998b286c;hpb=28ab2b8b0ab2d1677df3940cf4fcdf1597da4ccf;p=openssl-gost%2Fengine.git

diff --git a/test_grasshopper.c b/test_grasshopper.c
index 0134c67..f11f049 100644
--- a/test_grasshopper.c
+++ b/test_grasshopper.c
@@ -26,6 +26,8 @@
 #define cDRED	"\033[0;31m"
 #define cGREEN	"\033[1;32m"
 #define cDGREEN	"\033[0;32m"
+#define cBLUE	"\033[1;34m"
+#define cDBLUE	"\033[0;34m"
 #define cNORM	"\033[m"
 #define TEST_ASSERT(e) {if ((test = (e))) \
 		 printf(cRED "Test FAILED\n" cNORM); \
@@ -193,7 +195,8 @@ static void hexdump(const void *ptr, size_t len)
 
 static int test_block(const EVP_CIPHER *type, const char *name,
     const unsigned char *pt, const unsigned char *exp, size_t size,
-    const unsigned char *iv, size_t iv_size, int acpkm)
+    const unsigned char *iv, size_t iv_size, int acpkm,
+    int inplace)
 {
     EVP_CIPHER_CTX *ctx = EVP_CIPHER_CTX_new();
     const char *standard = acpkm? "R 23565.1.017-2018" : "GOST R 34.13-2015";
@@ -202,15 +205,19 @@ static int test_block(const EVP_CIPHER *type, const char *name,
     int ret = 0, test;
 
     OPENSSL_assert(ctx);
-    printf("Encryption test from %s [%s] \n", standard, name);
+    printf("Encryption test from %s [%s] %s\n", standard, name,
+	inplace ? "in-place" : "out-of-place");
     /* test with single big chunk */
     EVP_CIPHER_CTX_init(ctx);
     T(EVP_CipherInit_ex(ctx, type, NULL, K, iv, 1));
     T(EVP_CIPHER_CTX_set_padding(ctx, 0));
-    memset(c, 0, sizeof(c));
+    if (inplace)
+	memcpy(c, pt, size);
+    else
+	memset(c, 0, sizeof(c));
     if (acpkm)
 	T(EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_KEY_MESH, acpkm, NULL));
-    T(EVP_CipherUpdate(ctx, c, &outlen, pt, size));
+    T(EVP_CipherUpdate(ctx, c, &outlen, inplace? c : pt, size));
     T(EVP_CipherFinal_ex(ctx, c + outlen, &tmplen));
     EVP_CIPHER_CTX_cleanup(ctx);
     printf("  c[%d] = ", outlen);
@@ -220,20 +227,24 @@ static int test_block(const EVP_CIPHER *type, const char *name,
     ret |= test;
 
     /* test with small chunks of block size */
-    printf("Chunked encryption test from %s [%s] \n", standard, name);
+    printf("Chunked encryption test from %s [%s] %s\n", standard, name,
+	inplace ? "in-place" : "out-of-place");
     int blocks = size / GRASSHOPPER_BLOCK_SIZE;
     int z;
     EVP_CIPHER_CTX_init(ctx);
     T(EVP_CipherInit_ex(ctx, type, NULL, K, iv, 1));
     T(EVP_CIPHER_CTX_set_padding(ctx, 0));
-    memset(c, 0, sizeof(c));
+    if (inplace)
+	memcpy(c, pt, size);
+    else
+	memset(c, 0, sizeof(c));
     if (acpkm)
 	T(EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_KEY_MESH, acpkm, NULL));
     for (z = 0; z < blocks; z++) {
 	int offset = z * GRASSHOPPER_BLOCK_SIZE;
 	int sz = GRASSHOPPER_BLOCK_SIZE;
 
-	T(EVP_CipherUpdate(ctx, c + offset, &outlen, pt + offset, sz));
+	T(EVP_CipherUpdate(ctx, c + offset, &outlen, (inplace ? c : pt) + offset, sz));
     }
     outlen = z * GRASSHOPPER_BLOCK_SIZE;
     T(EVP_CipherFinal_ex(ctx, c + outlen, &tmplen));
@@ -245,14 +256,18 @@ static int test_block(const EVP_CIPHER *type, const char *name,
     ret |= test;
 
     /* test with single big chunk */
-    printf("Decryption test from %s [%s] \n", standard, name);
+    printf("Decryption test from %s [%s] %s\n", standard, name,
+	inplace ? "in-place" : "out-of-place");
     EVP_CIPHER_CTX_init(ctx);
     T(EVP_CipherInit_ex(ctx, type, NULL, K, iv, 0));
     T(EVP_CIPHER_CTX_set_padding(ctx, 0));
-    memset(c, 0, sizeof(c));
+    if (inplace)
+	memcpy(c, exp, size);
+    else
+	memset(c, 0, sizeof(c));
     if (acpkm)
 	T(EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_KEY_MESH, acpkm, NULL));
-    T(EVP_CipherUpdate(ctx, c, &outlen, exp, size));
+    T(EVP_CipherUpdate(ctx, c, &outlen, inplace ? c : exp, size));
     T(EVP_CipherFinal_ex(ctx, c + outlen, &tmplen));
     EVP_CIPHER_CTX_cleanup(ctx);
     EVP_CIPHER_CTX_free(ctx);
@@ -284,8 +299,8 @@ static int test_stream(const EVP_CIPHER *type, const char *name,
 	int i;
 
 	EVP_CIPHER_CTX_init(ctx);
-	EVP_CipherInit_ex(ctx, type, NULL, K, iv, 1);
-	EVP_CIPHER_CTX_set_padding(ctx, 0);
+	T(EVP_CipherInit_ex(ctx, type, NULL, K, iv, 1));
+	T(EVP_CIPHER_CTX_set_padding(ctx, 0));
 	memset(c, 0xff, sizeof(c));
 	if (acpkm)
 	    T(EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_KEY_MESH, acpkm, NULL));
@@ -294,11 +309,11 @@ static int test_stream(const EVP_CIPHER *type, const char *name,
 		sz = size - i;
 	    else
 		sz = z;
-	    EVP_CipherUpdate(ctx, c + i, &outlen, pt + i, sz);
+	    T(EVP_CipherUpdate(ctx, c + i, &outlen, pt + i, sz));
 	    OPENSSL_assert(outlen == sz);
 	}
 	outlen = i - z + sz;
-	EVP_CipherFinal_ex(ctx, c + outlen, &tmplen);
+	T(EVP_CipherFinal_ex(ctx, c + outlen, &tmplen));
 	EVP_CIPHER_CTX_cleanup(ctx);
 
 	test = outlen != size || memcmp(c, exp, size);
@@ -319,31 +334,30 @@ static int test_mac(const char *name, const char *from,
 {
     EVP_MD_CTX *ctx = EVP_MD_CTX_new();
     unsigned char md_value[EVP_MAX_MD_SIZE];
-    unsigned int md_len;
     int test;
+    unsigned int md_len;
 
     OPENSSL_assert(ctx);
     printf("%s test from %s\n", name, from);
     EVP_MD_CTX_init(ctx);
     T(EVP_DigestInit_ex(ctx, type, NULL));
-    if (EVP_MD_CTX_size(ctx) != mac_size) {
-	/* strip const out of EVP_MD_CTX_md() to
-	 * overwrite output size, as test vector is 8 bytes */
-	printf("Resize result size from %d to %zu\n", EVP_MD_CTX_size(ctx), mac_size);
-	T(EVP_MD_meth_set_result_size((EVP_MD *)EVP_MD_CTX_md(ctx), mac_size));
-    }
-    T(EVP_MD_meth_get_ctrl(EVP_MD_CTX_md(ctx))(ctx, EVP_MD_CTRL_SET_KEY, sizeof(K), (void *)K));
+    T(EVP_MD_CTX_ctrl(ctx, EVP_MD_CTRL_SET_KEY, sizeof(K), (void *)K));
     if (acpkm)
-	T(EVP_MD_meth_get_ctrl(EVP_MD_CTX_md(ctx))(ctx,
-                EVP_CTRL_KEY_MESH, acpkm, acpkm_t ? &acpkm_t : NULL));
+	T(EVP_MD_CTX_ctrl(ctx, EVP_CTRL_KEY_MESH, acpkm, acpkm_t ? &acpkm_t : NULL));
     T(EVP_DigestUpdate(ctx, pt, pt_size));
-    T(EVP_DigestFinal_ex(ctx, md_value, &md_len));
+    if (EVP_MD_flags(EVP_MD_CTX_md(ctx)) & EVP_MD_FLAG_XOF) {
+	T(EVP_DigestFinalXOF(ctx, md_value, mac_size));
+	md_len = (unsigned int)mac_size;
+    } else {
+	T(EVP_MD_CTX_size(ctx) == mac_size);
+	T(EVP_DigestFinal_ex(ctx, md_value, &md_len));
+    }
     EVP_MD_CTX_free(ctx);
     printf("  MAC[%u] = ", md_len);
-    hexdump(md_value, md_len);
+    hexdump(md_value, mac_size);
 
     TEST_ASSERT(md_len != mac_size ||
-	memcmp(mac, md_value, md_len));
+	memcmp(mac, md_value, mac_size));
 
     return test;
 }
@@ -353,19 +367,30 @@ int main(int argc, char **argv)
     int ret = 0;
     const struct testcase *t;
 
+    setenv("OPENSSL_ENGINES", ENGINE_DIR, 0);
+    OPENSSL_add_all_algorithms_conf();
+    ERR_load_crypto_strings();
+    ENGINE *eng;
+    T(eng = ENGINE_by_id("gost"));
+    T(ENGINE_init(eng));
+    T(ENGINE_set_default(eng, ENGINE_METHOD_ALL));
+
     for (t = testcases; t->name; t++) {
-	ret |= test_block(t->type(), t->name,
-	    t->plaintext, t->expected, t->size,
-	    t->iv, t->iv_size, t->acpkm);
+	int inplace;
+	const char *standard = t->acpkm? "R 23565.1.017-2018" : "GOST R 34.13-2015";
+
+	printf(cBLUE "# Tests for %s [%s]\n" cNORM, t->name, standard);
+	for (inplace = 0; inplace <= 1; inplace++)
+	    ret |= test_block(t->type(), t->name,
+		t->plaintext, t->expected, t->size,
+		t->iv, t->iv_size, t->acpkm, inplace);
 	if (t->stream)
 	    ret |= test_stream(t->type(), t->name,
 		t->plaintext, t->expected, t->size,
 		t->iv, t->iv_size, t->acpkm);
     }
 
-    /* preload cbc cipher for omac set key */
-    EVP_add_cipher(cipher_gost_grasshopper_cbc());
-
+    printf(cBLUE "# Tests for omac\n" cNORM);
     ret |= test_mac("OMAC", "GOST R 34.13-2015", grasshopper_omac(), 0, 0,
         P, sizeof(P), MAC_omac, sizeof(MAC_omac));
     ret |= test_mac("OMAC-ACPKM", "R 1323565.1.017-2018 A.4.1",
@@ -377,6 +402,9 @@ int main(int argc, char **argv)
         P_omac_acpkm2, sizeof(P_omac_acpkm2),
         MAC_omac_acpkm2, sizeof(MAC_omac_acpkm2));
 
+    ENGINE_finish(eng);
+    ENGINE_free(eng);
+
     if (ret)
 	printf(cDRED "= Some tests FAILED!\n" cNORM);
     else