X-Git-Url: https://git.openssl.org/?p=openssl.git;a=blobdiff_plain;f=test%2Fpkey_meth_test.c;h=76537d7c1772a033d1f9fc160c19d9302bc150b5;hp=5e6a7d4257f4c73fbbc4c1f6c1eb15bbe9456278;hb=b770a80f6d0b08659cd03f26388b45512adb84f3;hpb=ad887416f1e59c3294a7d8f83a0ca77120523b4a

diff --git a/test/pkey_meth_test.c b/test/pkey_meth_test.c
index 5e6a7d4257..76537d7c17 100644
--- a/test/pkey_meth_test.c
+++ b/test/pkey_meth_test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2016-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,13 +15,8 @@
 #include <openssl/evp.h>
 #include "testutil.h"
 
-/**********************************************************************
- *
- * Test of EVP_PKEY_ASN1 method ordering
- *
- ***/
-
-static int test_asn1_meths()
+/* Test of EVP_PKEY_ASN1_METHOD ordering */
+static int test_asn1_meths(void)
 {
     int i;
     int prev = -1;
@@ -52,8 +47,37 @@ static int test_asn1_meths()
     return good;
 }
 
-int setup_tests()
+/* Test of EVP_PKEY_METHOD ordering */
+static int test_pkey_meths(void)
+{
+    size_t i;
+    int prev = -1;
+    int good = 1;
+    int pkey_id;
+    const EVP_PKEY_METHOD *pmeth;
+
+    for (i = 0; i < EVP_PKEY_meth_get_count(); i++) {
+        pmeth = EVP_PKEY_meth_get0(i);
+        EVP_PKEY_meth_get0_info(&pkey_id, NULL, pmeth);
+        if (pkey_id < prev)
+            good = 0;
+        prev = pkey_id;
+
+    }
+    if (!good) {
+        TEST_error("EVP_PKEY_METHOD table out of order");
+        for (i = 0; i < EVP_PKEY_meth_get_count(); i++) {
+            pmeth = EVP_PKEY_meth_get0(i);
+            EVP_PKEY_meth_get0_info(&pkey_id, NULL, pmeth);
+            TEST_note("%d : %s", pkey_id, OBJ_nid2ln(pkey_id));
+        }
+    }
+    return good;
+}
+
+int setup_tests(void)
 {
     ADD_TEST(test_asn1_meths);
+    ADD_TEST(test_pkey_meths);
     return 1;
 }