# HG changeset patch # User Sergey Kandaurov # Date 1588764884 -10800 # Node ID 2d0f4aa78ed60b429a77c88733f2b70fa8b095db # Parent 0aa6b02a15462d5920e01a0cbcba2ca10976a49b Restored ngx_quic_encrypt return type. It was inadvertently changed while working on removing memory allocations. diff -r 0aa6b02a1546 -r 2d0f4aa78ed6 src/event/ngx_event_quic_protection.c --- a/src/event/ngx_event_quic_protection.c Thu Apr 30 12:22:35 2020 +0300 +++ b/src/event/ngx_event_quic_protection.c Wed May 06 14:34:44 2020 +0300 @@ -53,9 +53,9 @@ static ngx_int_t ngx_quic_hkdf_expand(ngx_pool_t *pool, const EVP_MD *digest, ngx_str_t *out, ngx_str_t *label, const uint8_t *prk, size_t prk_len); -static ssize_t ngx_quic_create_long_packet(ngx_quic_header_t *pkt, +static ngx_int_t ngx_quic_create_long_packet(ngx_quic_header_t *pkt, ngx_ssl_conn_t *ssl_conn, ngx_str_t *res); -static ssize_t ngx_quic_create_short_packet(ngx_quic_header_t *pkt, +static ngx_int_t ngx_quic_create_short_packet(ngx_quic_header_t *pkt, ngx_ssl_conn_t *ssl_conn, ngx_str_t *res); @@ -752,7 +752,7 @@ } -static ssize_t +static ngx_int_t ngx_quic_create_long_packet(ngx_quic_header_t *pkt, ngx_ssl_conn_t *ssl_conn, ngx_str_t *res) { @@ -819,7 +819,7 @@ } -static ssize_t +static ngx_int_t ngx_quic_create_short_packet(ngx_quic_header_t *pkt, ngx_ssl_conn_t *ssl_conn, ngx_str_t *res) { @@ -944,7 +944,7 @@ } -ssize_t +ngx_int_t ngx_quic_encrypt(ngx_quic_header_t *pkt, ngx_ssl_conn_t *ssl_conn, ngx_str_t *res) { diff -r 0aa6b02a1546 -r 2d0f4aa78ed6 src/event/ngx_event_quic_protection.h --- a/src/event/ngx_event_quic_protection.h Thu Apr 30 12:22:35 2020 +0300 +++ b/src/event/ngx_event_quic_protection.h Wed May 06 14:34:44 2020 +0300 @@ -40,9 +40,8 @@ ngx_int_t ngx_quic_key_update(ngx_connection_t *c, ngx_quic_secrets_t *current, ngx_quic_secrets_t *next); -ssize_t ngx_quic_encrypt(ngx_quic_header_t *pkt, ngx_ssl_conn_t *ssl_conn, +ngx_int_t ngx_quic_encrypt(ngx_quic_header_t *pkt, ngx_ssl_conn_t *ssl_conn, ngx_str_t *res); - ngx_int_t ngx_quic_decrypt(ngx_quic_header_t *pkt, ngx_ssl_conn_t *ssl_conn, uint64_t *largest_pn);