Add a test for the certificate callback

[openssl.git] / test / asn1_internal_test.c

diff --git a/test/asn1_internal_test.c b/test/asn1_internal_test.c
index fa69dc7a9e329c4df7139f18b37ab7e40099c5c4..63278040b60650ac89b4866e6c7241da0c5b6005 100644 (file)
--- a/test/asn1_internal_test.c
+++ b/test/asn1_internal_test.c
@@ -1,5 +1,5 @@
 /*
- * 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
  * this file except in compliance with the License.  You can obtain a copy
@@ -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;