projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Get rid of the diversity of names for MAC parameters
[openssl.git]
/
test
/
fatalerrtest.c
diff --git
a/test/fatalerrtest.c
b/test/fatalerrtest.c
index 23357351f5a8ad0d68f91dcc623603ebb358a6dd..0f18c1b67bc67c2adb5ccaeb2c9da4fc1d55d5d1 100644
(file)
--- a/
test/fatalerrtest.c
+++ b/
test/fatalerrtest.c
@@
-1,7
+1,7
@@
/*
/*
- * Copyright 2017 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2017
-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
@@
-28,8
+28,9
@@
static int test_fatalerr(void)
0x17, 0x03, 0x03, 0x00, 0x05, 'D', 'u', 'm', 'm', 'y'
};
0x17, 0x03, 0x03, 0x00, 0x05, 'D', 'u', 'm', 'm', 'y'
};
- if (!TEST_true(create_ssl_ctx_pair(TLS_method(), TLS_method(), &sctx, &cctx,
- cert, privkey)))
+ if (!TEST_true(create_ssl_ctx_pair(TLS_method(), TLS_method(),
+ TLS1_VERSION, 0,
+ &sctx, &cctx, cert, privkey)))
goto err;
/*
goto err;
/*
@@
-38,6
+39,10
@@
static int test_fatalerr(void)
*/
if (!TEST_true(SSL_CTX_set_cipher_list(sctx, "AES128-SHA"))
|| !TEST_true(SSL_CTX_set_cipher_list(cctx, "AES256-SHA"))
*/
if (!TEST_true(SSL_CTX_set_cipher_list(sctx, "AES128-SHA"))
|| !TEST_true(SSL_CTX_set_cipher_list(cctx, "AES256-SHA"))
+ || !TEST_true(SSL_CTX_set_ciphersuites(sctx,
+ "TLS_AES_128_GCM_SHA256"))
+ || !TEST_true(SSL_CTX_set_ciphersuites(cctx,
+ "TLS_AES_256_GCM_SHA384"))
|| !TEST_true(create_ssl_objects(sctx, cctx, &sssl, &cssl, NULL,
NULL)))
goto err;
|| !TEST_true(create_ssl_objects(sctx, cctx, &sssl, &cssl, NULL,
NULL)))
goto err;
@@
-77,6
+82,8
@@
static int test_fatalerr(void)
return ret;
}
return ret;
}
+OPT_TEST_DECLARE_USAGE("certfile privkeyfile\n")
+
int setup_tests(void)
{
if (!TEST_ptr(cert = test_get_argument(0))
int setup_tests(void)
{
if (!TEST_ptr(cert = test_get_argument(0))