projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Adjust length of some strncpy() calls
[openssl.git]
/
test
/
asynciotest.c
diff --git
a/test/asynciotest.c
b/test/asynciotest.c
index 5e85cbb044a2e0175312e049b66e7c5b9021bf52..4147ee128c7ea2688d76574cb98e2d04180d351c 100644
(file)
--- a/
test/asynciotest.c
+++ b/
test/asynciotest.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
@@
-13,7
+13,7
@@
#include <openssl/bio.h>
#include <openssl/err.h>
#include <openssl/bio.h>
#include <openssl/err.h>
-#include "
../ssl/packet_locl
.h"
+#include "
internal/packet
.h"
#include "ssltestlib.h"
#include "testutil.h"
#include "ssltestlib.h"
#include "testutil.h"
@@
-296,8
+296,9
@@
static int test_asyncio(int test)
const char testdata[] = "Test data";
char buf[sizeof(testdata)];
const char testdata[] = "Test data";
char buf[sizeof(testdata)];
- if (!TEST_true(create_ssl_ctx_pair(TLS_server_method(), TLS_client_method(),
- TLS1_VERSION, TLS_MAX_VERSION,
+ if (!TEST_true(create_ssl_ctx_pair(NULL, TLS_server_method(),
+ TLS_client_method(),
+ TLS1_VERSION, 0,
&serverctx, &clientctx, cert, privkey)))
goto end;
&serverctx, &clientctx, cert, privkey)))
goto end;
@@
-393,8
+394,15
@@
static int test_asyncio(int test)
return testresult;
}
return testresult;
}
+OPT_TEST_DECLARE_USAGE("certname privkey\n")
+
int setup_tests(void)
{
int setup_tests(void)
{
+ if (!test_skip_common_options()) {
+ TEST_error("Error parsing test options\n");
+ return 0;
+ }
+
if (!TEST_ptr(cert = test_get_argument(0))
|| !TEST_ptr(privkey = test_get_argument(1)))
return 0;
if (!TEST_ptr(cert = test_get_argument(0))
|| !TEST_ptr(privkey = test_get_argument(1)))
return 0;