Skip to content

Bump ngtcp2#11428

Closed
tatsuhiro-t wants to merge 2 commits intocurl:masterfrom
tatsuhiro-t:bump-ngtcp2
Closed

Bump ngtcp2#11428
tatsuhiro-t wants to merge 2 commits intocurl:masterfrom
tatsuhiro-t:bump-ngtcp2

Conversation

@tatsuhiro-t
Copy link
Copy Markdown
Contributor

No description provided.

- ngtcp2_crypto_openssl was renamed to ngtcp2_crypto_quictls.
@github-actions github-actions bot added the CI Continuous Integration label Jul 12, 2023
@bagder
Copy link
Copy Markdown
Member

bagder commented Jul 12, 2023

Thanks!

@bagder bagder closed this in 993b149 Jul 12, 2023
bagder pushed a commit that referenced this pull request Jul 12, 2023
- ngtcp2_crypto_openssl was renamed to ngtcp2_crypto_quictls.

Closes #11428
@nono303
Copy link
Copy Markdown

nono303 commented Jul 13, 2023

@tatsuhiro-t @bagder ⚠️ Also require these changes for CMake

diff --git "a/CMakeLists.txt" "b/CMakeLists.txt"
index 49a44eabf..d25c9b388 100644
--- "a/CMakeLists.txt"
+++ "b/CMakeLists.txt"
@@ -602,7 +602,7 @@ if(USE_NGTCP2)
     elseif(HAVE_BORINGSSL)
       find_package(NGTCP2 REQUIRED BoringSSL)
     else()
-      find_package(NGTCP2 REQUIRED OpenSSL)
+      find_package(NGTCP2 REQUIRED QuicTLS)
     endif()
     CheckQuicSupportInOpenSSL()
   elseif(USE_GNUTLS)
diff --git "a/CMake/FindNGTCP2.cmake" "b/CMake/FindNGTCP2.cmake"
index ff0d49e33..5d307371b 100644
--- "a/CMake/FindNGTCP2.cmake"
+++ "b/CMake/FindNGTCP2.cmake"
@@ -71,7 +71,7 @@ endif()
 if(NGTCP2_FIND_COMPONENTS)
   set(NGTCP2_CRYPTO_BACKEND "")
   foreach(component IN LISTS NGTCP2_FIND_COMPONENTS)
-    if(component MATCHES "^(BoringSSL|OpenSSL|wolfSSL|GnuTLS)")
+    if(component MATCHES "^(BoringSSL|QuicTLS|wolfSSL|GnuTLS)")
       if(NGTCP2_CRYPTO_BACKEND)
         message(FATAL_ERROR "NGTCP2: Only one crypto library can be selected")
       endif()

...All theses breaking changes in latest ng released modules without cmake regression validation (cf. ngtcp2/ngtcp2#858) became hard to follow
(patch #11184 + #11428 for curl latest curl release)

@vszakats

This comment was marked as resolved.

@icing
Copy link
Copy Markdown
Contributor

icing commented Jul 13, 2023

@vszakats you mean if libngtcp2_crypto_quictls can be build using libressl? Is that not more a question for the ngtcp2 project?

@vszakats
Copy link
Copy Markdown
Member

vszakats commented Jul 13, 2023

@icing: Oh sorry, it indeed is, confused this thread with one in ngtcp2. In this case, it most likely will continue to work with LibreSSL under the new name.

The patch above looks necessary indeed, though I haven't made tests. The current curl-for-win daily builds are broken due to the renames, and I'm retrofitting a post-0.17.0 patch to get it back to work. Will find out later today how far it could go (this doesn't use CMake to build curl, so not affected by the patch above).

That said a new ngtcp2 release would help a smooth upcoming curl release with H3.

bch pushed a commit to bch/curl that referenced this pull request Jul 19, 2023
bch pushed a commit to bch/curl that referenced this pull request Jul 19, 2023
- ngtcp2_crypto_openssl was renamed to ngtcp2_crypto_quictls.

Closes curl#11428
ptitSeb pushed a commit to wasix-org/curl that referenced this pull request Sep 25, 2023
ptitSeb pushed a commit to wasix-org/curl that referenced this pull request Sep 25, 2023
- ngtcp2_crypto_openssl was renamed to ngtcp2_crypto_quictls.

Closes curl#11428
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

CI Continuous Integration

Development

Successfully merging this pull request may close these issues.

5 participants