projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
test/run_tests.pl: Improve newline output for VFO and VFP mode
[oweals/openssl.git]
/
test
/
x509aux.c
diff --git
a/test/x509aux.c
b/test/x509aux.c
index c8bef0094db6416f9db0cadcf660c155bfbad559..bd8a781bdb022b6c7b5532e17c27cf8e8704b768 100644
(file)
--- a/
test/x509aux.c
+++ b/
test/x509aux.c
@@
-1,7
+1,7
@@
/*
/*
- * Copyright 2016-20
18
The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2016-20
20
The OpenSSL Project Authors. All Rights Reserved.
*
*
- * Licensed under the
OpenSSL licenses,
(the "License");
+ * Licensed under the
Apache License 2.0
(the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
* https://www.openssl.org/source/license.html
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
* https://www.openssl.org/source/license.html
@@
-27,9
+27,10
@@
static int test_certs(int num)
unsigned char *data = 0;
long len;
typedef X509 *(*d2i_X509_t)(X509 **, const unsigned char **, long);
unsigned char *data = 0;
long len;
typedef X509 *(*d2i_X509_t)(X509 **, const unsigned char **, long);
- typedef int (*i2d_X509_t)(X509 *, unsigned char **);
+ typedef int (*i2d_X509_t)(
const
X509 *, unsigned char **);
int err = 0;
BIO *fp = BIO_new_file(test_get_argument(num), "r");
int err = 0;
BIO *fp = BIO_new_file(test_get_argument(num), "r");
+ X509 *reuse = NULL;
if (!TEST_ptr(fp))
return 0;
if (!TEST_ptr(fp))
return 0;
@@
-91,6
+92,13
@@
static int test_certs(int num)
err = 1;
goto next;
}
err = 1;
goto next;
}
+ p = buf;
+ reuse = d2i(&reuse, &p, enclen);
+ if (reuse == NULL || X509_cmp (reuse, cert)) {
+ TEST_error("X509_cmp does not work with %s", name);
+ err = 1;
+ goto next;
+ }
OPENSSL_free(buf);
buf = NULL;
OPENSSL_free(buf);
buf = NULL;
@@
-139,6
+147,7
@@
static int test_certs(int num)
OPENSSL_free(data);
}
BIO_free(fp);
OPENSSL_free(data);
}
BIO_free(fp);
+ X509_free(reuse);
if (ERR_GET_REASON(ERR_peek_last_error()) == PEM_R_NO_START_LINE) {
/* Reached end of PEM file */
if (ERR_GET_REASON(ERR_peek_last_error()) == PEM_R_NO_START_LINE) {
/* Reached end of PEM file */
@@
-152,15
+161,21
@@
static int test_certs(int num)
return 0;
}
return 0;
}
+OPT_TEST_DECLARE_USAGE("certfile...\n")
+
int setup_tests(void)
{
int setup_tests(void)
{
- size_t n
= test_get_argument_count()
;
+ size_t n;
- if (
n == 0
) {
- TEST_error("
usage: %s certfile...", test_get_program_name()
);
+ if (
!test_skip_common_options()
) {
+ TEST_error("
Error parsing test options\n"
);
return 0;
}
return 0;
}
+ n = test_get_argument_count();
+ if (n == 0)
+ return 0;
+
ADD_ALL_TESTS(test_certs, (int)n);
return 1;
}
ADD_ALL_TESTS(test_certs, (int)n);
return 1;
}