Mercurial > hg > nginx
changeset 8376:2d0f4aa78ed6 quic
Restored ngx_quic_encrypt return type.
It was inadvertently changed while working on removing memory allocations.
| author | Sergey Kandaurov <pluknet@nginx.com> |
|---|---|
| date | Wed, 06 May 2020 14:34:44 +0300 |
| parents | 0aa6b02a1546 |
| children | 2a94aaa70b33 |
| files | src/event/ngx_event_quic_protection.c src/event/ngx_event_quic_protection.h |
| diffstat | 2 files changed, 6 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- 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) {
--- 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);