diff options
Diffstat (limited to 'build')
3 files changed, 95 insertions, 2 deletions
diff --git a/build/external/packages/quicly.mk b/build/external/packages/quicly.mk index e14a513d8be..07630d451d2 100644 --- a/build/external/packages/quicly.mk +++ b/build/external/packages/quicly.mk @@ -11,9 +11,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -quicly_version := 0.0.5-vpp +quicly_version := 0.0.6-vpp quicly_tarball := quicly_$(quicly_version).tar.gz -quicly_tarball_md5sum := 47f6d6324412efcbd058cce1b1ebc045 +quicly_tarball_md5sum := 416c29e455e0bd5025e32a3393fc3647 quicly_tarball_strip_dirs := 1 quicly_url := https://github.com/vpp-quic/quicly/releases/download/v$(quicly_version)/quicly_$(quicly_version).tar.gz diff --git a/build/external/patches/quicly_0.0.6-vpp/0001-Add-function-ptr-in-ptls-ctx-for-aead_encrypt.patch b/build/external/patches/quicly_0.0.6-vpp/0001-Add-function-ptr-in-ptls-ctx-for-aead_encrypt.patch new file mode 100644 index 00000000000..80f3bcb684f --- /dev/null +++ b/build/external/patches/quicly_0.0.6-vpp/0001-Add-function-ptr-in-ptls-ctx-for-aead_encrypt.patch @@ -0,0 +1,33 @@ +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.6-vpp/0001-cmake-install.patch b/build/external/patches/quicly_0.0.6-vpp/0001-cmake-install.patch new file mode 100644 index 00000000000..0ca7d2986d4 --- /dev/null +++ b/build/external/patches/quicly_0.0.6-vpp/0001-cmake-install.patch @@ -0,0 +1,60 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f5478d3..156df4c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -65,6 +65,8 @@ IF (WITH_DTRACE) + ENDIF () + ENDIF () + ++SET(CMAKE_POSITION_INDEPENDENT_CODE ON) ++ + ADD_LIBRARY(quicly ${QUICLY_LIBRARY_FILES}) + + ADD_CUSTOM_COMMAND( +@@ -84,6 +86,16 @@ TARGET_LINK_LIBRARIES(examples-echo 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} WITH_DTRACE=${WITH_DTRACE} 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 874b9be..14411e2 100644 +--- a/deps/picotls/CMakeLists.txt ++++ b/deps/picotls/CMakeLists.txt +@@ -12,6 +12,7 @@ IF (WITH_DTRACE) + MESSAGE(STATUS "Enabling USDT support") + ENDIF () + ++SET(CMAKE_POSITION_INDEPENDENT_CODE ON) + SET(CMAKE_C_FLAGS "-std=c99 -Wall -O2 -g ${CC_WARNING_FLAGS} ${CMAKE_C_FLAGS}") + INCLUDE_DIRECTORIES( + deps/cifra/src/ext +@@ -131,6 +132,15 @@ ELSE () + MESSAGE(WARNING "Disabling OpenSSL support (requires 1.0.1 or newer)") + 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) ++ + ADD_CUSTOM_TARGET(check env BINARY_DIR=${CMAKE_CURRENT_BINARY_DIR} prove --exec '' -v ${CMAKE_CURRENT_BINARY_DIR}/*.t t/*.t WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DEPENDS ${TEST_EXES} cli) + + IF (CMAKE_SYSTEM_NAME STREQUAL "Linux") |