Add a test for the info callback

[openssl.git] / test / asn1_internal_test.c

diff --git a/test/asn1_internal_test.c b/test/asn1_internal_test.c
index f2caa763ef2e3297c19ff9f3909ba02fc6eadeb6..ab4dc353c4eff34f4d1d8f9668eb76f76faa3781 100644 (file)
--- a/test/asn1_internal_test.c
+++ b/test/asn1_internal_test.c
@@ -16,7 +16,7 @@
 #include <openssl/evp.h>
 #include <openssl/objects.h>
 #include "testutil.h"
-#include "e_os.h"
+#include "internal/nelem.h"
 
 /**********************************************************************
  *
@@ -26,7 +26,7 @@
 
 #include "../crypto/asn1/tbl_standard.h"
 
-static int test_tbl_standard()
+static int test_tbl_standard(void)
 {
     const ASN1_STRING_TABLE *tmp;
     int last_nid = -1;
@@ -45,9 +45,9 @@ static int test_tbl_standard()
         return 1;
     }
 
-    TEST_error("asn1 tbl_standard: out of order");
+    TEST_info("asn1 tbl_standard: out of order");
     for (tmp = tbl_standard, i = 0; i < OSSL_NELEM(tbl_standard); i++, tmp++)
-        TEST_note("asn1 tbl_standard: Index %" OSSLzu ", NID %d, Name=%s",
+        TEST_note("asn1 tbl_standard: Index %zu, NID %d, Name=%s",
                   i, tmp->nid, OBJ_nid2ln(tmp->nid));
 
     return 0;
@@ -62,7 +62,7 @@ static int test_tbl_standard()
 #include "internal/asn1_int.h"
 #include "../crypto/asn1/standard_methods.h"
 
-static int test_standard_methods()
+static int test_standard_methods(void)
 {
     const EVP_PKEY_ASN1_METHOD **tmp;
     int last_pkey_id = -1;
@@ -82,18 +82,18 @@ static int test_standard_methods()
         return 1;
     }
 
-    TEST_error("asn1 standard methods: out of order");
+    TEST_note("asn1 standard methods: out of order");
     for (tmp = standard_methods, i = 0; i < OSSL_NELEM(standard_methods);
          i++, tmp++)
-        TEST_note("asn1 standard methods: Index %" OSSLzu
-                  ", pkey ID %d, Name=%s", i, (*tmp)->pkey_id,
-                  OBJ_nid2sn((*tmp)->pkey_id));
+        TEST_note("asn1 standard methods: Index %zu, pkey ID %d, Name=%s",
+                  i, (*tmp)->pkey_id, OBJ_nid2sn((*tmp)->pkey_id));
 
     return 0;
 }
 
-void register_tests(void)
+int setup_tests(void)
 {
     ADD_TEST(test_tbl_standard);
     ADD_TEST(test_standard_methods);
+    return 1;
 }