From 38eca7fed09a57c1b7a05d651af2c667b3e87719 Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Tue, 7 Aug 2018 04:55:47 +0200 Subject: Make EVP_PKEY_asn1_new() stricter with its input Reviewed-by: Matthias St. Pierre Reviewed-by: Tim Hudson (Merged from https://github.com/openssl/openssl/pull/6880) --- test/asn1_internal_test.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) (limited to 'test/asn1_internal_test.c') diff --git a/test/asn1_internal_test.c b/test/asn1_internal_test.c index ab4dc353c4..fa69dc7a9e 100644 --- a/test/asn1_internal_test.c +++ b/test/asn1_internal_test.c @@ -67,6 +67,7 @@ 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,28 @@ static int test_standard_methods(void) 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) + && !TEST_true((*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"); -- cgit v1.2.3