projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
doc/man3/EVP_EncryptInit.pod: add EVP_CIPHER_CTX_rand_key
[openssl.git]
/
test
/
x509_internal_test.c
diff --git
a/test/x509_internal_test.c
b/test/x509_internal_test.c
index e0cb6158d7f47d718e4637f34865c9269129d20f..03bbcf2bfd25839b972a6b4975830e3af8311627 100644
(file)
--- a/
test/x509_internal_test.c
+++ b/
test/x509_internal_test.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2016
-2017
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
*
* Licensed under the OpenSSL license (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@
-15,7
+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 "
e_os
.h"
+#include "
internal/nelem
.h"
/**********************************************************************
*
/**********************************************************************
*
@@
-23,10
+23,19
@@
*
***/
*
***/
+#ifdef __VMS
+# pragma names save
+# pragma names as_is,shortened
+#endif
+
#include "../crypto/x509v3/ext_dat.h"
#include "../crypto/x509v3/standard_exts.h"
#include "../crypto/x509v3/ext_dat.h"
#include "../crypto/x509v3/standard_exts.h"
-static int test_standard_exts()
+#ifdef __VMS
+# pragma names restore
+#endif
+
+static int test_standard_exts(void)
{
size_t i;
int prev = -1, good = 1;
{
size_t i;
int prev = -1, good = 1;
@@
-41,20
+50,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;
}
-int
main(int argc, char **argv
)
+int
setup_tests(
)
{
ADD_TEST(test_standard_exts);
{
ADD_TEST(test_standard_exts);
-
- return run_tests(argv[0]);
+ return 1;
}
}