Commit 564c0f4

Browse files
nodejs-github-botaduh95
authored andcommitted
deps: update ngtcp2 to 1.24.0
PR-URL: #64297 Backport-PR-URL: #64675 Reviewed-By: Tim Perry <pimterry@gmail.com> Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
1 parent e3304cd commit 564c0f4

21 files changed

Lines changed: 327 additions & 239 deletions

‎deps/ngtcp2/ngtcp2.gyp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
'ngtcp2/lib/ngtcp2_unreachable.c',
5050
'ngtcp2/lib/ngtcp2_vec.c',
5151
'ngtcp2/lib/ngtcp2_version.c',
52-
'ngtcp2/lib/ngtcp2_window_filter.c',
52+
'ngtcp2/lib/ngtcp2_wf.c',
5353
'ngtcp2/crypto/shared.c'
5454
],
5555
'ngtcp2_sources_ossl': [

‎deps/ngtcp2/ngtcp2/crypto/includes/ngtcp2/ngtcp2_crypto_ossl.h‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,18 @@ NGTCP2_EXTERN SSL *ngtcp2_crypto_ossl_ctx_get_ssl(ngtcp2_crypto_ossl_ctx *ctx);
145145
*/
146146
NGTCP2_EXTERNintngtcp2_crypto_ossl_init(void);
147147

148+
/**
149+
* @function
150+
*
151+
* `ngtcp2_crypto_ossl_free` frees the resources allocated by
152+
* `ngtcp2_crypto_ossl_init`. It is safe to call this function even
153+
* if `ngtcp2_crypto_ossl_init` fails or is not called at all. This
154+
* function might be useful to make some leak detection tools happy.
155+
*
156+
* .. version-added:: 1.24.0
157+
*/
158+
NGTCP2_EXTERNvoidngtcp2_crypto_ossl_free(void);
159+
148160
/**
149161
* @function
150162
*

‎deps/ngtcp2/ngtcp2/crypto/ossl/ossl.c‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,60 @@ int ngtcp2_crypto_ossl_init(void) {
7979
return0;
8080
}
8181

82+
voidngtcp2_crypto_ossl_free(void) {
83+
if (crypto_hkdf) {
84+
EVP_KDF_free(crypto_hkdf);
85+
crypto_hkdf=NULL;
86+
}
87+
88+
if (crypto_sha384) {
89+
EVP_MD_free(crypto_sha384);
90+
crypto_sha384=NULL;
91+
}
92+
93+
if (crypto_sha256) {
94+
EVP_MD_free(crypto_sha256);
95+
crypto_sha256=NULL;
96+
}
97+
98+
#ifndefNGTCP2_NO_CHACHA_POLY1305
99+
if (crypto_chacha20) {
100+
EVP_CIPHER_free(crypto_chacha20);
101+
crypto_chacha20=NULL;
102+
}
103+
104+
if (crypto_chacha20_poly1305) {
105+
EVP_CIPHER_free(crypto_chacha20_poly1305);
106+
crypto_chacha20_poly1305=NULL;
107+
}
108+
#endif/* !defined(NGTCP2_NO_CHACHA_POLY1305) */
109+
110+
if (crypto_aes_256_ecb) {
111+
EVP_CIPHER_free(crypto_aes_256_ecb);
112+
crypto_aes_256_ecb=NULL;
113+
}
114+
115+
if (crypto_aes_128_ecb) {
116+
EVP_CIPHER_free(crypto_aes_128_ecb);
117+
crypto_aes_128_ecb=NULL;
118+
}
119+
120+
if (crypto_aes_128_ccm) {
121+
EVP_CIPHER_free(crypto_aes_128_ccm);
122+
crypto_aes_128_ccm=NULL;
123+
}
124+
125+
if (crypto_aes_256_gcm) {
126+
EVP_CIPHER_free(crypto_aes_256_gcm);
127+
crypto_aes_256_gcm=NULL;
128+
}
129+
130+
if (crypto_aes_128_gcm) {
131+
EVP_CIPHER_free(crypto_aes_128_gcm);
132+
crypto_aes_128_gcm=NULL;
133+
}
134+
}
135+
82136
staticconstEVP_CIPHER*crypto_aead_aes_128_gcm(void) {
83137
if (crypto_aes_128_gcm) {
84138
returncrypto_aes_128_gcm;

‎deps/ngtcp2/ngtcp2/examples/http3_server_proto_codec.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -603,9 +603,9 @@ std::expected<void, Error> ProtoCodec::start_response(Stream *stream) {
603603
nghttp3_pri pri;
604604

605605
if (auto rv =
606-
nghttp3_conn_get_stream_priority(httpconn_, &pri, stream->stream_id);
606+
nghttp3_conn_get_stream_priority2(httpconn_, &pri, stream->stream_id);
607607
rv != 0) {
608-
std::println(stderr, "nghttp3_conn_get_stream_priority: {}",
608+
std::println(stderr, "nghttp3_conn_get_stream_priority2: {}",
609609
nghttp3_strerror(rv));
610610
return std::unexpected{Error::HTTP3};
611611
}

‎deps/ngtcp2/ngtcp2/examples/tls_client_context_ossl.cc‎

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -36,23 +36,16 @@
3636
#include"client_base.h"
3737
#include"template.h"
3838

39-
namespace {
40-
auto _ = [] {
41-
if (ngtcp2_crypto_ossl_init() != 0) {
42-
assert(0);
43-
abort();
44-
}
45-
46-
return0;
47-
}();
48-
} // namespace
49-
5039
extern Config config;
5140

41+
TLSClientContext::TLSClientContext() { ngtcp2_crypto_ossl_init(); }
42+
5243
TLSClientContext::~TLSClientContext() {
5344
if (ssl_ctx_) {
5445
SSL_CTX_free(ssl_ctx_);
5546
}
47+
48+
ngtcp2_crypto_ossl_free();
5649
}
5750

5851
SSL_CTX *TLSClientContext::get_native_handle() const { return ssl_ctx_; }

‎deps/ngtcp2/ngtcp2/examples/tls_client_context_ossl.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ using namespace ngtcp2;
3737

3838
classTLSClientContext {
3939
public:
40-
TLSClientContext() = default;
40+
TLSClientContext();
4141
~TLSClientContext();
4242

4343
std::expected<void, Error> init(constchar *private_key_file,

‎deps/ngtcp2/ngtcp2/examples/tls_server_context_ossl.cc‎

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -37,23 +37,16 @@
3737
#include"server_base.h"
3838
#include"template.h"
3939

40-
namespace {
41-
auto _ = [] {
42-
if (ngtcp2_crypto_ossl_init() != 0) {
43-
assert(0);
44-
abort();
45-
}
46-
47-
return0;
48-
}();
49-
} // namespace
50-
5140
extern Config config;
5241

42+
TLSServerContext::TLSServerContext() { ngtcp2_crypto_ossl_init(); }
43+
5344
TLSServerContext::~TLSServerContext() {
5445
if (ssl_ctx_) {
5546
SSL_CTX_free(ssl_ctx_);
5647
}
48+
49+
ngtcp2_crypto_ossl_free();
5750
}
5851

5952
SSL_CTX *TLSServerContext::get_native_handle() const { return ssl_ctx_; }

‎deps/ngtcp2/ngtcp2/examples/tls_server_context_ossl.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ using namespace ngtcp2;
3737

3838
classTLSServerContext {
3939
public:
40-
TLSServerContext() = default;
40+
TLSServerContext();
4141
~TLSServerContext();
4242

4343
std::expected<void, Error> init(constchar *private_key_file,

‎deps/ngtcp2/ngtcp2/lib/includes/ngtcp2/ngtcp2.h‎

Lines changed: 30 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3485,6 +3485,24 @@ typedef int (*ngtcp2_stream_stop_sending)(ngtcp2_conn *conn, int64_t stream_id,
34853485
void*user_data,
34863486
void*stream_user_data);
34873487

3488+
/**
3489+
* @functypedef
3490+
*
3491+
* :type:`ngtcp2_recv_stop_sending` is invoked when a STOP_SENDING frame
3492+
* is received from a remote endpoint for a stream identified by
3493+
* |stream_id|. |app_error_code| is the application error code carried
3494+
* by the STOP_SENDING frame. This callback is called at most
3495+
* once per stream.
3496+
*
3497+
* The callback function must return 0 if it succeeds. Returning
3498+
* :macro:`NGTCP2_ERR_CALLBACK_FAILURE` makes the library call return
3499+
* immediately.
3500+
*/
3501+
typedefint (*ngtcp2_recv_stop_sending)(ngtcp2_conn*conn, int64_tstream_id,
3502+
uint64_tapp_error_code,
3503+
void*user_data,
3504+
void*stream_user_data);
3505+
34883506
/**
34893507
* @functypedef
34903508
*
@@ -3626,7 +3644,8 @@ typedef int (*ngtcp2_get_path_challenge_data2)(ngtcp2_conn *conn,
36263644
#defineNGTCP2_CALLBACKS_V1 1
36273645
#defineNGTCP2_CALLBACKS_V2 2
36283646
#defineNGTCP2_CALLBACKS_V3 3
3629-
#defineNGTCP2_CALLBACKS_VERSION NGTCP2_CALLBACKS_V3
3647+
#defineNGTCP2_CALLBACKS_V4 4
3648+
#defineNGTCP2_CALLBACKS_VERSION NGTCP2_CALLBACKS_V4
36303649

36313650
/**
36323651
* @struct
@@ -3964,6 +3983,16 @@ typedef struct ngtcp2_callbacks {
39643983
* .. version-added:: 1.22.0
39653984
*/
39663985
ngtcp2_get_path_challenge_data2get_path_challenge_data2;
3986+
/* The following fields have been added since
3987+
NGTCP2_CALLBACKS_V3. */
3988+
/**
3989+
* :member:`recv_stop_sending` is a callback function which is invoked
3990+
* when a STOP_SENDING frame is received from a remote endpoint. This
3991+
* callback function is optional.
3992+
*
3993+
* .. version-added:: 1.24.0
3994+
*/
3995+
ngtcp2_recv_stop_sendingrecv_stop_sending;
39673996
} ngtcp2_callbacks;
39683997

39693998
/**

‎deps/ngtcp2/ngtcp2/lib/includes/ngtcp2/version.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
*
3737
* Version number of the ngtcp2 library release.
3838
*/
39-
#defineNGTCP2_VERSION "1.23.0"
39+
#defineNGTCP2_VERSION "1.24.0"
4040

4141
/**
4242
* @macro
@@ -46,6 +46,6 @@
4646
* number, 8 bits for minor and 8 bits for patch. Version 1.2.3
4747
* becomes 0x010203.
4848
*/
49-
#defineNGTCP2_VERSION_NUM0x011700
49+
#defineNGTCP2_VERSION_NUM0x011800
5050

5151
#endif/* !defined(NGTCP2_VERSION_H) */

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content

Commit 564c0f4

Browse files
nodejs-github-botaduh95
authored andcommitted
deps: update ngtcp2 to 1.24.0
PR-URL: #64297 Backport-PR-URL: #64675 Reviewed-By: Tim Perry <pimterry@gmail.com> Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
1 parent e3304cd commit 564c0f4

21 files changed

Lines changed: 327 additions & 239 deletions

‎deps/ngtcp2/ngtcp2.gyp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
'ngtcp2/lib/ngtcp2_unreachable.c',
5050
'ngtcp2/lib/ngtcp2_vec.c',
5151
'ngtcp2/lib/ngtcp2_version.c',
52-
'ngtcp2/lib/ngtcp2_window_filter.c',
52+
'ngtcp2/lib/ngtcp2_wf.c',
5353
'ngtcp2/crypto/shared.c'
5454
],
5555
'ngtcp2_sources_ossl': [

‎deps/ngtcp2/ngtcp2/crypto/includes/ngtcp2/ngtcp2_crypto_ossl.h‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,18 @@ NGTCP2_EXTERN SSL *ngtcp2_crypto_ossl_ctx_get_ssl(ngtcp2_crypto_ossl_ctx *ctx);
145145
*/
146146
NGTCP2_EXTERNintngtcp2_crypto_ossl_init(void);
147147

148+
/**
149+
* @function
150+
*
151+
* `ngtcp2_crypto_ossl_free` frees the resources allocated by
152+
* `ngtcp2_crypto_ossl_init`. It is safe to call this function even
153+
* if `ngtcp2_crypto_ossl_init` fails or is not called at all. This
154+
* function might be useful to make some leak detection tools happy.
155+
*
156+
* .. version-added:: 1.24.0
157+
*/
158+
NGTCP2_EXTERNvoidngtcp2_crypto_ossl_free(void);
159+
148160
/**
149161
* @function
150162
*

‎deps/ngtcp2/ngtcp2/crypto/ossl/ossl.c‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,60 @@ int ngtcp2_crypto_ossl_init(void) {
7979
return0;
8080
}
8181

82+
voidngtcp2_crypto_ossl_free(void) {
83+
if (crypto_hkdf) {
84+
EVP_KDF_free(crypto_hkdf);
85+
crypto_hkdf=NULL;
86+
}
87+
88+
if (crypto_sha384) {
89+
EVP_MD_free(crypto_sha384);
90+
crypto_sha384=NULL;
91+
}
92+
93+
if (crypto_sha256) {
94+
EVP_MD_free(crypto_sha256);
95+
crypto_sha256=NULL;
96+
}
97+
98+
#ifndefNGTCP2_NO_CHACHA_POLY1305
99+
if (crypto_chacha20) {
100+
EVP_CIPHER_free(crypto_chacha20);
101+
crypto_chacha20=NULL;
102+
}
103+
104+
if (crypto_chacha20_poly1305) {
105+
EVP_CIPHER_free(crypto_chacha20_poly1305);
106+
crypto_chacha20_poly1305=NULL;
107+
}
108+
#endif/* !defined(NGTCP2_NO_CHACHA_POLY1305) */
109+
110+
if (crypto_aes_256_ecb) {
111+
EVP_CIPHER_free(crypto_aes_256_ecb);
112+
crypto_aes_256_ecb=NULL;
113+
}
114+
115+
if (crypto_aes_128_ecb) {
116+
EVP_CIPHER_free(crypto_aes_128_ecb);
117+
crypto_aes_128_ecb=NULL;
118+
}
119+
120+
if (crypto_aes_128_ccm) {
121+
EVP_CIPHER_free(crypto_aes_128_ccm);
122+
crypto_aes_128_ccm=NULL;
123+
}
124+
125+
if (crypto_aes_256_gcm) {
126+
EVP_CIPHER_free(crypto_aes_256_gcm);
127+
crypto_aes_256_gcm=NULL;
128+
}
129+
130+
if (crypto_aes_128_gcm) {
131+
EVP_CIPHER_free(crypto_aes_128_gcm);
132+
crypto_aes_128_gcm=NULL;
133+
}
134+
}
135+
82136
staticconstEVP_CIPHER*crypto_aead_aes_128_gcm(void) {
83137
if (crypto_aes_128_gcm) {
84138
returncrypto_aes_128_gcm;

‎deps/ngtcp2/ngtcp2/examples/http3_server_proto_codec.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -603,9 +603,9 @@ std::expected<void, Error> ProtoCodec::start_response(Stream *stream) {
603603
nghttp3_pri pri;
604604

605605
if (auto rv =
606-
nghttp3_conn_get_stream_priority(httpconn_, &pri, stream->stream_id);
606+
nghttp3_conn_get_stream_priority2(httpconn_, &pri, stream->stream_id);
607607
rv != 0) {
608-
std::println(stderr, "nghttp3_conn_get_stream_priority: {}",
608+
std::println(stderr, "nghttp3_conn_get_stream_priority2: {}",
609609
nghttp3_strerror(rv));
610610
return std::unexpected{Error::HTTP3};
611611
}

‎deps/ngtcp2/ngtcp2/examples/tls_client_context_ossl.cc‎

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -36,23 +36,16 @@
3636
#include"client_base.h"
3737
#include"template.h"
3838

39-
namespace {
40-
auto _ = [] {
41-
if (ngtcp2_crypto_ossl_init() != 0) {
42-
assert(0);
43-
abort();
44-
}
45-
46-
return0;
47-
}();
48-
} // namespace
49-
5039
extern Config config;
5140

41+
TLSClientContext::TLSClientContext() { ngtcp2_crypto_ossl_init(); }
42+
5243
TLSClientContext::~TLSClientContext() {
5344
if (ssl_ctx_) {
5445
SSL_CTX_free(ssl_ctx_);
5546
}
47+
48+
ngtcp2_crypto_ossl_free();
5649
}
5750

5851
SSL_CTX *TLSClientContext::get_native_handle() const { return ssl_ctx_; }

‎deps/ngtcp2/ngtcp2/examples/tls_client_context_ossl.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ using namespace ngtcp2;
3737

3838
classTLSClientContext {
3939
public:
40-
TLSClientContext() = default;
40+
TLSClientContext();
4141
~TLSClientContext();
4242

4343
std::expected<void, Error> init(constchar *private_key_file,

‎deps/ngtcp2/ngtcp2/examples/tls_server_context_ossl.cc‎

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -37,23 +37,16 @@
3737
#include"server_base.h"
3838
#include"template.h"
3939

40-
namespace {
41-
auto _ = [] {
42-
if (ngtcp2_crypto_ossl_init() != 0) {
43-
assert(0);
44-
abort();
45-
}
46-
47-
return0;
48-
}();
49-
} // namespace
50-
5140
extern Config config;
5241

42+
TLSServerContext::TLSServerContext() { ngtcp2_crypto_ossl_init(); }
43+
5344
TLSServerContext::~TLSServerContext() {
5445
if (ssl_ctx_) {
5546
SSL_CTX_free(ssl_ctx_);
5647
}
48+
49+
ngtcp2_crypto_ossl_free();
5750
}
5851

5952
SSL_CTX *TLSServerContext::get_native_handle() const { return ssl_ctx_; }

‎deps/ngtcp2/ngtcp2/examples/tls_server_context_ossl.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ using namespace ngtcp2;
3737

3838
classTLSServerContext {
3939
public:
40-
TLSServerContext() = default;
40+
TLSServerContext();
4141
~TLSServerContext();
4242

4343
std::expected<void, Error> init(constchar *private_key_file,

‎deps/ngtcp2/ngtcp2/lib/includes/ngtcp2/ngtcp2.h‎

Lines changed: 30 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3485,6 +3485,24 @@ typedef int (*ngtcp2_stream_stop_sending)(ngtcp2_conn *conn, int64_t stream_id,
34853485
void*user_data,
34863486
void*stream_user_data);
34873487

3488+
/**
3489+
* @functypedef
3490+
*
3491+
* :type:`ngtcp2_recv_stop_sending` is invoked when a STOP_SENDING frame
3492+
* is received from a remote endpoint for a stream identified by
3493+
* |stream_id|. |app_error_code| is the application error code carried
3494+
* by the STOP_SENDING frame. This callback is called at most
3495+
* once per stream.
3496+
*
3497+
* The callback function must return 0 if it succeeds. Returning
3498+
* :macro:`NGTCP2_ERR_CALLBACK_FAILURE` makes the library call return
3499+
* immediately.
3500+
*/
3501+
typedefint (*ngtcp2_recv_stop_sending)(ngtcp2_conn*conn, int64_tstream_id,
3502+
uint64_tapp_error_code,
3503+
void*user_data,
3504+
void*stream_user_data);
3505+
34883506
/**
34893507
* @functypedef
34903508
*
@@ -3626,7 +3644,8 @@ typedef int (*ngtcp2_get_path_challenge_data2)(ngtcp2_conn *conn,
36263644
#defineNGTCP2_CALLBACKS_V1 1
36273645
#defineNGTCP2_CALLBACKS_V2 2
36283646
#defineNGTCP2_CALLBACKS_V3 3
3629-
#defineNGTCP2_CALLBACKS_VERSION NGTCP2_CALLBACKS_V3
3647+
#defineNGTCP2_CALLBACKS_V4 4
3648+
#defineNGTCP2_CALLBACKS_VERSION NGTCP2_CALLBACKS_V4
36303649

36313650
/**
36323651
* @struct
@@ -3964,6 +3983,16 @@ typedef struct ngtcp2_callbacks {
39643983
* .. version-added:: 1.22.0
39653984
*/
39663985
ngtcp2_get_path_challenge_data2get_path_challenge_data2;
3986+
/* The following fields have been added since
3987+
NGTCP2_CALLBACKS_V3. */
3988+
/**
3989+
* :member:`recv_stop_sending` is a callback function which is invoked
3990+
* when a STOP_SENDING frame is received from a remote endpoint. This
3991+
* callback function is optional.
3992+
*
3993+
* .. version-added:: 1.24.0
3994+
*/
3995+
ngtcp2_recv_stop_sendingrecv_stop_sending;
39673996
} ngtcp2_callbacks;
39683997

39693998
/**

‎deps/ngtcp2/ngtcp2/lib/includes/ngtcp2/version.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
*
3737
* Version number of the ngtcp2 library release.
3838
*/
39-
#defineNGTCP2_VERSION "1.23.0"
39+
#defineNGTCP2_VERSION "1.24.0"
4040

4141
/**
4242
* @macro
@@ -46,6 +46,6 @@
4646
* number, 8 bits for minor and 8 bits for patch. Version 1.2.3
4747
* becomes 0x010203.
4848
*/
49-
#defineNGTCP2_VERSION_NUM0x011700
49+
#defineNGTCP2_VERSION_NUM0x011800
5050

5151
#endif/* !defined(NGTCP2_VERSION_H) */

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Commit 564c0f4

Browse files
nodejs-github-botaduh95
authored andcommitted
deps: update ngtcp2 to 1.24.0
PR-URL: #64297 Backport-PR-URL: #64675 Reviewed-By: Tim Perry <pimterry@gmail.com> Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
1 parent e3304cd commit 564c0f4

21 files changed

Lines changed: 327 additions & 239 deletions

‎deps/ngtcp2/ngtcp2.gyp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
'ngtcp2/lib/ngtcp2_unreachable.c',
5050
'ngtcp2/lib/ngtcp2_vec.c',
5151
'ngtcp2/lib/ngtcp2_version.c',
52-
'ngtcp2/lib/ngtcp2_window_filter.c',
52+
'ngtcp2/lib/ngtcp2_wf.c',
5353
'ngtcp2/crypto/shared.c'
5454
],
5555
'ngtcp2_sources_ossl': [

‎deps/ngtcp2/ngtcp2/crypto/includes/ngtcp2/ngtcp2_crypto_ossl.h‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,18 @@ NGTCP2_EXTERN SSL *ngtcp2_crypto_ossl_ctx_get_ssl(ngtcp2_crypto_ossl_ctx *ctx);
145145
*/
146146
NGTCP2_EXTERNintngtcp2_crypto_ossl_init(void);
147147

148+
/**
149+
* @function
150+
*
151+
* `ngtcp2_crypto_ossl_free` frees the resources allocated by
152+
* `ngtcp2_crypto_ossl_init`. It is safe to call this function even
153+
* if `ngtcp2_crypto_ossl_init` fails or is not called at all. This
154+
* function might be useful to make some leak detection tools happy.
155+
*
156+
* .. version-added:: 1.24.0
157+
*/
158+
NGTCP2_EXTERNvoidngtcp2_crypto_ossl_free(void);
159+
148160
/**
149161
* @function
150162
*

‎deps/ngtcp2/ngtcp2/crypto/ossl/ossl.c‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,60 @@ int ngtcp2_crypto_ossl_init(void) {
7979
return0;
8080
}
8181

82+
voidngtcp2_crypto_ossl_free(void) {
83+
if (crypto_hkdf) {
84+
EVP_KDF_free(crypto_hkdf);
85+
crypto_hkdf=NULL;
86+
}
87+
88+
if (crypto_sha384) {
89+
EVP_MD_free(crypto_sha384);
90+
crypto_sha384=NULL;
91+
}
92+
93+
if (crypto_sha256) {
94+
EVP_MD_free(crypto_sha256);
95+
crypto_sha256=NULL;
96+
}
97+
98+
#ifndefNGTCP2_NO_CHACHA_POLY1305
99+
if (crypto_chacha20) {
100+
EVP_CIPHER_free(crypto_chacha20);
101+
crypto_chacha20=NULL;
102+
}
103+
104+
if (crypto_chacha20_poly1305) {
105+
EVP_CIPHER_free(crypto_chacha20_poly1305);
106+
crypto_chacha20_poly1305=NULL;
107+
}
108+
#endif/* !defined(NGTCP2_NO_CHACHA_POLY1305) */
109+
110+
if (crypto_aes_256_ecb) {
111+
EVP_CIPHER_free(crypto_aes_256_ecb);
112+
crypto_aes_256_ecb=NULL;
113+
}
114+
115+
if (crypto_aes_128_ecb) {
116+
EVP_CIPHER_free(crypto_aes_128_ecb);
117+
crypto_aes_128_ecb=NULL;
118+
}
119+
120+
if (crypto_aes_128_ccm) {
121+
EVP_CIPHER_free(crypto_aes_128_ccm);
122+
crypto_aes_128_ccm=NULL;
123+
}
124+
125+
if (crypto_aes_256_gcm) {
126+
EVP_CIPHER_free(crypto_aes_256_gcm);
127+
crypto_aes_256_gcm=NULL;
128+
}
129+
130+
if (crypto_aes_128_gcm) {
131+
EVP_CIPHER_free(crypto_aes_128_gcm);
132+
crypto_aes_128_gcm=NULL;
133+
}
134+
}
135+
82136
staticconstEVP_CIPHER*crypto_aead_aes_128_gcm(void) {
83137
if (crypto_aes_128_gcm) {
84138
returncrypto_aes_128_gcm;

‎deps/ngtcp2/ngtcp2/examples/http3_server_proto_codec.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -603,9 +603,9 @@ std::expected<void, Error> ProtoCodec::start_response(Stream *stream) {
603603
nghttp3_pri pri;
604604

605605
if (auto rv =
606-
nghttp3_conn_get_stream_priority(httpconn_, &pri, stream->stream_id);
606+
nghttp3_conn_get_stream_priority2(httpconn_, &pri, stream->stream_id);
607607
rv != 0) {
608-
std::println(stderr, "nghttp3_conn_get_stream_priority: {}",
608+
std::println(stderr, "nghttp3_conn_get_stream_priority2: {}",
609609
nghttp3_strerror(rv));
610610
return std::unexpected{Error::HTTP3};
611611
}

‎deps/ngtcp2/ngtcp2/examples/tls_client_context_ossl.cc‎

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -36,23 +36,16 @@
3636
#include"client_base.h"
3737
#include"template.h"
3838

39-
namespace {
40-
auto _ = [] {
41-
if (ngtcp2_crypto_ossl_init() != 0) {
42-
assert(0);
43-
abort();
44-
}
45-
46-
return0;
47-
}();
48-
} // namespace
49-
5039
extern Config config;
5140

41+
TLSClientContext::TLSClientContext() { ngtcp2_crypto_ossl_init(); }
42+
5243
TLSClientContext::~TLSClientContext() {
5344
if (ssl_ctx_) {
5445
SSL_CTX_free(ssl_ctx_);
5546
}
47+
48+
ngtcp2_crypto_ossl_free();
5649
}
5750

5851
SSL_CTX *TLSClientContext::get_native_handle() const { return ssl_ctx_; }

‎deps/ngtcp2/ngtcp2/examples/tls_client_context_ossl.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ using namespace ngtcp2;
3737

3838
classTLSClientContext {
3939
public:
40-
TLSClientContext() = default;
40+
TLSClientContext();
4141
~TLSClientContext();
4242

4343
std::expected<void, Error> init(constchar *private_key_file,

‎deps/ngtcp2/ngtcp2/examples/tls_server_context_ossl.cc‎

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -37,23 +37,16 @@
3737
#include"server_base.h"
3838
#include"template.h"
3939

40-
namespace {
41-
auto _ = [] {
42-
if (ngtcp2_crypto_ossl_init() != 0) {
43-
assert(0);
44-
abort();
45-
}
46-
47-
return0;
48-
}();
49-
} // namespace
50-
5140
extern Config config;
5241

42+
TLSServerContext::TLSServerContext() { ngtcp2_crypto_ossl_init(); }
43+
5344
TLSServerContext::~TLSServerContext() {
5445
if (ssl_ctx_) {
5546
SSL_CTX_free(ssl_ctx_);
5647
}
48+
49+
ngtcp2_crypto_ossl_free();
5750
}
5851

5952
SSL_CTX *TLSServerContext::get_native_handle() const { return ssl_ctx_; }

‎deps/ngtcp2/ngtcp2/examples/tls_server_context_ossl.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ using namespace ngtcp2;
3737

3838
classTLSServerContext {
3939
public:
40-
TLSServerContext() = default;
40+
TLSServerContext();
4141
~TLSServerContext();
4242

4343
std::expected<void, Error> init(constchar *private_key_file,

‎deps/ngtcp2/ngtcp2/lib/includes/ngtcp2/ngtcp2.h‎

Lines changed: 30 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3485,6 +3485,24 @@ typedef int (*ngtcp2_stream_stop_sending)(ngtcp2_conn *conn, int64_t stream_id,
34853485
void*user_data,
34863486
void*stream_user_data);
34873487

3488+
/**
3489+
* @functypedef
3490+
*
3491+
* :type:`ngtcp2_recv_stop_sending` is invoked when a STOP_SENDING frame
3492+
* is received from a remote endpoint for a stream identified by
3493+
* |stream_id|. |app_error_code| is the application error code carried
3494+
* by the STOP_SENDING frame. This callback is called at most
3495+
* once per stream.
3496+
*
3497+
* The callback function must return 0 if it succeeds. Returning
3498+
* :macro:`NGTCP2_ERR_CALLBACK_FAILURE` makes the library call return
3499+
* immediately.
3500+
*/
3501+
typedefint (*ngtcp2_recv_stop_sending)(ngtcp2_conn*conn, int64_tstream_id,
3502+
uint64_tapp_error_code,
3503+
void*user_data,
3504+
void*stream_user_data);
3505+
34883506
/**
34893507
* @functypedef
34903508
*
@@ -3626,7 +3644,8 @@ typedef int (*ngtcp2_get_path_challenge_data2)(ngtcp2_conn *conn,
36263644
#defineNGTCP2_CALLBACKS_V1 1
36273645
#defineNGTCP2_CALLBACKS_V2 2
36283646
#defineNGTCP2_CALLBACKS_V3 3
3629-
#defineNGTCP2_CALLBACKS_VERSION NGTCP2_CALLBACKS_V3
3647+
#defineNGTCP2_CALLBACKS_V4 4
3648+
#defineNGTCP2_CALLBACKS_VERSION NGTCP2_CALLBACKS_V4
36303649

36313650
/**
36323651
* @struct
@@ -3964,6 +3983,16 @@ typedef struct ngtcp2_callbacks {
39643983
* .. version-added:: 1.22.0
39653984
*/
39663985
ngtcp2_get_path_challenge_data2get_path_challenge_data2;
3986+
/* The following fields have been added since
3987+
NGTCP2_CALLBACKS_V3. */
3988+
/**
3989+
* :member:`recv_stop_sending` is a callback function which is invoked
3990+
* when a STOP_SENDING frame is received from a remote endpoint. This
3991+
* callback function is optional.
3992+
*
3993+
* .. version-added:: 1.24.0
3994+
*/
3995+
ngtcp2_recv_stop_sendingrecv_stop_sending;
39673996
} ngtcp2_callbacks;
39683997

39693998
/**

‎deps/ngtcp2/ngtcp2/lib/includes/ngtcp2/version.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
*
3737
* Version number of the ngtcp2 library release.
3838
*/
39-
#defineNGTCP2_VERSION "1.23.0"
39+
#defineNGTCP2_VERSION "1.24.0"
4040

4141
/**
4242
* @macro
@@ -46,6 +46,6 @@
4646
* number, 8 bits for minor and 8 bits for patch. Version 1.2.3
4747
* becomes 0x010203.
4848
*/
49-
#defineNGTCP2_VERSION_NUM0x011700
49+
#defineNGTCP2_VERSION_NUM0x011800
5050

5151
#endif/* !defined(NGTCP2_VERSION_H) */

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Commit 564c0f4

Browse files
nodejs-github-botaduh95
authored andcommitted
deps: update ngtcp2 to 1.24.0
PR-URL: #64297 Backport-PR-URL: #64675 Reviewed-By: Tim Perry <pimterry@gmail.com> Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
1 parent e3304cd commit 564c0f4

21 files changed

Lines changed: 327 additions & 239 deletions

‎deps/ngtcp2/ngtcp2.gyp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
'ngtcp2/lib/ngtcp2_unreachable.c',
5050
'ngtcp2/lib/ngtcp2_vec.c',
5151
'ngtcp2/lib/ngtcp2_version.c',
52-
'ngtcp2/lib/ngtcp2_window_filter.c',
52+
'ngtcp2/lib/ngtcp2_wf.c',
5353
'ngtcp2/crypto/shared.c'
5454
],
5555
'ngtcp2_sources_ossl': [

‎deps/ngtcp2/ngtcp2/crypto/includes/ngtcp2/ngtcp2_crypto_ossl.h‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,18 @@ NGTCP2_EXTERN SSL *ngtcp2_crypto_ossl_ctx_get_ssl(ngtcp2_crypto_ossl_ctx *ctx);
145145
*/
146146
NGTCP2_EXTERNintngtcp2_crypto_ossl_init(void);
147147

148+
/**
149+
* @function
150+
*
151+
* `ngtcp2_crypto_ossl_free` frees the resources allocated by
152+
* `ngtcp2_crypto_ossl_init`. It is safe to call this function even
153+
* if `ngtcp2_crypto_ossl_init` fails or is not called at all. This
154+
* function might be useful to make some leak detection tools happy.
155+
*
156+
* .. version-added:: 1.24.0
157+
*/
158+
NGTCP2_EXTERNvoidngtcp2_crypto_ossl_free(void);
159+
148160
/**
149161
* @function
150162
*

‎deps/ngtcp2/ngtcp2/crypto/ossl/ossl.c‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,60 @@ int ngtcp2_crypto_ossl_init(void) {
7979
return0;
8080
}
8181

82+
voidngtcp2_crypto_ossl_free(void) {
83+
if (crypto_hkdf) {
84+
EVP_KDF_free(crypto_hkdf);
85+
crypto_hkdf=NULL;
86+
}
87+
88+
if (crypto_sha384) {
89+
EVP_MD_free(crypto_sha384);
90+
crypto_sha384=NULL;
91+
}
92+
93+
if (crypto_sha256) {
94+
EVP_MD_free(crypto_sha256);
95+
crypto_sha256=NULL;
96+
}
97+
98+
#ifndefNGTCP2_NO_CHACHA_POLY1305
99+
if (crypto_chacha20) {
100+
EVP_CIPHER_free(crypto_chacha20);
101+
crypto_chacha20=NULL;
102+
}
103+
104+
if (crypto_chacha20_poly1305) {
105+
EVP_CIPHER_free(crypto_chacha20_poly1305);
106+
crypto_chacha20_poly1305=NULL;
107+
}
108+
#endif/* !defined(NGTCP2_NO_CHACHA_POLY1305) */
109+
110+
if (crypto_aes_256_ecb) {
111+
EVP_CIPHER_free(crypto_aes_256_ecb);
112+
crypto_aes_256_ecb=NULL;
113+
}
114+
115+
if (crypto_aes_128_ecb) {
116+
EVP_CIPHER_free(crypto_aes_128_ecb);
117+
crypto_aes_128_ecb=NULL;
118+
}
119+
120+
if (crypto_aes_128_ccm) {
121+
EVP_CIPHER_free(crypto_aes_128_ccm);
122+
crypto_aes_128_ccm=NULL;
123+
}
124+
125+
if (crypto_aes_256_gcm) {
126+
EVP_CIPHER_free(crypto_aes_256_gcm);
127+
crypto_aes_256_gcm=NULL;
128+
}
129+
130+
if (crypto_aes_128_gcm) {
131+
EVP_CIPHER_free(crypto_aes_128_gcm);
132+
crypto_aes_128_gcm=NULL;
133+
}
134+
}
135+
82136
staticconstEVP_CIPHER*crypto_aead_aes_128_gcm(void) {
83137
if (crypto_aes_128_gcm) {
84138
returncrypto_aes_128_gcm;

‎deps/ngtcp2/ngtcp2/examples/http3_server_proto_codec.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -603,9 +603,9 @@ std::expected<void, Error> ProtoCodec::start_response(Stream *stream) {
603603
nghttp3_pri pri;
604604

605605
if (auto rv =
606-
nghttp3_conn_get_stream_priority(httpconn_, &pri, stream->stream_id);
606+
nghttp3_conn_get_stream_priority2(httpconn_, &pri, stream->stream_id);
607607
rv != 0) {
608-
std::println(stderr, "nghttp3_conn_get_stream_priority: {}",
608+
std::println(stderr, "nghttp3_conn_get_stream_priority2: {}",
609609
nghttp3_strerror(rv));
610610
return std::unexpected{Error::HTTP3};
611611
}

‎deps/ngtcp2/ngtcp2/examples/tls_client_context_ossl.cc‎

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -36,23 +36,16 @@
3636
#include"client_base.h"
3737
#include"template.h"
3838

39-
namespace {
40-
auto _ = [] {
41-
if (ngtcp2_crypto_ossl_init() != 0) {
42-
assert(0);
43-
abort();
44-
}
45-
46-
return0;
47-
}();
48-
} // namespace
49-
5039
extern Config config;
5140

41+
TLSClientContext::TLSClientContext() { ngtcp2_crypto_ossl_init(); }
42+
5243
TLSClientContext::~TLSClientContext() {
5344
if (ssl_ctx_) {
5445
SSL_CTX_free(ssl_ctx_);
5546
}
47+
48+
ngtcp2_crypto_ossl_free();
5649
}
5750

5851
SSL_CTX *TLSClientContext::get_native_handle() const { return ssl_ctx_; }

‎deps/ngtcp2/ngtcp2/examples/tls_client_context_ossl.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ using namespace ngtcp2;
3737

3838
classTLSClientContext {
3939
public:
40-
TLSClientContext() = default;
40+
TLSClientContext();
4141
~TLSClientContext();
4242

4343
std::expected<void, Error> init(constchar *private_key_file,

‎deps/ngtcp2/ngtcp2/examples/tls_server_context_ossl.cc‎

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -37,23 +37,16 @@
3737
#include"server_base.h"
3838
#include"template.h"
3939

40-
namespace {
41-
auto _ = [] {
42-
if (ngtcp2_crypto_ossl_init() != 0) {
43-
assert(0);
44-
abort();
45-
}
46-
47-
return0;
48-
}();
49-
} // namespace
50-
5140
extern Config config;
5241

42+
TLSServerContext::TLSServerContext() { ngtcp2_crypto_ossl_init(); }
43+
5344
TLSServerContext::~TLSServerContext() {
5445
if (ssl_ctx_) {
5546
SSL_CTX_free(ssl_ctx_);
5647
}
48+
49+
ngtcp2_crypto_ossl_free();
5750
}
5851

5952
SSL_CTX *TLSServerContext::get_native_handle() const { return ssl_ctx_; }

‎deps/ngtcp2/ngtcp2/examples/tls_server_context_ossl.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ using namespace ngtcp2;
3737

3838
classTLSServerContext {
3939
public:
40-
TLSServerContext() = default;
40+
TLSServerContext();
4141
~TLSServerContext();
4242

4343
std::expected<void, Error> init(constchar *private_key_file,

‎deps/ngtcp2/ngtcp2/lib/includes/ngtcp2/ngtcp2.h‎

Lines changed: 30 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3485,6 +3485,24 @@ typedef int (*ngtcp2_stream_stop_sending)(ngtcp2_conn *conn, int64_t stream_id,
34853485
void*user_data,
34863486
void*stream_user_data);
34873487

3488+
/**
3489+
* @functypedef
3490+
*
3491+
* :type:`ngtcp2_recv_stop_sending` is invoked when a STOP_SENDING frame
3492+
* is received from a remote endpoint for a stream identified by
3493+
* |stream_id|. |app_error_code| is the application error code carried
3494+
* by the STOP_SENDING frame. This callback is called at most
3495+
* once per stream.
3496+
*
3497+
* The callback function must return 0 if it succeeds. Returning
3498+
* :macro:`NGTCP2_ERR_CALLBACK_FAILURE` makes the library call return
3499+
* immediately.
3500+
*/
3501+
typedefint (*ngtcp2_recv_stop_sending)(ngtcp2_conn*conn, int64_tstream_id,
3502+
uint64_tapp_error_code,
3503+
void*user_data,
3504+
void*stream_user_data);
3505+
34883506
/**
34893507
* @functypedef
34903508
*
@@ -3626,7 +3644,8 @@ typedef int (*ngtcp2_get_path_challenge_data2)(ngtcp2_conn *conn,
36263644
#defineNGTCP2_CALLBACKS_V1 1
36273645
#defineNGTCP2_CALLBACKS_V2 2
36283646
#defineNGTCP2_CALLBACKS_V3 3
3629-
#defineNGTCP2_CALLBACKS_VERSION NGTCP2_CALLBACKS_V3
3647+
#defineNGTCP2_CALLBACKS_V4 4
3648+
#defineNGTCP2_CALLBACKS_VERSION NGTCP2_CALLBACKS_V4
36303649

36313650
/**
36323651
* @struct
@@ -3964,6 +3983,16 @@ typedef struct ngtcp2_callbacks {
39643983
* .. version-added:: 1.22.0
39653984
*/
39663985
ngtcp2_get_path_challenge_data2get_path_challenge_data2;
3986+
/* The following fields have been added since
3987+
NGTCP2_CALLBACKS_V3. */
3988+
/**
3989+
* :member:`recv_stop_sending` is a callback function which is invoked
3990+
* when a STOP_SENDING frame is received from a remote endpoint. This
3991+
* callback function is optional.
3992+
*
3993+
* .. version-added:: 1.24.0
3994+
*/
3995+
ngtcp2_recv_stop_sendingrecv_stop_sending;
39673996
} ngtcp2_callbacks;
39683997

39693998
/**

‎deps/ngtcp2/ngtcp2/lib/includes/ngtcp2/version.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
*
3737
* Version number of the ngtcp2 library release.
3838
*/
39-
#defineNGTCP2_VERSION "1.23.0"
39+
#defineNGTCP2_VERSION "1.24.0"
4040

4141
/**
4242
* @macro
@@ -46,6 +46,6 @@
4646
* number, 8 bits for minor and 8 bits for patch. Version 1.2.3
4747
* becomes 0x010203.
4848
*/
49-
#defineNGTCP2_VERSION_NUM0x011700
49+
#defineNGTCP2_VERSION_NUM0x011800
5050

5151
#endif/* !defined(NGTCP2_VERSION_H) */

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content

Commit 564c0f4

Browse files
nodejs-github-botaduh95
authored andcommitted
deps: update ngtcp2 to 1.24.0
PR-URL: #64297 Backport-PR-URL: #64675 Reviewed-By: Tim Perry <pimterry@gmail.com> Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
1 parent e3304cd commit 564c0f4

21 files changed

Lines changed: 327 additions & 239 deletions

‎deps/ngtcp2/ngtcp2.gyp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
'ngtcp2/lib/ngtcp2_unreachable.c',
5050
'ngtcp2/lib/ngtcp2_vec.c',
5151
'ngtcp2/lib/ngtcp2_version.c',
52-
'ngtcp2/lib/ngtcp2_window_filter.c',
52+
'ngtcp2/lib/ngtcp2_wf.c',
5353
'ngtcp2/crypto/shared.c'
5454
],
5555
'ngtcp2_sources_ossl': [

‎deps/ngtcp2/ngtcp2/crypto/includes/ngtcp2/ngtcp2_crypto_ossl.h‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,18 @@ NGTCP2_EXTERN SSL *ngtcp2_crypto_ossl_ctx_get_ssl(ngtcp2_crypto_ossl_ctx *ctx);
145145
*/
146146
NGTCP2_EXTERNintngtcp2_crypto_ossl_init(void);
147147

148+
/**
149+
* @function
150+
*
151+
* `ngtcp2_crypto_ossl_free` frees the resources allocated by
152+
* `ngtcp2_crypto_ossl_init`. It is safe to call this function even
153+
* if `ngtcp2_crypto_ossl_init` fails or is not called at all. This
154+
* function might be useful to make some leak detection tools happy.
155+
*
156+
* .. version-added:: 1.24.0
157+
*/
158+
NGTCP2_EXTERNvoidngtcp2_crypto_ossl_free(void);
159+
148160
/**
149161
* @function
150162
*

‎deps/ngtcp2/ngtcp2/crypto/ossl/ossl.c‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,60 @@ int ngtcp2_crypto_ossl_init(void) {
7979
return0;
8080
}
8181

82+
voidngtcp2_crypto_ossl_free(void) {
83+
if (crypto_hkdf) {
84+
EVP_KDF_free(crypto_hkdf);
85+
crypto_hkdf=NULL;
86+
}
87+
88+
if (crypto_sha384) {
89+
EVP_MD_free(crypto_sha384);
90+
crypto_sha384=NULL;
91+
}
92+
93+
if (crypto_sha256) {
94+
EVP_MD_free(crypto_sha256);
95+
crypto_sha256=NULL;
96+
}
97+
98+
#ifndefNGTCP2_NO_CHACHA_POLY1305
99+
if (crypto_chacha20) {
100+
EVP_CIPHER_free(crypto_chacha20);
101+
crypto_chacha20=NULL;
102+
}
103+
104+
if (crypto_chacha20_poly1305) {
105+
EVP_CIPHER_free(crypto_chacha20_poly1305);
106+
crypto_chacha20_poly1305=NULL;
107+
}
108+
#endif/* !defined(NGTCP2_NO_CHACHA_POLY1305) */
109+
110+
if (crypto_aes_256_ecb) {
111+
EVP_CIPHER_free(crypto_aes_256_ecb);
112+
crypto_aes_256_ecb=NULL;
113+
}
114+
115+
if (crypto_aes_128_ecb) {
116+
EVP_CIPHER_free(crypto_aes_128_ecb);
117+
crypto_aes_128_ecb=NULL;
118+
}
119+
120+
if (crypto_aes_128_ccm) {
121+
EVP_CIPHER_free(crypto_aes_128_ccm);
122+
crypto_aes_128_ccm=NULL;
123+
}
124+
125+
if (crypto_aes_256_gcm) {
126+
EVP_CIPHER_free(crypto_aes_256_gcm);
127+
crypto_aes_256_gcm=NULL;
128+
}
129+
130+
if (crypto_aes_128_gcm) {
131+
EVP_CIPHER_free(crypto_aes_128_gcm);
132+
crypto_aes_128_gcm=NULL;
133+
}
134+
}
135+
82136
staticconstEVP_CIPHER*crypto_aead_aes_128_gcm(void) {
83137
if (crypto_aes_128_gcm) {
84138
returncrypto_aes_128_gcm;

‎deps/ngtcp2/ngtcp2/examples/http3_server_proto_codec.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -603,9 +603,9 @@ std::expected<void, Error> ProtoCodec::start_response(Stream *stream) {
603603
nghttp3_pri pri;
604604

605605
if (auto rv =
606-
nghttp3_conn_get_stream_priority(httpconn_, &pri, stream->stream_id);
606+
nghttp3_conn_get_stream_priority2(httpconn_, &pri, stream->stream_id);
607607
rv != 0) {
608-
std::println(stderr, "nghttp3_conn_get_stream_priority: {}",
608+
std::println(stderr, "nghttp3_conn_get_stream_priority2: {}",
609609
nghttp3_strerror(rv));
610610
return std::unexpected{Error::HTTP3};
611611
}

‎deps/ngtcp2/ngtcp2/examples/tls_client_context_ossl.cc‎

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -36,23 +36,16 @@
3636
#include"client_base.h"
3737
#include"template.h"
3838

39-
namespace {
40-
auto _ = [] {
41-
if (ngtcp2_crypto_ossl_init() != 0) {
42-
assert(0);
43-
abort();
44-
}
45-
46-
return0;
47-
}();
48-
} // namespace
49-
5039
extern Config config;
5140

41+
TLSClientContext::TLSClientContext() { ngtcp2_crypto_ossl_init(); }
42+
5243
TLSClientContext::~TLSClientContext() {
5344
if (ssl_ctx_) {
5445
SSL_CTX_free(ssl_ctx_);
5546
}
47+
48+
ngtcp2_crypto_ossl_free();
5649
}
5750

5851
SSL_CTX *TLSClientContext::get_native_handle() const { return ssl_ctx_; }

‎deps/ngtcp2/ngtcp2/examples/tls_client_context_ossl.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ using namespace ngtcp2;
3737

3838
classTLSClientContext {
3939
public:
40-
TLSClientContext() = default;
40+
TLSClientContext();
4141
~TLSClientContext();
4242

4343
std::expected<void, Error> init(constchar *private_key_file,

‎deps/ngtcp2/ngtcp2/examples/tls_server_context_ossl.cc‎

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -37,23 +37,16 @@
3737
#include"server_base.h"
3838
#include"template.h"
3939

40-
namespace {
41-
auto _ = [] {
42-
if (ngtcp2_crypto_ossl_init() != 0) {
43-
assert(0);
44-
abort();
45-
}
46-
47-
return0;
48-
}();
49-
} // namespace
50-
5140
extern Config config;
5241

42+
TLSServerContext::TLSServerContext() { ngtcp2_crypto_ossl_init(); }
43+
5344
TLSServerContext::~TLSServerContext() {
5445
if (ssl_ctx_) {
5546
SSL_CTX_free(ssl_ctx_);
5647
}
48+
49+
ngtcp2_crypto_ossl_free();
5750
}
5851

5952
SSL_CTX *TLSServerContext::get_native_handle() const { return ssl_ctx_; }

‎deps/ngtcp2/ngtcp2/examples/tls_server_context_ossl.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ using namespace ngtcp2;
3737

3838
classTLSServerContext {
3939
public:
40-
TLSServerContext() = default;
40+
TLSServerContext();
4141
~TLSServerContext();
4242

4343
std::expected<void, Error> init(constchar *private_key_file,

‎deps/ngtcp2/ngtcp2/lib/includes/ngtcp2/ngtcp2.h‎

Lines changed: 30 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3485,6 +3485,24 @@ typedef int (*ngtcp2_stream_stop_sending)(ngtcp2_conn *conn, int64_t stream_id,
34853485
void*user_data,
34863486
void*stream_user_data);
34873487

3488+
/**
3489+
* @functypedef
3490+
*
3491+
* :type:`ngtcp2_recv_stop_sending` is invoked when a STOP_SENDING frame
3492+
* is received from a remote endpoint for a stream identified by
3493+
* |stream_id|. |app_error_code| is the application error code carried
3494+
* by the STOP_SENDING frame. This callback is called at most
3495+
* once per stream.
3496+
*
3497+
* The callback function must return 0 if it succeeds. Returning
3498+
* :macro:`NGTCP2_ERR_CALLBACK_FAILURE` makes the library call return
3499+
* immediately.
3500+
*/
3501+
typedefint (*ngtcp2_recv_stop_sending)(ngtcp2_conn*conn, int64_tstream_id,
3502+
uint64_tapp_error_code,
3503+
void*user_data,
3504+
void*stream_user_data);
3505+
34883506
/**
34893507
* @functypedef
34903508
*
@@ -3626,7 +3644,8 @@ typedef int (*ngtcp2_get_path_challenge_data2)(ngtcp2_conn *conn,
36263644
#defineNGTCP2_CALLBACKS_V1 1
36273645
#defineNGTCP2_CALLBACKS_V2 2
36283646
#defineNGTCP2_CALLBACKS_V3 3
3629-
#defineNGTCP2_CALLBACKS_VERSION NGTCP2_CALLBACKS_V3
3647+
#defineNGTCP2_CALLBACKS_V4 4
3648+
#defineNGTCP2_CALLBACKS_VERSION NGTCP2_CALLBACKS_V4
36303649

36313650
/**
36323651
* @struct
@@ -3964,6 +3983,16 @@ typedef struct ngtcp2_callbacks {
39643983
* .. version-added:: 1.22.0
39653984
*/
39663985
ngtcp2_get_path_challenge_data2get_path_challenge_data2;
3986+
/* The following fields have been added since
3987+
NGTCP2_CALLBACKS_V3. */
3988+
/**
3989+
* :member:`recv_stop_sending` is a callback function which is invoked
3990+
* when a STOP_SENDING frame is received from a remote endpoint. This
3991+
* callback function is optional.
3992+
*
3993+
* .. version-added:: 1.24.0
3994+
*/
3995+
ngtcp2_recv_stop_sendingrecv_stop_sending;
39673996
} ngtcp2_callbacks;
39683997

39693998
/**

‎deps/ngtcp2/ngtcp2/lib/includes/ngtcp2/version.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
*
3737
* Version number of the ngtcp2 library release.
3838
*/
39-
#defineNGTCP2_VERSION "1.23.0"
39+
#defineNGTCP2_VERSION "1.24.0"
4040

4141
/**
4242
* @macro
@@ -46,6 +46,6 @@
4646
* number, 8 bits for minor and 8 bits for patch. Version 1.2.3
4747
* becomes 0x010203.
4848
*/
49-
#defineNGTCP2_VERSION_NUM0x011700
49+
#defineNGTCP2_VERSION_NUM0x011800
5050

5151
#endif/* !defined(NGTCP2_VERSION_H) */

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Commit 564c0f4

Browse files
nodejs-github-botaduh95
authored andcommitted
deps: update ngtcp2 to 1.24.0
PR-URL: #64297 Backport-PR-URL: #64675 Reviewed-By: Tim Perry <pimterry@gmail.com> Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
1 parent e3304cd commit 564c0f4

21 files changed

Lines changed: 327 additions & 239 deletions

‎deps/ngtcp2/ngtcp2.gyp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
'ngtcp2/lib/ngtcp2_unreachable.c',
5050
'ngtcp2/lib/ngtcp2_vec.c',
5151
'ngtcp2/lib/ngtcp2_version.c',
52-
'ngtcp2/lib/ngtcp2_window_filter.c',
52+
'ngtcp2/lib/ngtcp2_wf.c',
5353
'ngtcp2/crypto/shared.c'
5454
],
5555
'ngtcp2_sources_ossl': [

‎deps/ngtcp2/ngtcp2/crypto/includes/ngtcp2/ngtcp2_crypto_ossl.h‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,18 @@ NGTCP2_EXTERN SSL *ngtcp2_crypto_ossl_ctx_get_ssl(ngtcp2_crypto_ossl_ctx *ctx);
145145
*/
146146
NGTCP2_EXTERNintngtcp2_crypto_ossl_init(void);
147147

148+
/**
149+
* @function
150+
*
151+
* `ngtcp2_crypto_ossl_free` frees the resources allocated by
152+
* `ngtcp2_crypto_ossl_init`. It is safe to call this function even
153+
* if `ngtcp2_crypto_ossl_init` fails or is not called at all. This
154+
* function might be useful to make some leak detection tools happy.
155+
*
156+
* .. version-added:: 1.24.0
157+
*/
158+
NGTCP2_EXTERNvoidngtcp2_crypto_ossl_free(void);
159+
148160
/**
149161
* @function
150162
*

‎deps/ngtcp2/ngtcp2/crypto/ossl/ossl.c‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,60 @@ int ngtcp2_crypto_ossl_init(void) {
7979
return0;
8080
}
8181

82+
voidngtcp2_crypto_ossl_free(void) {
83+
if (crypto_hkdf) {
84+
EVP_KDF_free(crypto_hkdf);
85+
crypto_hkdf=NULL;
86+
}
87+
88+
if (crypto_sha384) {
89+
EVP_MD_free(crypto_sha384);
90+
crypto_sha384=NULL;
91+
}
92+
93+
if (crypto_sha256) {
94+
EVP_MD_free(crypto_sha256);
95+
crypto_sha256=NULL;
96+
}
97+
98+
#ifndefNGTCP2_NO_CHACHA_POLY1305
99+
if (crypto_chacha20) {
100+
EVP_CIPHER_free(crypto_chacha20);
101+
crypto_chacha20=NULL;
102+
}
103+
104+
if (crypto_chacha20_poly1305) {
105+
EVP_CIPHER_free(crypto_chacha20_poly1305);
106+
crypto_chacha20_poly1305=NULL;
107+
}
108+
#endif/* !defined(NGTCP2_NO_CHACHA_POLY1305) */
109+
110+
if (crypto_aes_256_ecb) {
111+
EVP_CIPHER_free(crypto_aes_256_ecb);
112+
crypto_aes_256_ecb=NULL;
113+
}
114+
115+
if (crypto_aes_128_ecb) {
116+
EVP_CIPHER_free(crypto_aes_128_ecb);
117+
crypto_aes_128_ecb=NULL;
118+
}
119+
120+
if (crypto_aes_128_ccm) {
121+
EVP_CIPHER_free(crypto_aes_128_ccm);
122+
crypto_aes_128_ccm=NULL;
123+
}
124+
125+
if (crypto_aes_256_gcm) {
126+
EVP_CIPHER_free(crypto_aes_256_gcm);
127+
crypto_aes_256_gcm=NULL;
128+
}
129+
130+
if (crypto_aes_128_gcm) {
131+
EVP_CIPHER_free(crypto_aes_128_gcm);
132+
crypto_aes_128_gcm=NULL;
133+
}
134+
}
135+
82136
staticconstEVP_CIPHER*crypto_aead_aes_128_gcm(void) {
83137
if (crypto_aes_128_gcm) {
84138
returncrypto_aes_128_gcm;

‎deps/ngtcp2/ngtcp2/examples/http3_server_proto_codec.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -603,9 +603,9 @@ std::expected<void, Error> ProtoCodec::start_response(Stream *stream) {
603603
nghttp3_pri pri;
604604

605605
if (auto rv =
606-
nghttp3_conn_get_stream_priority(httpconn_, &pri, stream->stream_id);
606+
nghttp3_conn_get_stream_priority2(httpconn_, &pri, stream->stream_id);
607607
rv != 0) {
608-
std::println(stderr, "nghttp3_conn_get_stream_priority: {}",
608+
std::println(stderr, "nghttp3_conn_get_stream_priority2: {}",
609609
nghttp3_strerror(rv));
610610
return std::unexpected{Error::HTTP3};
611611
}

‎deps/ngtcp2/ngtcp2/examples/tls_client_context_ossl.cc‎

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -36,23 +36,16 @@
3636
#include"client_base.h"
3737
#include"template.h"
3838

39-
namespace {
40-
auto _ = [] {
41-
if (ngtcp2_crypto_ossl_init() != 0) {
42-
assert(0);
43-
abort();
44-
}
45-
46-
return0;
47-
}();
48-
} // namespace
49-
5039
extern Config config;
5140

41+
TLSClientContext::TLSClientContext() { ngtcp2_crypto_ossl_init(); }
42+
5243
TLSClientContext::~TLSClientContext() {
5344
if (ssl_ctx_) {
5445
SSL_CTX_free(ssl_ctx_);
5546
}
47+
48+
ngtcp2_crypto_ossl_free();
5649
}
5750

5851
SSL_CTX *TLSClientContext::get_native_handle() const { return ssl_ctx_; }

‎deps/ngtcp2/ngtcp2/examples/tls_client_context_ossl.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ using namespace ngtcp2;
3737

3838
classTLSClientContext {
3939
public:
40-
TLSClientContext() = default;
40+
TLSClientContext();
4141
~TLSClientContext();
4242

4343
std::expected<void, Error> init(constchar *private_key_file,

‎deps/ngtcp2/ngtcp2/examples/tls_server_context_ossl.cc‎

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -37,23 +37,16 @@
3737
#include"server_base.h"
3838
#include"template.h"
3939

40-
namespace {
41-
auto _ = [] {
42-
if (ngtcp2_crypto_ossl_init() != 0) {
43-
assert(0);
44-
abort();
45-
}
46-
47-
return0;
48-
}();
49-
} // namespace
50-
5140
extern Config config;
5241

42+
TLSServerContext::TLSServerContext() { ngtcp2_crypto_ossl_init(); }
43+
5344
TLSServerContext::~TLSServerContext() {
5445
if (ssl_ctx_) {
5546
SSL_CTX_free(ssl_ctx_);
5647
}
48+
49+
ngtcp2_crypto_ossl_free();
5750
}
5851

5952
SSL_CTX *TLSServerContext::get_native_handle() const { return ssl_ctx_; }

‎deps/ngtcp2/ngtcp2/examples/tls_server_context_ossl.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ using namespace ngtcp2;
3737

3838
classTLSServerContext {
3939
public:
40-
TLSServerContext() = default;
40+
TLSServerContext();
4141
~TLSServerContext();
4242

4343
std::expected<void, Error> init(constchar *private_key_file,

‎deps/ngtcp2/ngtcp2/lib/includes/ngtcp2/ngtcp2.h‎

Lines changed: 30 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3485,6 +3485,24 @@ typedef int (*ngtcp2_stream_stop_sending)(ngtcp2_conn *conn, int64_t stream_id,
34853485
void*user_data,
34863486
void*stream_user_data);
34873487

3488+
/**
3489+
* @functypedef
3490+
*
3491+
* :type:`ngtcp2_recv_stop_sending` is invoked when a STOP_SENDING frame
3492+
* is received from a remote endpoint for a stream identified by
3493+
* |stream_id|. |app_error_code| is the application error code carried
3494+
* by the STOP_SENDING frame. This callback is called at most
3495+
* once per stream.
3496+
*
3497+
* The callback function must return 0 if it succeeds. Returning
3498+
* :macro:`NGTCP2_ERR_CALLBACK_FAILURE` makes the library call return
3499+
* immediately.
3500+
*/
3501+
typedefint (*ngtcp2_recv_stop_sending)(ngtcp2_conn*conn, int64_tstream_id,
3502+
uint64_tapp_error_code,
3503+
void*user_data,
3504+
void*stream_user_data);
3505+
34883506
/**
34893507
* @functypedef
34903508
*
@@ -3626,7 +3644,8 @@ typedef int (*ngtcp2_get_path_challenge_data2)(ngtcp2_conn *conn,
36263644
#defineNGTCP2_CALLBACKS_V1 1
36273645
#defineNGTCP2_CALLBACKS_V2 2
36283646
#defineNGTCP2_CALLBACKS_V3 3
3629-
#defineNGTCP2_CALLBACKS_VERSION NGTCP2_CALLBACKS_V3
3647+
#defineNGTCP2_CALLBACKS_V4 4
3648+
#defineNGTCP2_CALLBACKS_VERSION NGTCP2_CALLBACKS_V4
36303649

36313650
/**
36323651
* @struct
@@ -3964,6 +3983,16 @@ typedef struct ngtcp2_callbacks {
39643983
* .. version-added:: 1.22.0
39653984
*/
39663985
ngtcp2_get_path_challenge_data2get_path_challenge_data2;
3986+
/* The following fields have been added since
3987+
NGTCP2_CALLBACKS_V3. */
3988+
/**
3989+
* :member:`recv_stop_sending` is a callback function which is invoked
3990+
* when a STOP_SENDING frame is received from a remote endpoint. This
3991+
* callback function is optional.
3992+
*
3993+
* .. version-added:: 1.24.0
3994+
*/
3995+
ngtcp2_recv_stop_sendingrecv_stop_sending;
39673996
} ngtcp2_callbacks;
39683997

39693998
/**

‎deps/ngtcp2/ngtcp2/lib/includes/ngtcp2/version.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
*
3737
* Version number of the ngtcp2 library release.
3838
*/
39-
#defineNGTCP2_VERSION "1.23.0"
39+
#defineNGTCP2_VERSION "1.24.0"
4040

4141
/**
4242
* @macro
@@ -46,6 +46,6 @@
4646
* number, 8 bits for minor and 8 bits for patch. Version 1.2.3
4747
* becomes 0x010203.
4848
*/
49-
#defineNGTCP2_VERSION_NUM0x011700
49+
#defineNGTCP2_VERSION_NUM0x011800
5050

5151
#endif/* !defined(NGTCP2_VERSION_H) */

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Commit 564c0f4

Browse files
nodejs-github-botaduh95
authored andcommitted
deps: update ngtcp2 to 1.24.0
PR-URL: #64297 Backport-PR-URL: #64675 Reviewed-By: Tim Perry <pimterry@gmail.com> Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
1 parent e3304cd commit 564c0f4

21 files changed

Lines changed: 327 additions & 239 deletions

‎deps/ngtcp2/ngtcp2.gyp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
'ngtcp2/lib/ngtcp2_unreachable.c',
5050
'ngtcp2/lib/ngtcp2_vec.c',
5151
'ngtcp2/lib/ngtcp2_version.c',
52-
'ngtcp2/lib/ngtcp2_window_filter.c',
52+
'ngtcp2/lib/ngtcp2_wf.c',
5353
'ngtcp2/crypto/shared.c'
5454
],
5555
'ngtcp2_sources_ossl': [

‎deps/ngtcp2/ngtcp2/crypto/includes/ngtcp2/ngtcp2_crypto_ossl.h‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,18 @@ NGTCP2_EXTERN SSL *ngtcp2_crypto_ossl_ctx_get_ssl(ngtcp2_crypto_ossl_ctx *ctx);
145145
*/
146146
NGTCP2_EXTERNintngtcp2_crypto_ossl_init(void);
147147

148+
/**
149+
* @function
150+
*
151+
* `ngtcp2_crypto_ossl_free` frees the resources allocated by
152+
* `ngtcp2_crypto_ossl_init`. It is safe to call this function even
153+
* if `ngtcp2_crypto_ossl_init` fails or is not called at all. This
154+
* function might be useful to make some leak detection tools happy.
155+
*
156+
* .. version-added:: 1.24.0
157+
*/
158+
NGTCP2_EXTERNvoidngtcp2_crypto_ossl_free(void);
159+
148160
/**
149161
* @function
150162
*

‎deps/ngtcp2/ngtcp2/crypto/ossl/ossl.c‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,60 @@ int ngtcp2_crypto_ossl_init(void) {
7979
return0;
8080
}
8181

82+
voidngtcp2_crypto_ossl_free(void) {
83+
if (crypto_hkdf) {
84+
EVP_KDF_free(crypto_hkdf);
85+
crypto_hkdf=NULL;
86+
}
87+
88+
if (crypto_sha384) {
89+
EVP_MD_free(crypto_sha384);
90+
crypto_sha384=NULL;
91+
}
92+
93+
if (crypto_sha256) {
94+
EVP_MD_free(crypto_sha256);
95+
crypto_sha256=NULL;
96+
}
97+
98+
#ifndefNGTCP2_NO_CHACHA_POLY1305
99+
if (crypto_chacha20) {
100+
EVP_CIPHER_free(crypto_chacha20);
101+
crypto_chacha20=NULL;
102+
}
103+
104+
if (crypto_chacha20_poly1305) {
105+
EVP_CIPHER_free(crypto_chacha20_poly1305);
106+
crypto_chacha20_poly1305=NULL;
107+
}
108+
#endif/* !defined(NGTCP2_NO_CHACHA_POLY1305) */
109+
110+
if (crypto_aes_256_ecb) {
111+
EVP_CIPHER_free(crypto_aes_256_ecb);
112+
crypto_aes_256_ecb=NULL;
113+
}
114+
115+
if (crypto_aes_128_ecb) {
116+
EVP_CIPHER_free(crypto_aes_128_ecb);
117+
crypto_aes_128_ecb=NULL;
118+
}
119+
120+
if (crypto_aes_128_ccm) {
121+
EVP_CIPHER_free(crypto_aes_128_ccm);
122+
crypto_aes_128_ccm=NULL;
123+
}
124+
125+
if (crypto_aes_256_gcm) {
126+
EVP_CIPHER_free(crypto_aes_256_gcm);
127+
crypto_aes_256_gcm=NULL;
128+
}
129+
130+
if (crypto_aes_128_gcm) {
131+
EVP_CIPHER_free(crypto_aes_128_gcm);
132+
crypto_aes_128_gcm=NULL;
133+
}
134+
}
135+
82136
staticconstEVP_CIPHER*crypto_aead_aes_128_gcm(void) {
83137
if (crypto_aes_128_gcm) {
84138
returncrypto_aes_128_gcm;

‎deps/ngtcp2/ngtcp2/examples/http3_server_proto_codec.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -603,9 +603,9 @@ std::expected<void, Error> ProtoCodec::start_response(Stream *stream) {
603603
nghttp3_pri pri;
604604

605605
if (auto rv =
606-
nghttp3_conn_get_stream_priority(httpconn_, &pri, stream->stream_id);
606+
nghttp3_conn_get_stream_priority2(httpconn_, &pri, stream->stream_id);
607607
rv != 0) {
608-
std::println(stderr, "nghttp3_conn_get_stream_priority: {}",
608+
std::println(stderr, "nghttp3_conn_get_stream_priority2: {}",
609609
nghttp3_strerror(rv));
610610
return std::unexpected{Error::HTTP3};
611611
}

‎deps/ngtcp2/ngtcp2/examples/tls_client_context_ossl.cc‎

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -36,23 +36,16 @@
3636
#include"client_base.h"
3737
#include"template.h"
3838

39-
namespace {
40-
auto _ = [] {
41-
if (ngtcp2_crypto_ossl_init() != 0) {
42-
assert(0);
43-
abort();
44-
}
45-
46-
return0;
47-
}();
48-
} // namespace
49-
5039
extern Config config;
5140

41+
TLSClientContext::TLSClientContext() { ngtcp2_crypto_ossl_init(); }
42+
5243
TLSClientContext::~TLSClientContext() {
5344
if (ssl_ctx_) {
5445
SSL_CTX_free(ssl_ctx_);
5546
}
47+
48+
ngtcp2_crypto_ossl_free();
5649
}
5750

5851
SSL_CTX *TLSClientContext::get_native_handle() const { return ssl_ctx_; }

‎deps/ngtcp2/ngtcp2/examples/tls_client_context_ossl.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ using namespace ngtcp2;
3737

3838
classTLSClientContext {
3939
public:
40-
TLSClientContext() = default;
40+
TLSClientContext();
4141
~TLSClientContext();
4242

4343
std::expected<void, Error> init(constchar *private_key_file,

‎deps/ngtcp2/ngtcp2/examples/tls_server_context_ossl.cc‎

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -37,23 +37,16 @@
3737
#include"server_base.h"
3838
#include"template.h"
3939

40-
namespace {
41-
auto _ = [] {
42-
if (ngtcp2_crypto_ossl_init() != 0) {
43-
assert(0);
44-
abort();
45-
}
46-
47-
return0;
48-
}();
49-
} // namespace
50-
5140
extern Config config;
5241

42+
TLSServerContext::TLSServerContext() { ngtcp2_crypto_ossl_init(); }
43+
5344
TLSServerContext::~TLSServerContext() {
5445
if (ssl_ctx_) {
5546
SSL_CTX_free(ssl_ctx_);
5647
}
48+
49+
ngtcp2_crypto_ossl_free();
5750
}
5851

5952
SSL_CTX *TLSServerContext::get_native_handle() const { return ssl_ctx_; }

‎deps/ngtcp2/ngtcp2/examples/tls_server_context_ossl.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ using namespace ngtcp2;
3737

3838
classTLSServerContext {
3939
public:
40-
TLSServerContext() = default;
40+
TLSServerContext();
4141
~TLSServerContext();
4242

4343
std::expected<void, Error> init(constchar *private_key_file,

‎deps/ngtcp2/ngtcp2/lib/includes/ngtcp2/ngtcp2.h‎

Lines changed: 30 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3485,6 +3485,24 @@ typedef int (*ngtcp2_stream_stop_sending)(ngtcp2_conn *conn, int64_t stream_id,
34853485
void*user_data,
34863486
void*stream_user_data);
34873487

3488+
/**
3489+
* @functypedef
3490+
*
3491+
* :type:`ngtcp2_recv_stop_sending` is invoked when a STOP_SENDING frame
3492+
* is received from a remote endpoint for a stream identified by
3493+
* |stream_id|. |app_error_code| is the application error code carried
3494+
* by the STOP_SENDING frame. This callback is called at most
3495+
* once per stream.
3496+
*
3497+
* The callback function must return 0 if it succeeds. Returning
3498+
* :macro:`NGTCP2_ERR_CALLBACK_FAILURE` makes the library call return
3499+
* immediately.
3500+
*/
3501+
typedefint (*ngtcp2_recv_stop_sending)(ngtcp2_conn*conn, int64_tstream_id,
3502+
uint64_tapp_error_code,
3503+
void*user_data,
3504+
void*stream_user_data);
3505+
34883506
/**
34893507
* @functypedef
34903508
*
@@ -3626,7 +3644,8 @@ typedef int (*ngtcp2_get_path_challenge_data2)(ngtcp2_conn *conn,
36263644
#defineNGTCP2_CALLBACKS_V1 1
36273645
#defineNGTCP2_CALLBACKS_V2 2
36283646
#defineNGTCP2_CALLBACKS_V3 3
3629-
#defineNGTCP2_CALLBACKS_VERSION NGTCP2_CALLBACKS_V3
3647+
#defineNGTCP2_CALLBACKS_V4 4
3648+
#defineNGTCP2_CALLBACKS_VERSION NGTCP2_CALLBACKS_V4
36303649

36313650
/**
36323651
* @struct
@@ -3964,6 +3983,16 @@ typedef struct ngtcp2_callbacks {
39643983
* .. version-added:: 1.22.0
39653984
*/
39663985
ngtcp2_get_path_challenge_data2get_path_challenge_data2;
3986+
/* The following fields have been added since
3987+
NGTCP2_CALLBACKS_V3. */
3988+
/**
3989+
* :member:`recv_stop_sending` is a callback function which is invoked
3990+
* when a STOP_SENDING frame is received from a remote endpoint. This
3991+
* callback function is optional.
3992+
*
3993+
* .. version-added:: 1.24.0
3994+
*/
3995+
ngtcp2_recv_stop_sendingrecv_stop_sending;
39673996
} ngtcp2_callbacks;
39683997

39693998
/**

‎deps/ngtcp2/ngtcp2/lib/includes/ngtcp2/version.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
*
3737
* Version number of the ngtcp2 library release.
3838
*/
39-
#defineNGTCP2_VERSION "1.23.0"
39+
#defineNGTCP2_VERSION "1.24.0"
4040

4141
/**
4242
* @macro
@@ -46,6 +46,6 @@
4646
* number, 8 bits for minor and 8 bits for patch. Version 1.2.3
4747
* becomes 0x010203.
4848
*/
49-
#defineNGTCP2_VERSION_NUM0x011700
49+
#defineNGTCP2_VERSION_NUM0x011800
5050

5151
#endif/* !defined(NGTCP2_VERSION_H) */

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content

Commit 564c0f4

Browse files
nodejs-github-botaduh95
authored andcommitted
deps: update ngtcp2 to 1.24.0
PR-URL: #64297 Backport-PR-URL: #64675 Reviewed-By: Tim Perry <pimterry@gmail.com> Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
1 parent e3304cd commit 564c0f4

21 files changed

Lines changed: 327 additions & 239 deletions

‎deps/ngtcp2/ngtcp2.gyp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
'ngtcp2/lib/ngtcp2_unreachable.c',
5050
'ngtcp2/lib/ngtcp2_vec.c',
5151
'ngtcp2/lib/ngtcp2_version.c',
52-
'ngtcp2/lib/ngtcp2_window_filter.c',
52+
'ngtcp2/lib/ngtcp2_wf.c',
5353
'ngtcp2/crypto/shared.c'
5454
],
5555
'ngtcp2_sources_ossl': [

‎deps/ngtcp2/ngtcp2/crypto/includes/ngtcp2/ngtcp2_crypto_ossl.h‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,18 @@ NGTCP2_EXTERN SSL *ngtcp2_crypto_ossl_ctx_get_ssl(ngtcp2_crypto_ossl_ctx *ctx);
145145
*/
146146
NGTCP2_EXTERNintngtcp2_crypto_ossl_init(void);
147147

148+
/**
149+
* @function
150+
*
151+
* `ngtcp2_crypto_ossl_free` frees the resources allocated by
152+
* `ngtcp2_crypto_ossl_init`. It is safe to call this function even
153+
* if `ngtcp2_crypto_ossl_init` fails or is not called at all. This
154+
* function might be useful to make some leak detection tools happy.
155+
*
156+
* .. version-added:: 1.24.0
157+
*/
158+
NGTCP2_EXTERNvoidngtcp2_crypto_ossl_free(void);
159+
148160
/**
149161
* @function
150162
*

‎deps/ngtcp2/ngtcp2/crypto/ossl/ossl.c‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,60 @@ int ngtcp2_crypto_ossl_init(void) {
7979
return0;
8080
}
8181

82+
voidngtcp2_crypto_ossl_free(void) {
83+
if (crypto_hkdf) {
84+
EVP_KDF_free(crypto_hkdf);
85+
crypto_hkdf=NULL;
86+
}
87+
88+
if (crypto_sha384) {
89+
EVP_MD_free(crypto_sha384);
90+
crypto_sha384=NULL;
91+
}
92+
93+
if (crypto_sha256) {
94+
EVP_MD_free(crypto_sha256);
95+
crypto_sha256=NULL;
96+
}
97+
98+
#ifndefNGTCP2_NO_CHACHA_POLY1305
99+
if (crypto_chacha20) {
100+
EVP_CIPHER_free(crypto_chacha20);
101+
crypto_chacha20=NULL;
102+
}
103+
104+
if (crypto_chacha20_poly1305) {
105+
EVP_CIPHER_free(crypto_chacha20_poly1305);
106+
crypto_chacha20_poly1305=NULL;
107+
}
108+
#endif/* !defined(NGTCP2_NO_CHACHA_POLY1305) */
109+
110+
if (crypto_aes_256_ecb) {
111+
EVP_CIPHER_free(crypto_aes_256_ecb);
112+
crypto_aes_256_ecb=NULL;
113+
}
114+
115+
if (crypto_aes_128_ecb) {
116+
EVP_CIPHER_free(crypto_aes_128_ecb);
117+
crypto_aes_128_ecb=NULL;
118+
}
119+
120+
if (crypto_aes_128_ccm) {
121+
EVP_CIPHER_free(crypto_aes_128_ccm);
122+
crypto_aes_128_ccm=NULL;
123+
}
124+
125+
if (crypto_aes_256_gcm) {
126+
EVP_CIPHER_free(crypto_aes_256_gcm);
127+
crypto_aes_256_gcm=NULL;
128+
}
129+
130+
if (crypto_aes_128_gcm) {
131+
EVP_CIPHER_free(crypto_aes_128_gcm);
132+
crypto_aes_128_gcm=NULL;
133+
}
134+
}
135+
82136
staticconstEVP_CIPHER*crypto_aead_aes_128_gcm(void) {
83137
if (crypto_aes_128_gcm) {
84138
returncrypto_aes_128_gcm;

‎deps/ngtcp2/ngtcp2/examples/http3_server_proto_codec.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -603,9 +603,9 @@ std::expected<void, Error> ProtoCodec::start_response(Stream *stream) {
603603
nghttp3_pri pri;
604604

605605
if (auto rv =
606-
nghttp3_conn_get_stream_priority(httpconn_, &pri, stream->stream_id);
606+
nghttp3_conn_get_stream_priority2(httpconn_, &pri, stream->stream_id);
607607
rv != 0) {
608-
std::println(stderr, "nghttp3_conn_get_stream_priority: {}",
608+
std::println(stderr, "nghttp3_conn_get_stream_priority2: {}",
609609
nghttp3_strerror(rv));
610610
return std::unexpected{Error::HTTP3};
611611
}

‎deps/ngtcp2/ngtcp2/examples/tls_client_context_ossl.cc‎

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -36,23 +36,16 @@
3636
#include"client_base.h"
3737
#include"template.h"
3838

39-
namespace {
40-
auto _ = [] {
41-
if (ngtcp2_crypto_ossl_init() != 0) {
42-
assert(0);
43-
abort();
44-
}
45-
46-
return0;
47-
}();
48-
} // namespace
49-
5039
extern Config config;
5140

41+
TLSClientContext::TLSClientContext() { ngtcp2_crypto_ossl_init(); }
42+
5243
TLSClientContext::~TLSClientContext() {
5344
if (ssl_ctx_) {
5445
SSL_CTX_free(ssl_ctx_);
5546
}
47+
48+
ngtcp2_crypto_ossl_free();
5649
}
5750

5851
SSL_CTX *TLSClientContext::get_native_handle() const { return ssl_ctx_; }

‎deps/ngtcp2/ngtcp2/examples/tls_client_context_ossl.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ using namespace ngtcp2;
3737

3838
classTLSClientContext {
3939
public:
40-
TLSClientContext() = default;
40+
TLSClientContext();
4141
~TLSClientContext();
4242

4343
std::expected<void, Error> init(constchar *private_key_file,

‎deps/ngtcp2/ngtcp2/examples/tls_server_context_ossl.cc‎

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -37,23 +37,16 @@
3737
#include"server_base.h"
3838
#include"template.h"
3939

40-
namespace {
41-
auto _ = [] {
42-
if (ngtcp2_crypto_ossl_init() != 0) {
43-
assert(0);
44-
abort();
45-
}
46-
47-
return0;
48-
}();
49-
} // namespace
50-
5140
extern Config config;
5241

42+
TLSServerContext::TLSServerContext() { ngtcp2_crypto_ossl_init(); }
43+
5344
TLSServerContext::~TLSServerContext() {
5445
if (ssl_ctx_) {
5546
SSL_CTX_free(ssl_ctx_);
5647
}
48+
49+
ngtcp2_crypto_ossl_free();
5750
}
5851

5952
SSL_CTX *TLSServerContext::get_native_handle() const { return ssl_ctx_; }

‎deps/ngtcp2/ngtcp2/examples/tls_server_context_ossl.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ using namespace ngtcp2;
3737

3838
classTLSServerContext {
3939
public:
40-
TLSServerContext() = default;
40+
TLSServerContext();
4141
~TLSServerContext();
4242

4343
std::expected<void, Error> init(constchar *private_key_file,

‎deps/ngtcp2/ngtcp2/lib/includes/ngtcp2/ngtcp2.h‎

Lines changed: 30 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3485,6 +3485,24 @@ typedef int (*ngtcp2_stream_stop_sending)(ngtcp2_conn *conn, int64_t stream_id,
34853485
void*user_data,
34863486
void*stream_user_data);
34873487

3488+
/**
3489+
* @functypedef
3490+
*
3491+
* :type:`ngtcp2_recv_stop_sending` is invoked when a STOP_SENDING frame
3492+
* is received from a remote endpoint for a stream identified by
3493+
* |stream_id|. |app_error_code| is the application error code carried
3494+
* by the STOP_SENDING frame. This callback is called at most
3495+
* once per stream.
3496+
*
3497+
* The callback function must return 0 if it succeeds. Returning
3498+
* :macro:`NGTCP2_ERR_CALLBACK_FAILURE` makes the library call return
3499+
* immediately.
3500+
*/
3501+
typedefint (*ngtcp2_recv_stop_sending)(ngtcp2_conn*conn, int64_tstream_id,
3502+
uint64_tapp_error_code,
3503+
void*user_data,
3504+
void*stream_user_data);
3505+
34883506
/**
34893507
* @functypedef
34903508
*
@@ -3626,7 +3644,8 @@ typedef int (*ngtcp2_get_path_challenge_data2)(ngtcp2_conn *conn,
36263644
#defineNGTCP2_CALLBACKS_V1 1
36273645
#defineNGTCP2_CALLBACKS_V2 2
36283646
#defineNGTCP2_CALLBACKS_V3 3
3629-
#defineNGTCP2_CALLBACKS_VERSION NGTCP2_CALLBACKS_V3
3647+
#defineNGTCP2_CALLBACKS_V4 4
3648+
#defineNGTCP2_CALLBACKS_VERSION NGTCP2_CALLBACKS_V4
36303649

36313650
/**
36323651
* @struct
@@ -3964,6 +3983,16 @@ typedef struct ngtcp2_callbacks {
39643983
* .. version-added:: 1.22.0
39653984
*/
39663985
ngtcp2_get_path_challenge_data2get_path_challenge_data2;
3986+
/* The following fields have been added since
3987+
NGTCP2_CALLBACKS_V3. */
3988+
/**
3989+
* :member:`recv_stop_sending` is a callback function which is invoked
3990+
* when a STOP_SENDING frame is received from a remote endpoint. This
3991+
* callback function is optional.
3992+
*
3993+
* .. version-added:: 1.24.0
3994+
*/
3995+
ngtcp2_recv_stop_sendingrecv_stop_sending;
39673996
} ngtcp2_callbacks;
39683997

39693998
/**

‎deps/ngtcp2/ngtcp2/lib/includes/ngtcp2/version.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
*
3737
* Version number of the ngtcp2 library release.
3838
*/
39-
#defineNGTCP2_VERSION "1.23.0"
39+
#defineNGTCP2_VERSION "1.24.0"
4040

4141
/**
4242
* @macro
@@ -46,6 +46,6 @@
4646
* number, 8 bits for minor and 8 bits for patch. Version 1.2.3
4747
* becomes 0x010203.
4848
*/
49-
#defineNGTCP2_VERSION_NUM0x011700
49+
#defineNGTCP2_VERSION_NUM0x011800
5050

5151
#endif/* !defined(NGTCP2_VERSION_H) */

0 commit comments

Comments
 (0)