Commit 08076910 authored by Dr. Matthias St. Pierre's avatar Dr. Matthias St. Pierre
Browse files

test/asn1_internal_test.c: silence the new check for the ASN1 method table 



In 38eca7fe a new check for the pem_str member of the entries of the
ASN1 method table was introduced. Because the test condition was split
into two TEST_true(...) conditions, the test outputs error diagnostics
for all entries which have pem_str != NULL. This commit joins the two
test conditions into a single condition.

Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6888)
parent b5ee5177

test/asn1_internal_test.c

+2 −4
Original line number Diff line number Diff line
@@ -85,10 +85,8 @@ static int test_standard_methods(void) 
         *

         * 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)) {

        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;