Merge branch 'master' into kazuho/pacer

h2o · Nov 4, 2023 · 2ccbb25 · 2ccbb25
2 parents 95f6f52 + 5d330a5
commit 2ccbb25
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 13 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -7,6 +7,7 @@ INCLUDE(CMakePushCheckState)
 INCLUDE(CheckCSourceCompiles)
 INCLUDE(deps/picotls/cmake/boringssl-adjust.cmake)
 INCLUDE(deps/picotls/cmake/dtrace-utils.cmake)
+INCLUDE(deps/picotls/cmake/fusion.cmake)
 
 FIND_PACKAGE(OpenSSL REQUIRED)
 BORINGSSL_ADJUST()
@@ -20,15 +21,7 @@ IF (WITH_DTRACE)
     MESSAGE(STATUS "Enabling USDT support")
 ENDIF ()
 
-CMAKE_PUSH_CHECK_STATE()
-SET(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -mavx2 -maes -mpclmul -mvaes -mvpclmulqdq")
-CHECK_C_SOURCE_COMPILES("int main(void) {}" CC_HAS_AESNI256)
-CMAKE_POP_CHECK_STATE()
-IF (CC_HAS_AESNI256)
-    SET(WITH_FUSION_DEFAULT "ON")
-ELSE ()
-    SET(WITH_FUSION_DEFAULT "OFF")
-ENDIF ()
+CHECK_FUSION_PREREQUISITES()
 OPTION(WITH_FUSION "whether or not to use the Fusion AES-GCM engine in the cli binary" ${WITH_FUSION_DEFAULT})
 
 # CMake defaults to a Debug build, whereas quicly defaults to an optimized (Release) build

diff --git a/deps/picotls b/deps/picotls
diff --git a/lib/quicly.c b/lib/quicly.c
@@ -5738,7 +5738,6 @@ static int compare_socket_address(struct sockaddr *x, struct sockaddr *y)
         if (r != 0)
             return r;
         CMP(ntohs(xin6->sin6_port), ntohs(yin6->sin6_port));
-        CMP(xin6->sin6_flowinfo, yin6->sin6_flowinfo);
         CMP(xin6->sin6_scope_id, yin6->sin6_scope_id);
     } else if (x->sa_family == AF_UNSPEC) {
         return 1;
@@ -6786,6 +6785,7 @@ int quicly_encrypt_address_token(void (*random_bytes)(void *, size_t), ptls_aead
                 break;
             case AF_INET6:
                 ptls_buffer_pushv(buf, &plaintext->remote.sin6.sin6_addr, 16);
+                ptls_buffer_push32(buf, plaintext->remote.sin6.sin6_scope_id);
                 port = ntohs(plaintext->remote.sin6.sin6_port);
                 break;
             default:
@@ -6883,9 +6883,11 @@ int quicly_decrypt_address_token(ptls_aead_context_t *aead, quicly_address_token
                 memcpy(&plaintext->remote.sin.sin_addr.s_addr, src, 4);
                 portaddr = &plaintext->remote.sin.sin_port;
                 break;
-            case 16: /* ipv6 */
-                plaintext->remote.sin6.sin6_family = AF_INET6;
+            case 20: /* ipv6 */
+                plaintext->remote.sin6 = (struct sockaddr_in6){.sin6_family = AF_INET6};
                 memcpy(&plaintext->remote.sin6.sin6_addr, src, 16);
+                if ((ret = ptls_decode32(&plaintext->remote.sin6.sin6_scope_id, &src, end)) != 0)
+                    goto Exit;
                 portaddr = &plaintext->remote.sin6.sin6_port;
                 break;
             default:
+1 −1		.github/workflows/ci.yml
+35 −16		CMakeLists.txt
+3 −2		README.md
+29 −0		cmake/fusion.cmake
+26 −1		include/picotls.h
+9 −0		include/picotls/minicrypto.h
+8 −0		include/picotls/openssl.h
+21 −2		lib/cifra.c
+62 −0		lib/cifra/libaegis.c
+10 −1		lib/cifra/x25519.c
+252 −0		lib/libaegis.h
+86 −4		lib/openssl.c
+41 −6		lib/picotls.c
+2 −0		picotls.xcodeproj/project.pbxproj
+28 −17		t/cli.c
+2 −2		t/minicrypto.c
+5 −3		t/openssl.c
+201 −56		t/picotls.c
+4 −0		t/ptlsbench.c