diff options
author | 2020-02-07 16:29:05 +0000 | |
---|---|---|
committer | 2020-03-27 17:43:33 +0000 | |
commit | ffdc72da4f086e9a62b946970778495bba400e69 (patch) | |
tree | 3633cea2b6aa5f862eccc85a7e80d9db66d6aa96 /build/external/patches/quicly_0.0.3-vpp | |
parent | 4e149776890a5ac91bb14957d57def3c73325061 (diff) |
quic: Check quicly version tag at compile time
- updates the quicly version to 0.1.0-vpp
- adds workaround for quicly_send()/assert_consistency() failure
Type: feature
Change-Id: I4c7e0ffc720ad9a685b89046a83646d59febd6cd
Signed-off-by: MathiasRaoul <mathias.raoul@gmail.com>
Signed-off-by: Nathan Skrzypczak <nathan.skrzypczak@gmail.com>
Signed-off-by: Dave Wallace <dwallacelf@gmail.com>
Diffstat (limited to 'build/external/patches/quicly_0.0.3-vpp')
-rw-r--r-- | build/external/patches/quicly_0.0.3-vpp/0001-Add-function-ptr-in-ptls-ctx-for-aead_encrypt.patch | 33 | ||||
-rw-r--r-- | build/external/patches/quicly_0.0.3-vpp/0001-cmake-install.patch | 57 |
2 files changed, 0 insertions, 90 deletions
diff --git a/build/external/patches/quicly_0.0.3-vpp/0001-Add-function-ptr-in-ptls-ctx-for-aead_encrypt.patch b/build/external/patches/quicly_0.0.3-vpp/0001-Add-function-ptr-in-ptls-ctx-for-aead_encrypt.patch deleted file mode 100644 index 80f3bcb684f..00000000000 --- a/build/external/patches/quicly_0.0.3-vpp/0001-Add-function-ptr-in-ptls-ctx-for-aead_encrypt.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/deps/picotls/include/picotls.h b/deps/picotls/include/picotls.h -index 06d62f9..de33b86 100644 ---- a/deps/picotls/include/picotls.h -+++ b/deps/picotls/include/picotls.h -@@ -276,6 +276,8 @@ typedef struct st_ptls_aead_context_t { - size_t (*do_encrypt_final)(struct st_ptls_aead_context_t *ctx, void *output); - size_t (*do_decrypt)(struct st_ptls_aead_context_t *ctx, void *output, const void *input, size_t inlen, const void *iv, - const void *aad, size_t aadlen); -+ size_t (*do_encrypt)(struct st_ptls_aead_context_t *ctx, void *output, const void *input, size_t inlen, uint64_t seq, -+ const void *iv, const void *aad, size_t aadlen); - } ptls_aead_context_t; - - /** -diff --git a/deps/picotls/lib/picotls.c b/deps/picotls/lib/picotls.c -index 70d2fef..f98f7b4 100644 ---- a/deps/picotls/lib/picotls.c -+++ b/deps/picotls/lib/picotls.c -@@ -4890,6 +4890,13 @@ size_t ptls_aead_encrypt(ptls_aead_context_t *ctx, void *output, const void *inp - { - size_t off = 0; - -+ if(ctx->do_encrypt) -+ { -+ uint8_t iv[PTLS_MAX_IV_SIZE]; -+ ptls_aead__build_iv(ctx, iv, seq); -+ return ctx->do_encrypt(ctx, output, input, inlen, seq, iv, aad, aadlen); -+ } -+ - ptls_aead_encrypt_init(ctx, seq, aad, aadlen); - off += ptls_aead_encrypt_update(ctx, ((uint8_t *)output) + off, input, inlen); - off += ptls_aead_encrypt_final(ctx, ((uint8_t *)output) + off); - - diff --git a/build/external/patches/quicly_0.0.3-vpp/0001-cmake-install.patch b/build/external/patches/quicly_0.0.3-vpp/0001-cmake-install.patch deleted file mode 100644 index 3ac90c7d0aa..00000000000 --- a/build/external/patches/quicly_0.0.3-vpp/0001-cmake-install.patch +++ /dev/null @@ -1,57 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 202cc52..b5c2bee 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -40,6 +40,8 @@ SET(UNITTEST_SOURCE_FILES - t/stream-concurrency.c - t/test.c) - -+SET(CMAKE_POSITION_INDEPENDENT_CODE ON) -+ - ADD_LIBRARY(quicly ${QUICLY_LIBRARY_FILES}) - - ADD_EXECUTABLE(cli ${PICOTLS_OPENSSL_FILES} src/cli.c) -@@ -50,6 +52,16 @@ TARGET_LINK_LIBRARIES(test.t quicly ${OPENSSL_LIBRARIES} ${CMAKE_DL_LIBS}) - - ADD_EXECUTABLE(udpfw t/udpfw.c) - -+INSTALL ( -+ DIRECTORY ${CMAKE_SOURCE_DIR}/include/ -+ DESTINATION include -+ FILES_MATCHING PATTERN "*.h") -+ -+INSTALL(TARGETS quicly -+ RUNTIME DESTINATION bin -+ LIBRARY DESTINATION lib -+ ARCHIVE DESTINATION lib) -+ - ADD_CUSTOM_TARGET(check env BINARY_DIR=${CMAKE_CURRENT_BINARY_DIR} prove --exec "sh -c" -v ${CMAKE_CURRENT_BINARY_DIR}/*.t t/*.t - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - DEPENDS cli test.t) -Submodule deps/picotls contains untracked content -Submodule deps/picotls contains modified content -diff --git a/deps/picotls/CMakeLists.txt b/deps/picotls/CMakeLists.txt -index cda6aad..62b23b7 100644 ---- a/deps/picotls/CMakeLists.txt -+++ b/deps/picotls/CMakeLists.txt -@@ -5,6 +5,7 @@ PROJECT(picotls) - - FIND_PACKAGE(PkgConfig REQUIRED) - -+SET(CMAKE_POSITION_INDEPENDENT_CODE ON) - SET(CMAKE_C_FLAGS "-std=c99 -Wall -O2 -g ${CC_WARNING_FLAGS} ${CMAKE_C_FLAGS}") - INCLUDE_DIRECTORIES(${OPENSSL_INCLUDE_DIR} deps/cifra/src/ext deps/cifra/src deps/micro-ecc deps/picotest include) - SET(MINICRYPTO_LIBRARY_FILES -@@ -97,3 +98,12 @@ IF (BUILD_FUZZER) - - - ENDIF() -+ -+INSTALL (DIRECTORY ${CMAKE_SOURCE_DIR}/include/ -+ DESTINATION include -+ FILES_MATCHING PATTERN "*.h") -+ -+INSTALL(TARGETS picotls-core picotls-openssl -+ RUNTIME DESTINATION bin -+ LIBRARY DESTINATION lib -+ ARCHIVE DESTINATION lib) |