better debug output

tests/der_test.c

@@ -283,7 +283,7 @@ static void _der_tests_print_flexi(ltc_asn1_list* l, unsigned int level)
           for (n = 0; n < l->size; ++n) {
               r = snprintf(s, sz, "%02X", ((unsigned char*)l->data)[n]);
               if (r < 0 || r >= sz) {
-                  printf("Octet string boom");
+                  fprintf(stderr, "%s boom\n", name);
                   exit(EXIT_FAILURE);
               }
               s += r;
@@ -307,7 +307,7 @@ static void _der_tests_print_flexi(ltc_asn1_list* l, unsigned int level)
       for (i = 0; i < l->size; ++i) {
         r = snprintf(s, sz, "%lu.", ((unsigned long*)l->data)[i]);
         if (r < 0 || r >= sz) {
-            printf("OID boom");
+            fprintf(stderr, "%s boom\n", name);
             exit(EXIT_FAILURE);
         }
         s += r;
@@ -410,16 +410,16 @@ static void _der_tests_print_flexi(ltc_asn1_list* l, unsigned int level)
   }
 
   for (n = 0; n < level; ++n) {
-    printf("    ");
+     fprintf(stderr, "    ");
   }
   if (name) {
       if (text)
-        printf("%s %s\n", name, text);
+         fprintf(stderr, "%s %s\n", name, text);
       else
-        printf("%s <missing decoding>\n", name);
+         fprintf(stderr, "%s <missing decoding>\n", name);
   }
   else
-    printf("WTF type=%i\n", l->type);
+     fprintf(stderr, "WTF type=%i\n", l->type);
 
   if (ostring) {
       _der_tests_print_flexi(ostring, level + 1);

tests/dsa_test.c

@@ -143,14 +143,14 @@ static int _dsa_compat_test(void)
   x = sizeof(tmp);
   DO(dsa_export(tmp, &x, PK_PRIVATE | PK_STD, &key));
   if (compare_testvector(tmp, x, openssl_priv_dsa, sizeof(openssl_priv_dsa),
-                         "DSA private export failed from dsa_import(priv_key)\n", 0)) {
+                         "DSA private export failed from dsa_import(priv_key)\n", __LINE__)) {
      return CRYPT_FAIL_TESTVECTOR;
   }
 
   x = sizeof(tmp);
   DO(dsa_export(tmp, &x, PK_PUBLIC | PK_STD, &key));
   if (compare_testvector(tmp, x, openssl_pub_dsa, sizeof(openssl_pub_dsa),
-                         "DSA public export failed from dsa_import(priv_key)\n", 0)) {
+                         "DSA public export failed from dsa_import(priv_key)\n", __LINE__)) {
      return CRYPT_FAIL_TESTVECTOR;
   }
   dsa_free(&key);
@@ -160,7 +160,7 @@ static int _dsa_compat_test(void)
   x = sizeof(tmp);
   DO(dsa_export(tmp, &x, PK_PUBLIC | PK_STD, &key));
   if (compare_testvector(tmp, x, openssl_pub_dsa, sizeof(openssl_pub_dsa),
-                         "DSA public export failed from dsa_import(pub_key)\n", 0)) {
+                         "DSA public export failed from dsa_import(pub_key)\n", __LINE__)) {
      return CRYPT_FAIL_TESTVECTOR;
   }
   dsa_free(&key);
@@ -185,7 +185,7 @@ static int _dsa_compat_test(void)
   len = sizeof(buf);
   DO(dsa_export(buf, &len, PK_PRIVATE | PK_STD, &key));
   if (compare_testvector(buf, len, openssl_priv_dsa, sizeof(openssl_priv_dsa),
-                         "DSA private export failed from dsa_set_pqg() & dsa_set_key()\n", 0)) {
+                         "DSA private export failed from dsa_set_pqg() & dsa_set_key()\n", __LINE__)) {
      return CRYPT_FAIL_TESTVECTOR;
   }
   dsa_free(&key);
@@ -201,7 +201,7 @@ static int _dsa_compat_test(void)
   len = sizeof(buf);
   DO(dsa_export(buf, &len, PK_PUBLIC | PK_STD, &key));
   if (compare_testvector(buf, len, openssl_pub_dsa, sizeof(openssl_pub_dsa),
-                         "DSA public export failed from dsa_set_pqg() & dsa_set_key()\n", 0)) {
+                         "DSA public export failed from dsa_set_pqg() & dsa_set_key()\n", __LINE__)) {
      return CRYPT_FAIL_TESTVECTOR;
   }
   dsa_free(&key);
@@ -225,7 +225,7 @@ static int _dsa_compat_test(void)
   len = sizeof(buf);
   DO(dsa_export(buf, &len, PK_PUBLIC | PK_STD, &key));
   if (compare_testvector(buf, len, openssl_pub_dsa, sizeof(openssl_pub_dsa),
-                         "DSA public export failed from dsa_set_pqg_dsaparam()\n", 0)) {
+                         "DSA public export failed from dsa_set_pqg_dsaparam()\n", __LINE__)) {
      return CRYPT_FAIL_TESTVECTOR;
   }
   dsa_free(&key);
@@ -238,7 +238,7 @@ static int _dsa_compat_test(void)
   len = sizeof(buf);
   DO(dsa_export(buf, &len, PK_PRIVATE | PK_STD, &key));
   if (compare_testvector(buf, len, openssl_priv_dsa, sizeof(openssl_priv_dsa),
-                         "DSA private export failed from dsa_set_pqg_dsaparam()\n", 0)) {
+                         "DSA private export failed from dsa_set_pqg_dsaparam()\n", __LINE__)) {
      return CRYPT_FAIL_TESTVECTOR;
   }
   dsa_free(&key);