X-Git-Url: http://wagner.pp.ru/gitweb/?a=blobdiff_plain;f=test_params.c;h=89bae3d43f1a966ee9aacc2781ad243b94f466aa;hb=4952acb810d5bca35ff514099a5c43bc13a06405;hp=8ce946d1caeef7753cd12d0a21f81f86d0c00358;hpb=ccacae62bbe1f1dd695bc8f94ea8c2e603d86ce7;p=openssl-gost%2Fengine.git

diff --git a/test_params.c b/test_params.c
index 8ce946d..89bae3d 100644
--- a/test_params.c
+++ b/test_params.c
@@ -39,9 +39,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");}
 
 struct test_param {
     unsigned int param;		/* NID of EC parameters */
@@ -873,9 +873,9 @@ static void hexdump(const void *ptr, size_t len)
 static void print_test_result(int err)
 {
     if (err == 1)
-	printf(cGREEN "correct\n" cNORM);
+	printf(cGREEN "correct" cNORM "\n");
     else if (err == 0)
-	printf(cRED "incorrect\n" cNORM);
+	printf(cRED "incorrect" cNORM "\n");
     else
 	ERR_print_errors_fp(stderr);
 }
@@ -1050,7 +1050,7 @@ static int test_param(struct test_param *t)
     int hash_nid = 0;
     const char *sn = OBJ_nid2sn(t->param);
 
-    printf(cBLUE "Test %s (cp):\n" cNORM, sn);
+    printf(cBLUE "Test %s (cp):" cNORM "\n", sn);
 
     switch (t->len) {
 	case 256 / 8:
@@ -1160,13 +1160,7 @@ int main(int argc, char **argv)
 {
     int ret = 0;
 
-    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));
 
     struct test_param **tpp;
     for (tpp = test_params; *tpp; tpp++)
@@ -1176,12 +1170,9 @@ int main(int argc, char **argv)
     for (tc = test_certs; tc->cert; tc++)
 	ret |= test_cert(tc);
 
-    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;
 }