summaryrefslogtreecommitdiff
path: root/deps/openssl/openssl/test/x509aux.c
diff options
context:
space:
mode:
Diffstat (limited to 'deps/openssl/openssl/test/x509aux.c')
-rw-r--r--deps/openssl/openssl/test/x509aux.c157
1 files changed, 46 insertions, 111 deletions
diff --git a/deps/openssl/openssl/test/x509aux.c b/deps/openssl/openssl/test/x509aux.c
index 2c20d6d743..c8bef0094d 100644
--- a/deps/openssl/openssl/test/x509aux.c
+++ b/deps/openssl/openssl/test/x509aux.c
@@ -1,5 +1,5 @@
/*
- * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the OpenSSL licenses, (the "License");
* you may not use this file except in compliance with the License.
@@ -16,37 +16,12 @@
#include <openssl/pem.h>
#include <openssl/conf.h>
#include <openssl/err.h>
+#include "internal/nelem.h"
+#include "testutil.h"
-#include "../e_os.h"
-
-static const char *progname;
-
-static void test_usage(void)
-{
- fprintf(stderr, "usage: %s certfile\n", progname);
-}
-
-static void print_errors(void)
+static int test_certs(int num)
{
- unsigned long err;
- char buffer[1024];
- const char *file;
- const char *data;
- int line;
- int flags;
-
- while ((err = ERR_get_error_line_data(&file, &line, &data, &flags)) != 0) {
- ERR_error_string_n(err, buffer, sizeof(buffer));
- if (flags & ERR_TXT_STRING)
- fprintf(stderr, "Error: %s:%s:%d:%s\n", buffer, file, line, data);
- else
- fprintf(stderr, "Error: %s:%s:%d\n", buffer, file, line);
- }
-}
-
-static int test_certs(BIO *fp)
-{
- int count;
+ int c;
char *name = 0;
char *header = 0;
unsigned char *data = 0;
@@ -54,30 +29,33 @@ static int test_certs(BIO *fp)
typedef X509 *(*d2i_X509_t)(X509 **, const unsigned char **, long);
typedef int (*i2d_X509_t)(X509 *, unsigned char **);
int err = 0;
+ BIO *fp = BIO_new_file(test_get_argument(num), "r");
+
+ if (!TEST_ptr(fp))
+ return 0;
+
+ for (c = 0; !err && PEM_read_bio(fp, &name, &header, &data, &len); ++c) {
+ const int trusted = (strcmp(name, PEM_STRING_X509_TRUSTED) == 0);
- for (count = 0;
- !err && PEM_read_bio(fp, &name, &header, &data, &len);
- ++count) {
- int trusted = strcmp(name, PEM_STRING_X509_TRUSTED) == 0;
d2i_X509_t d2i = trusted ? d2i_X509_AUX : d2i_X509;
i2d_X509_t i2d = trusted ? i2d_X509_AUX : i2d_X509;
X509 *cert = NULL;
- const unsigned char *p = data;
+ const unsigned char *p = data;
unsigned char *buf = NULL;
unsigned char *bufp;
long enclen;
- if (!trusted
+ if (!trusted
&& strcmp(name, PEM_STRING_X509) != 0
- && strcmp(name, PEM_STRING_X509_OLD) != 0) {
- fprintf(stderr, "unexpected PEM object: %s\n", name);
+ && strcmp(name, PEM_STRING_X509_OLD) != 0) {
+ TEST_error("unexpected PEM object: %s", name);
err = 1;
- goto next;
+ goto next;
}
cert = d2i(NULL, &p, len);
if (cert == NULL || (p - data) != len) {
- fprintf(stderr, "error parsing input %s\n", name);
+ TEST_error("error parsing input %s", name);
err = 1;
goto next;
}
@@ -85,33 +63,31 @@ static int test_certs(BIO *fp)
/* Test traditional 2-pass encoding into caller allocated buffer */
enclen = i2d(cert, NULL);
if (len != enclen) {
- fprintf(stderr, "encoded length %ld of %s != input length %ld\n",
- enclen, name, len);
+ TEST_error("encoded length %ld of %s != input length %ld",
+ enclen, name, len);
err = 1;
goto next;
}
if ((buf = bufp = OPENSSL_malloc(len)) == NULL) {
- perror("malloc");
+ TEST_perror("malloc");
err = 1;
goto next;
}
enclen = i2d(cert, &bufp);
if (len != enclen) {
- fprintf(stderr, "encoded length %ld of %s != input length %ld\n",
- enclen, name, len);
+ TEST_error("encoded length %ld of %s != input length %ld",
+ enclen, name, len);
err = 1;
goto next;
}
enclen = (long) (bufp - buf);
if (enclen != len) {
- fprintf(stderr, "unexpected buffer position after encoding %s\n",
- name);
+ TEST_error("unexpected buffer position after encoding %s", name);
err = 1;
goto next;
}
if (memcmp(buf, data, len) != 0) {
- fprintf(stderr, "encoded content of %s does not match input\n",
- name);
+ TEST_error("encoded content of %s does not match input", name);
err = 1;
goto next;
}
@@ -121,14 +97,13 @@ static int test_certs(BIO *fp)
/* Test 1-pass encoding into library allocated buffer */
enclen = i2d(cert, &buf);
if (len != enclen) {
- fprintf(stderr, "encoded length %ld of %s != input length %ld\n",
- enclen, name, len);
+ TEST_error("encoded length %ld of %s != input length %ld",
+ enclen, name, len);
err = 1;
goto next;
}
if (memcmp(buf, data, len) != 0) {
- fprintf(stderr, "encoded content of %s does not match input\n",
- name);
+ TEST_error("encoded content of %s does not match input", name);
err = 1;
goto next;
}
@@ -141,91 +116,51 @@ static int test_certs(BIO *fp)
/* Test 1-pass encoding into library allocated buffer */
enclen = i2d(cert, &buf);
if (enclen > len) {
- fprintf(stderr, "encoded length %ld of %s > input length %ld\n",
- enclen, name, len);
+ TEST_error("encoded length %ld of %s > input length %ld",
+ enclen, name, len);
err = 1;
goto next;
}
if (memcmp(buf, data, enclen) != 0) {
- fprintf(stderr, "encoded cert content does not match input\n");
+ TEST_error("encoded cert content does not match input");
err = 1;
goto next;
}
}
- /*
- * If any of these were null, PEM_read() would have failed.
- */
+ /*
+ * If any of these were null, PEM_read() would have failed.
+ */
next:
X509_free(cert);
OPENSSL_free(buf);
- OPENSSL_free(name);
- OPENSSL_free(header);
- OPENSSL_free(data);
+ OPENSSL_free(name);
+ OPENSSL_free(header);
+ OPENSSL_free(data);
}
+ BIO_free(fp);
if (ERR_GET_REASON(ERR_peek_last_error()) == PEM_R_NO_START_LINE) {
/* Reached end of PEM file */
- if (count > 0) {
+ if (c > 0) {
ERR_clear_error();
return 1;
}
}
/* Some other PEM read error */
- print_errors();
return 0;
}
-int main(int argc, char *argv[])
+int setup_tests(void)
{
- BIO *bio_err;
- const char *p;
- int ret = 1;
-
- progname = argv[0];
- if (argc < 2) {
- test_usage();
- EXIT(ret);
- }
-
- bio_err = BIO_new_fp(stderr, BIO_NOCLOSE | BIO_FP_TEXT);
-
- p = getenv("OPENSSL_DEBUG_MEMORY");
- if (p != NULL && strcmp(p, "on") == 0)
- CRYPTO_set_mem_debug(1);
- CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON);
-
- argc--;
- argv++;
-
- while (argc >= 1) {
- BIO *f = BIO_new_file(*argv, "r");
- int ok;
-
- if (f == NULL) {
- fprintf(stderr, "%s: Error opening cert file: '%s': %s\n",
- progname, *argv, strerror(errno));
- EXIT(ret);
- }
- ret = !(ok = test_certs(f));
- BIO_free(f);
-
- if (!ok) {
- printf("%s ERROR\n", *argv);
- ret = 1;
- break;
- }
- printf("%s OK\n", *argv);
+ size_t n = test_get_argument_count();
- argc--;
- argv++;
+ if (n == 0) {
+ TEST_error("usage: %s certfile...", test_get_program_name());
+ return 0;
}
-#ifndef OPENSSL_NO_CRYPTO_MDEBUG
- if (CRYPTO_mem_leaks(bio_err) <= 0)
- ret = 1;
-#endif
- BIO_free(bio_err);
- EXIT(ret);
+ ADD_ALL_TESTS(test_certs, (int)n);
+ return 1;
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-13 13:57:38 +0000