You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by ma...@apache.org on 2018/08/07 01:50:35 UTC

[trafficserver] branch quic-latest updated: Fix test_QUICHandshakeProtocol

This is an automated email from the ASF dual-hosted git repository.

masaori pushed a commit to branch quic-latest
in repository https://gitbox.apache.org/repos/asf/trafficserver.git


The following commit(s) were added to refs/heads/quic-latest by this push:
     new d924cd8  Fix test_QUICHandshakeProtocol
d924cd8 is described below

commit d924cd877b731fcfd5fa283b3efa9f627ce7d35a
Author: Masaori Koshiba <ma...@apache.org>
AuthorDate: Tue Aug 7 10:50:19 2018 +0900

    Fix test_QUICHandshakeProtocol
---
 iocore/net/quic/test/test_QUICHandshakeProtocol.cc | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/iocore/net/quic/test/test_QUICHandshakeProtocol.cc b/iocore/net/quic/test/test_QUICHandshakeProtocol.cc
index 1aa2172..a1b567e 100644
--- a/iocore/net/quic/test/test_QUICHandshakeProtocol.cc
+++ b/iocore/net/quic/test/test_QUICHandshakeProtocol.cc
@@ -161,6 +161,9 @@ TEST_CASE("QUICHandshakeProtocol Full Handshake", "[quic]")
   SSL_CTX_set_min_proto_version(client_ssl_ctx, TLS1_3_VERSION);
   SSL_CTX_set_max_proto_version(client_ssl_ctx, TLS1_3_VERSION);
   SSL_CTX_clear_options(client_ssl_ctx, SSL_OP_ENABLE_MIDDLEBOX_COMPAT);
+#ifdef SSL_MODE_QUIC_HACK
+  SSL_CTX_set_mode(client_ssl_ctx, SSL_MODE_QUIC_HACK);
+#endif
   QUICHandshakeProtocol *client = new QUICTLS(SSL_new(client_ssl_ctx), NET_VCONNECTION_OUT);
 
   // Server
@@ -168,6 +171,9 @@ TEST_CASE("QUICHandshakeProtocol Full Handshake", "[quic]")
   SSL_CTX_set_min_proto_version(server_ssl_ctx, TLS1_3_VERSION);
   SSL_CTX_set_max_proto_version(server_ssl_ctx, TLS1_3_VERSION);
   SSL_CTX_clear_options(server_ssl_ctx, SSL_OP_ENABLE_MIDDLEBOX_COMPAT);
+#ifdef SSL_MODE_QUIC_HACK
+  SSL_CTX_set_mode(server_ssl_ctx, SSL_MODE_QUIC_HACK);
+#endif
   BIO *crt_bio(BIO_new_mem_buf(server_crt, sizeof(server_crt)));
   SSL_CTX_use_certificate(server_ssl_ctx, PEM_read_bio_X509(crt_bio, nullptr, nullptr, nullptr));
   BIO *key_bio(BIO_new_mem_buf(server_key, sizeof(server_key)));
@@ -207,8 +213,6 @@ TEST_CASE("QUICHandshakeProtocol Full Handshake", "[quic]")
   std::cout << "### Messages from client" << std::endl;
   print_hex(msg3.buf, msg3.offsets[4]);
 
-  CHECK(client->update_key_materials());
-
   // NS
   QUICHandshakeMsgs msg4;
   uint8_t msg4_buf[MAX_HANDSHAKE_MSG_LEN] = {0};
@@ -219,8 +223,6 @@ TEST_CASE("QUICHandshakeProtocol Full Handshake", "[quic]")
   std::cout << "### Messages from server" << std::endl;
   print_hex(msg4.buf, msg4.offsets[4]);
 
-  CHECK(server->update_key_materials());
-
   // encrypt - decrypt
   // client (encrypt) - server (decrypt)
   std::cout << "### Original Text" << std::endl;