projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
test/evp_extra_test.c: Add test for CMAC keygen with a NULL engine
[oweals/openssl.git]
/
test
/
asn1_internal_test.c
diff --git
a/test/asn1_internal_test.c
b/test/asn1_internal_test.c
index fa69dc7a9e329c4df7139f18b37ab7e40099c5c4..e77299a7c8e38e1c3797d0a1da16de1cc28090e3 100644
(file)
--- a/
test/asn1_internal_test.c
+++ b/
test/asn1_internal_test.c
@@
-1,7
+1,7
@@
/*
/*
- * Copyright 1999-201
7
The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1999-201
8
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
* 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
@@
-59,7
+59,7
@@
static int test_tbl_standard(void)
*
***/
*
***/
-#include "
internal/asn1_int
.h"
+#include "
crypto/asn1
.h"
#include "../crypto/asn1/standard_methods.h"
static int test_standard_methods(void)
#include "../crypto/asn1/standard_methods.h"
static int test_standard_methods(void)
@@
-85,10
+85,8
@@
static int test_standard_methods(void)
*
* Anything else is an error and may lead to a corrupt ASN1 method table
*/
*
* 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;
TEST_note("asn1 standard methods: Index %zu, pkey ID %d, Name=%s",
i, (*tmp)->pkey_id, OBJ_nid2sn((*tmp)->pkey_id));
ok = 0;