Minimal adaptation of tests back to how it was before

[openssl.git] / test / asn1_internal_test.c

diff --git a/test/asn1_internal_test.c b/test/asn1_internal_test.c
index 38ef6100c17ba8b39077861b097693858cba5da7..e77299a7c8e38e1c3797d0a1da16de1cc28090e3 100644 (file)
--- a/test/asn1_internal_test.c
+++ b/test/asn1_internal_test.c
@@ -1,7 +1,7 @@
 /*
- * Copyright 1999-2017 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
+ * Licensed under the Apache License 2.0 (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
  * in the file LICENSE in the source distribution or at
  * https://www.openssl.org/source/license.html
@@ -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;
@@ -59,14 +59,15 @@ static int test_tbl_standard()
  *
  ***/
 
-#include "internal/asn1_int.h"
+#include "crypto/asn1.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;
     size_t i;
+    int ok = 1;
 
     for (tmp = standard_methods, i = 0; i < OSSL_NELEM(standard_methods);
          i++, tmp++) {
@@ -75,11 +76,26 @@ 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 (TEST_int_ne(last_pkey_id, 0)) {
         TEST_info("asn1 standard methods: Table order OK");
-        return 1;
+        return ok;
     }
 
     TEST_note("asn1 standard methods: out of order");
@@ -91,8 +107,9 @@ static int test_standard_methods()
     return 0;
 }
 
-void register_tests(void)
+int setup_tests(void)
 {
     ADD_TEST(test_tbl_standard);
     ADD_TEST(test_standard_methods);
+    return 1;
 }