]> git.kaiwu.me - nginx.git/commitdiff
Restored ngx_quic_encrypt return type.
authorSergey Kandaurov <pluknet@nginx.com>
Wed, 6 May 2020 11:34:44 +0000 (14:34 +0300)
committerSergey Kandaurov <pluknet@nginx.com>
Wed, 6 May 2020 11:34:44 +0000 (14:34 +0300)
It was inadvertently changed while working on removing memory allocations.

src/event/ngx_event_quic_protection.c
src/event/ngx_event_quic_protection.h

index 354d4f9fa967d67c73bdae8450f0308cabda7b2e..6af047d40551ced2684460ba86b5e897af6ce4c2 100644 (file)
@@ -53,9 +53,9 @@ static ngx_int_t ngx_quic_tls_hp(ngx_log_t *log, const EVP_CIPHER *cipher,
 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 @@ ngx_quic_key_update(ngx_connection_t *c, ngx_quic_secrets_t *current,
 }
 
 
-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 @@ ngx_quic_create_long_packet(ngx_quic_header_t *pkt, ngx_ssl_conn_t *ssl_conn,
 }
 
 
-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 @@ ngx_quic_compute_nonce(u_char *nonce, size_t len, uint64_t pn)
 }
 
 
-ssize_t
+ngx_int_t
 ngx_quic_encrypt(ngx_quic_header_t *pkt, ngx_ssl_conn_t *ssl_conn,
     ngx_str_t *res)
 {
index befb7ef6614c66def6dae0640fa0c41e9d4f5b78..37d7c37b1cb3e6132b54556012388248df9626ea 100644 (file)
@@ -40,9 +40,8 @@ int ngx_quic_set_encryption_secret(ngx_pool_t *pool, ngx_ssl_conn_t *ssl_conn,
 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);