projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Previously this x509 command line was working, restore that
[openssl.git]
/
test
/
ssl_test_ctx_test.c
diff --git
a/test/ssl_test_ctx_test.c
b/test/ssl_test_ctx_test.c
index d064511df2993694e188304d0c63fd701c4c30bb..ffbbfbc12b23f742dee8bf2eb5e6590bbde82421 100644
(file)
--- a/
test/ssl_test_ctx_test.c
+++ b/
test/ssl_test_ctx_test.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright 2016-201
7
The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2016-201
8
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
@@
-55,6
+55,8
@@
static int serverconf_eq(SSL_TEST_SERVER_CONF *serv,
|| !TEST_str_eq(serv->alpn_protocols, serv2->alpn_protocols)
|| !TEST_int_eq(serv->broken_session_ticket,
serv2->broken_session_ticket)
|| !TEST_str_eq(serv->alpn_protocols, serv2->alpn_protocols)
|| !TEST_int_eq(serv->broken_session_ticket,
serv2->broken_session_ticket)
+ || !TEST_str_eq(serv->session_ticket_app_data,
+ serv2->session_ticket_app_data)
|| !TEST_int_eq(serv->cert_status, serv2->cert_status))
return 0;
return 1;
|| !TEST_int_eq(serv->cert_status, serv2->cert_status))
return 0;
return 1;
@@
-93,6
+95,10
@@
static int testctx_eq(SSL_TEST_CTX *ctx, SSL_TEST_CTX *ctx2)
ctx2->expected_npn_protocol)
|| !TEST_str_eq(ctx->expected_alpn_protocol,
ctx2->expected_alpn_protocol)
ctx2->expected_npn_protocol)
|| !TEST_str_eq(ctx->expected_alpn_protocol,
ctx2->expected_alpn_protocol)
+ || !TEST_str_eq(ctx->expected_cipher,
+ ctx2->expected_cipher)
+ || !TEST_str_eq(ctx->expected_session_ticket_app_data,
+ ctx2->expected_session_ticket_app_data)
|| !TEST_int_eq(ctx->resumption_expected,
ctx2->resumption_expected)
|| !TEST_int_eq(ctx->session_id_expected,
|| !TEST_int_eq(ctx->resumption_expected,
ctx2->resumption_expected)
|| !TEST_int_eq(ctx->session_id_expected,