X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=test%2Fasn1_internal_test.c;h=63278040b60650ac89b4866e6c7241da0c5b6005;hp=6dc8a1160d519ae26537ae9511f28cd6b9d98ff9;hb=3ccccb91ae1c07a4310778b3d7ba74ff4ff787f0;hpb=edd689efbfa26a657a5d8310f43a4f11d29a460e

diff --git a/test/asn1_internal_test.c b/test/asn1_internal_test.c
index 6dc8a1160d..63278040b6 100644
--- a/test/asn1_internal_test.c
+++ b/test/asn1_internal_test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1999-2018 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -15,9 +15,8 @@
 #include <openssl/asn1.h>
 #include <openssl/evp.h>
 #include <openssl/objects.h>
-#include "test_main.h"
 #include "testutil.h"
-#include "e_os.h"
+#include "internal/nelem.h"
 
 /**********************************************************************
  *
@@ -27,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;
@@ -41,14 +40,15 @@ static int test_tbl_standard()
         last_nid = tmp->nid;
     }
 
-    if (last_nid != 0) {
-        fprintf(stderr, "asn1 tbl_standard: Table order OK\n");
+    if (TEST_int_ne(last_nid, 0)) {
+        TEST_info("asn1 tbl_standard: Table order OK");
         return 1;
     }
 
+    TEST_info("asn1 tbl_standard: out of order");
     for (tmp = tbl_standard, i = 0; i < OSSL_NELEM(tbl_standard); i++, tmp++)
-        fprintf(stderr, "asn1 tbl_standard: Index %" OSSLzu ", NID %d, Name=%s\n",
-                i, tmp->nid, OBJ_nid2ln(tmp->nid));
+        TEST_note("asn1 tbl_standard: Index %zu, NID %d, Name=%s",
+                  i, tmp->nid, OBJ_nid2ln(tmp->nid));
 
     return 0;
 }
@@ -59,24 +59,15 @@ static int test_tbl_standard()
  *
  ***/
 
-#ifdef __VMS
-# pragma names save
-# pragma names as_is,shortened
-#endif
-
 #include "internal/asn1_int.h"
-
-#ifdef __VMS
-# pragma names restore
-#endif
-
 #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;
     size_t i;
+    int ok = 1;
 
     for (tmp = standard_methods, i = 0; i < OSSL_NELEM(standard_methods);
          i++, tmp++) {
@@ -85,25 +76,40 @@ static int test_standard_methods()
             break;
         }
         last_pkey_id = (*tmp)->pkey_id;
+
+        /*
+         * One of the following must be true:
+         *
+         * pem_str == NULL AND ASN1_PKEY_ALIAS is set
+         * pem_str != NULL AND ASN1_PKEY_ALIAS is clear
+         *
+         * Anything else is an error and may lead to a corrupt ASN1 method table
+         */
+        if (!TEST_true(((*tmp)->pem_str == NULL && ((*tmp)->pkey_flags & ASN1_PKEY_ALIAS) != 0)
+                       || ((*tmp)->pem_str != NULL && ((*tmp)->pkey_flags & ASN1_PKEY_ALIAS) == 0))) {
+            TEST_note("asn1 standard methods: Index %zu, pkey ID %d, Name=%s",
+                      i, (*tmp)->pkey_id, OBJ_nid2sn((*tmp)->pkey_id));
+            ok = 0;
+        }
     }
 
-    if (last_pkey_id != 0) {
-        fprintf(stderr, "asn1 standard methods: Table order OK\n");
-        return 1;
+    if (TEST_int_ne(last_pkey_id, 0)) {
+        TEST_info("asn1 standard methods: Table order OK");
+        return ok;
     }
 
-    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++)
-        fprintf(stderr, "asn1 standard methods: Index %" OSSLzu
-                ", pkey ID %d, Name=%s\n", 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;
 }