projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
crypto/cms: add CAdES-BES signed attributes validation
[oweals/openssl.git]
/
test
/
x509_internal_test.c
diff --git
a/test/x509_internal_test.c
b/test/x509_internal_test.c
index df88f890a8296afeccd0151384a87b946eee2ca1..a17dfd9398098698ed602b5a3dec121f698c9457 100644
(file)
--- a/
test/x509_internal_test.c
+++ b/
test/x509_internal_test.c
@@
-1,7
+1,7
@@
/*
/*
- * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2016
-2018
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
@@
-15,8
+15,7
@@
#include <openssl/x509.h>
#include <openssl/x509v3.h>
#include "testutil.h"
#include <openssl/x509.h>
#include <openssl/x509v3.h>
#include "testutil.h"
-#include "test_main.h"
-#include "e_os.h"
+#include "internal/nelem.h"
/**********************************************************************
*
/**********************************************************************
*
@@
-24,10
+23,10
@@
*
***/
*
***/
-#include "../crypto/x509
v3
/ext_dat.h"
-#include "../crypto/x509
v3
/standard_exts.h"
+#include "../crypto/x509/ext_dat.h"
+#include "../crypto/x509/standard_exts.h"
-static int test_standard_exts()
+static int test_standard_exts(
void
)
{
size_t i;
int prev = -1, good = 1;
{
size_t i;
int prev = -1, good = 1;
@@
-42,18
+41,15
@@
static int test_standard_exts()
}
if (!good) {
tmp = standard_exts;
}
if (!good) {
tmp = standard_exts;
-
fprintf(stderr, "Extensions out of order!\n
");
+
TEST_error("Extensions out of order!
");
for (i = 0; i < STANDARD_EXTENSION_COUNT; i++, tmp++)
for (i = 0; i < STANDARD_EXTENSION_COUNT; i++, tmp++)
- fprintf(stderr, "%d : %s\n", (*tmp)->ext_nid,
- OBJ_nid2sn((*tmp)->ext_nid));
- } else {
- fprintf(stderr, "Order OK\n");
+ TEST_note("%d : %s", (*tmp)->ext_nid, OBJ_nid2sn((*tmp)->ext_nid));
}
}
-
return good;
}
return good;
}
-
void register_tests(
)
+
int setup_tests(void
)
{
ADD_TEST(test_standard_exts);
{
ADD_TEST(test_standard_exts);
+ return 1;
}
}