comparison src/event/quic/ngx_event_quic_ssl.c @ 8926:3341e4089c6c quic

QUIC: converted ngx_quic_keys_set_encryption_secret() to NGX codes. While here, removed check for encryption level zero, redundant by its nature.
author Sergey Kandaurov <pluknet@nginx.com>
date Tue, 07 Dec 2021 15:42:10 +0300
parents ff473a6f656c
children 56dec0d4e5b1
comparison
equal deleted inserted replaced
8925:18d23ed15eef 8926:3341e4089c6c
73 secret_len, rsecret); 73 secret_len, rsecret);
74 #endif 74 #endif
75 75
76 if (ngx_quic_keys_set_encryption_secret(c->pool, 0, qc->keys, level, 76 if (ngx_quic_keys_set_encryption_secret(c->pool, 0, qc->keys, level,
77 cipher, rsecret, secret_len) 77 cipher, rsecret, secret_len)
78 != 1) 78 != NGX_OK)
79 { 79 {
80 return 0; 80 return 0;
81 } 81 }
82 82
83 if (level == ssl_encryption_early_data) { 83 if (level == ssl_encryption_early_data) {
107 ngx_log_debug3(NGX_LOG_DEBUG_EVENT, c->log, 0, 107 ngx_log_debug3(NGX_LOG_DEBUG_EVENT, c->log, 0,
108 "quic write secret len:%uz %*xs", secret_len, 108 "quic write secret len:%uz %*xs", secret_len,
109 secret_len, wsecret); 109 secret_len, wsecret);
110 #endif 110 #endif
111 111
112 return ngx_quic_keys_set_encryption_secret(c->pool, 1, qc->keys, level, 112 if (ngx_quic_keys_set_encryption_secret(c->pool, 1, qc->keys, level,
113 cipher, wsecret, secret_len); 113 cipher, wsecret, secret_len)
114 != NGX_OK)
115 {
116 return 0;
117 }
118
119 return 1;
114 } 120 }
115 121
116 #else 122 #else
117 123
118 static int 124 static int
137 143
138 cipher = SSL_get_current_cipher(ssl_conn); 144 cipher = SSL_get_current_cipher(ssl_conn);
139 145
140 if (ngx_quic_keys_set_encryption_secret(c->pool, 0, qc->keys, level, 146 if (ngx_quic_keys_set_encryption_secret(c->pool, 0, qc->keys, level,
141 cipher, rsecret, secret_len) 147 cipher, rsecret, secret_len)
142 != 1) 148 != NGX_OK)
143 { 149 {
144 return 0; 150 return 0;
145 } 151 }
146 152
147 if (level == ssl_encryption_early_data) { 153 if (level == ssl_encryption_early_data) {
156 ngx_log_debug3(NGX_LOG_DEBUG_EVENT, c->log, 0, 162 ngx_log_debug3(NGX_LOG_DEBUG_EVENT, c->log, 0,
157 "quic write secret len:%uz %*xs", secret_len, 163 "quic write secret len:%uz %*xs", secret_len,
158 secret_len, wsecret); 164 secret_len, wsecret);
159 #endif 165 #endif
160 166
161 return ngx_quic_keys_set_encryption_secret(c->pool, 1, qc->keys, level, 167 if (ngx_quic_keys_set_encryption_secret(c->pool, 1, qc->keys, level,
162 cipher, wsecret, secret_len); 168 cipher, wsecret, secret_len)
169 != NGX_OK)
170 {
171 return 0;
172 }
173
174 return 1;
163 } 175 }
164 176
165 #endif 177 #endif
166 178
167 179