X-Git-Url: http://wagner.pp.ru/gitweb/?a=blobdiff_plain;f=test_ciphers.c;h=a88c28154497d7c321e6cde547df705aee09573f;hb=c5ec3860a0c95a74ee98210e0ac174924866dab1;hp=15c7511bfb1a101d6c2b6e90b40b829c329167b1;hpb=cded1d0aa04a386faa3778d0b029c78abd996e93;p=openssl-gost%2Fengine.git

diff --git a/test_ciphers.c b/test_ciphers.c
index 15c7511..a88c281 100644
--- a/test_ciphers.c
+++ b/test_ciphers.c
@@ -28,9 +28,9 @@
 #define cDBLUE	"\033[0;34m"
 #define cNORM	"\033[m"
 #define TEST_ASSERT(e) {if ((test = (e))) \
-		 printf(cRED "Test FAILED\n" cNORM); \
+		 printf(cRED "Test FAILED" cNORM "\n"); \
 	     else \
-		 printf(cGREEN "Test passed\n" cNORM);}
+		 printf(cGREEN "Test passed" cNORM "\n");}
 
 /* Pragma to allow commenting out some tests. */
 #pragma GCC diagnostic ignored "-Wunused-const-variable"
@@ -276,7 +276,6 @@ static struct testcase {
 	.iv = iv_ctr,
 	.iv_size = sizeof(iv_ctr) / 2,
     },
-#if 0
     {
 	.nid = NID_magma_cbc,
 	.block = 8,
@@ -287,7 +286,6 @@ static struct testcase {
 	.iv = iv_cbc,
 	.iv_size = sizeof(iv_cbc),
     },
-#endif
     { 0 }
 };
 
@@ -465,13 +463,7 @@ int main(int argc, char **argv)
     /* Trigger SIGBUS for unaligned access. */
     sysmips(MIPS_FIXADE, 0);
 #endif
-    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->nid; t++) {
 	int inplace;
@@ -480,7 +472,7 @@ int main(int argc, char **argv)
 	const EVP_CIPHER *type = EVP_get_cipherbynid(t->nid);
 	const char *name = EVP_CIPHER_name(type);
 
-	printf(cBLUE "# Tests for %s [%s]\n" cNORM, name, standard);
+	printf(cBLUE "# Tests for %s [%s]" cNORM "\n", name, standard);
 	for (inplace = 0; inplace <= 1; inplace++)
 	    ret |= test_block(type, name, t->block,
 		t->plaintext, t->key, t->expected, t->size,
@@ -491,7 +483,9 @@ int main(int argc, char **argv)
 		t->iv, t->iv_size, t->acpkm);
     }
 
+    ENGINE *eng;
     ENGINE_CIPHERS_PTR fn_c;
+    T(eng = ENGINE_by_id("gost"));
     T(fn_c = ENGINE_get_ciphers(eng));
     const int *nids;
     int n, k;
@@ -501,15 +495,13 @@ int main(int argc, char **argv)
 	    if (t->nid == nids[k])
 		break;
 	if (!t->nid)
-	    printf(cMAGENT "Cipher %s is untested!\n" cNORM, OBJ_nid2sn(nids[k]));
+	    printf(cMAGENT "Cipher %s is untested!" cNORM "\n", OBJ_nid2sn(nids[k]));
     }
-
-    ENGINE_finish(eng);
     ENGINE_free(eng);
 
     if (ret)
-	printf(cDRED "= Some tests FAILED!\n" cNORM);
+	printf(cDRED "= Some tests FAILED!" cNORM "\n");
     else
-	printf(cDGREEN "= All tests passed!\n" cNORM);
+	printf(cDGREEN "= All tests passed!" cNORM "\n");
     return ret;
 }