Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
MR: #1824
#define EXTENSION_SIZE_LEN 2
#define EXTENSION_SIZE_LEN 2
-#define TOTAL_NUM_TESTS 2
-
-/*
- * Test that explicitly setting ticket data results in it appearing in the
- * ClientHello for TLS1.2
- */
-#define TEST_SET_SESSION_TICK_DATA_TLS_1_2 0
+#define TOTAL_NUM_TESTS 1
/*
* Test that explicitly setting ticket data results in it appearing in the
* ClientHello for a negotiated SSL/TLS version
*/
/*
* Test that explicitly setting ticket data results in it appearing in the
* ClientHello for a negotiated SSL/TLS version
*/
-#define TEST_SET_SESSION_TICK_DATA_VER_NEG 1
+#define TEST_SET_SESSION_TICK_DATA_VER_NEG 0
int main(int argc, char *argv[])
{
int main(int argc, char *argv[])
{
*/
for (; currtest < TOTAL_NUM_TESTS; currtest++) {
testresult = 0;
*/
for (; currtest < TOTAL_NUM_TESTS; currtest++) {
testresult = 0;
- if (currtest == TEST_SET_SESSION_TICK_DATA_TLS_1_2) {
-#ifndef OPENSSL_NO_TLS1_2_METHOD
- ctx = SSL_CTX_new(TLSv1_2_method());
-#else
- testresult = 1;
- continue;
-#endif
- } else {
- ctx = SSL_CTX_new(TLS_method());
- }
+ ctx = SSL_CTX_new(TLS_method());
con = SSL_new(ctx);
rbio = BIO_new(BIO_s_mem());
con = SSL_new(ctx);
rbio = BIO_new(BIO_s_mem());
SSL_set_bio(con, rbio, wbio);
SSL_set_connect_state(con);
SSL_set_bio(con, rbio, wbio);
SSL_set_connect_state(con);
- if (currtest == TEST_SET_SESSION_TICK_DATA_TLS_1_2
- || currtest == TEST_SET_SESSION_TICK_DATA_VER_NEG) {
+ if (currtest == TEST_SET_SESSION_TICK_DATA_VER_NEG) {
if (!SSL_set_session_ticket_ext(con, dummytick, strlen(dummytick)))
goto end;
}
if (!SSL_set_session_ticket_ext(con, dummytick, strlen(dummytick)))
goto end;
}
goto end;
if (type == TLSEXT_TYPE_session_ticket) {
goto end;
if (type == TLSEXT_TYPE_session_ticket) {
- if (currtest == TEST_SET_SESSION_TICK_DATA_TLS_1_2
- || currtest == TEST_SET_SESSION_TICK_DATA_VER_NEG) {
+ if (currtest == TEST_SET_SESSION_TICK_DATA_VER_NEG) {
if (size == strlen(dummytick)
&& memcmp(data, dummytick, size) == 0) {
/* Ticket data is as we expected */
if (size == strlen(dummytick)
&& memcmp(data, dummytick, size) == 0) {
/* Ticket data is as we expected */
static HEARTBEAT_TEST_FIXTURE set_up_dtls(const char *const test_case_name)
{
HEARTBEAT_TEST_FIXTURE fixture = set_up(test_case_name,
static HEARTBEAT_TEST_FIXTURE set_up_dtls(const char *const test_case_name)
{
HEARTBEAT_TEST_FIXTURE fixture = set_up(test_case_name,
- DTLSv1_server_method());
fixture.process_heartbeat = dtls1_process_heartbeat;
/*
fixture.process_heartbeat = dtls1_process_heartbeat;
/*
static int do_test_cipherlist(void)
{
static int do_test_cipherlist(void)
{
-#if !defined(OPENSSL_NO_SSL3_METHOD) || !defined(OPENSSL_NO_TLS1_METHOD)
int i = 0;
const SSL_METHOD *meth;
const SSL_CIPHER *ci, *tci = NULL;
int i = 0;
const SSL_METHOD *meth;
const SSL_CIPHER *ci, *tci = NULL;
* call functions, thus avoiding auto-init
*/
OPENSSL_init_crypto(0, NULL);
* call functions, thus avoiding auto-init
*/
OPENSSL_init_crypto(0, NULL);
-#ifndef OPENSSL_NO_SSL3_METHOD
- meth = SSLv3_method();
tci = NULL;
while ((ci = meth->get_cipher(i++)) != NULL) {
if (tci != NULL)
tci = NULL;
while ((ci = meth->get_cipher(i++)) != NULL) {
if (tci != NULL)
-#ifndef OPENSSL_NO_TLS1_METHOD
- meth = TLSv1_method();
- tci = NULL;
- while ((ci = meth->get_cipher(i++)) != NULL) {
- if (tci != NULL)
- if (ci->id >= tci->id) {
- fprintf(stderr, "testing TLSv1 cipher list order: ");
- fprintf(stderr, "failed %x vs. %x\n", ci->id, tci->id);
- return 0;
- }
- tci = ci;
- }
-#endif