This commit is contained in:
Sergey Kandaurov 2020-04-01 13:27:41 +03:00
parent c3b7927e24
commit 86029005a5
2 changed files with 4 additions and 5 deletions

View File

@ -1058,10 +1058,10 @@ ngx_quic_handle_crypto_frame(ngx_connection_t *c, ngx_quic_header_t *pkt,
c->quic->state = NGX_QUIC_ST_APPLICATION; c->quic->state = NGX_QUIC_ST_APPLICATION;
ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0, ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0,
"quic ssl cipher: %s", SSL_get_cipher(ssl_conn)); "quic ssl cipher: %s", SSL_get_cipher(ssl_conn));
ngx_log_debug0(NGX_LOG_DEBUG_EVENT, c->log, 0, ngx_log_debug0(NGX_LOG_DEBUG_EVENT, c->log, 0,
"handshake completed successfully"); "handshake completed successfully");
#if (NGX_QUIC_DRAFT_VERSION >= 27) #if (NGX_QUIC_DRAFT_VERSION >= 27)
{ {

View File

@ -53,9 +53,8 @@ static ngx_int_t ngx_quic_hkdf_expand(ngx_pool_t *pool, const EVP_MD *digest,
static ssize_t ngx_quic_create_long_packet(ngx_quic_header_t *pkt, static ssize_t ngx_quic_create_long_packet(ngx_quic_header_t *pkt,
ngx_ssl_conn_t *ssl_conn, ngx_str_t *res); ngx_ssl_conn_t *ssl_conn, ngx_str_t *res);
static ssize_t ngx_quic_create_short_packet(ngx_quic_header_t *pkt, static ssize_t ngx_quic_create_short_packet(ngx_quic_header_t *pkt,
ngx_ssl_conn_t *ssl_conn, ngx_str_t *res); ngx_ssl_conn_t *ssl_conn, ngx_str_t *res);
static ngx_int_t static ngx_int_t
@ -622,7 +621,7 @@ ngx_quic_set_encryption_secret(ngx_pool_t *pool, ngx_ssl_conn_t *ssl_conn,
switch (level) { switch (level) {
case ssl_encryption_handshake: case ssl_encryption_handshake:
peer_secret= &qsec->hs; peer_secret = &qsec->hs;
break; break;
case ssl_encryption_application: case ssl_encryption_application: