@@ -179,8 +179,8 @@ int SSL_set_quic_method(SSL *ssl, const SSL_QUIC_METHOD *quic_method)
179
179
180
180
int quic_set_encryption_secrets (SSL * ssl , OSSL_ENCRYPTION_LEVEL level )
181
181
{
182
- uint8_t * read_secret = NULL ;
183
- uint8_t * write_secret = NULL ;
182
+ uint8_t * c2s_secret = NULL ;
183
+ uint8_t * s2c_secret = NULL ;
184
184
size_t len ;
185
185
const EVP_MD * md ;
186
186
static const unsigned char zeros [EVP_MAX_MD_SIZE ];
@@ -191,15 +191,15 @@ int quic_set_encryption_secrets(SSL *ssl, OSSL_ENCRYPTION_LEVEL level)
191
191
/* secrets from the POV of the client */
192
192
switch (level ) {
193
193
case ssl_encryption_early_data :
194
- write_secret = ssl -> early_secret ;
194
+ s2c_secret = ssl -> early_secret ;
195
195
break ;
196
196
case ssl_encryption_handshake :
197
- read_secret = ssl -> client_finished_secret ;
198
- write_secret = ssl -> server_finished_secret ;
197
+ c2s_secret = ssl -> client_finished_secret ;
198
+ s2c_secret = ssl -> server_finished_secret ;
199
199
break ;
200
200
case ssl_encryption_application :
201
- read_secret = ssl -> client_app_traffic_secret ;
202
- write_secret = ssl -> server_app_traffic_secret ;
201
+ c2s_secret = ssl -> client_app_traffic_secret ;
202
+ s2c_secret = ssl -> server_app_traffic_secret ;
203
203
break ;
204
204
default :
205
205
return 1 ;
@@ -226,21 +226,21 @@ int quic_set_encryption_secrets(SSL *ssl, OSSL_ENCRYPTION_LEVEL level)
226
226
}
227
227
228
228
/* In some cases, we want to set the secret only when BOTH are non-zero */
229
- if (read_secret != NULL && write_secret != NULL
230
- && !memcmp (read_secret , zeros , len )
231
- && !memcmp (write_secret , zeros , len ))
229
+ if (c2s_secret != NULL && s2c_secret != NULL
230
+ && !memcmp (c2s_secret , zeros , len )
231
+ && !memcmp (s2c_secret , zeros , len ))
232
232
return 1 ;
233
233
234
234
if (ssl -> server ) {
235
- if (!ssl -> quic_method -> set_encryption_secrets (ssl , level , read_secret ,
236
- write_secret , len )) {
235
+ if (!ssl -> quic_method -> set_encryption_secrets (ssl , level , c2s_secret ,
236
+ s2c_secret , len )) {
237
237
SSLfatal (ssl , SSL_AD_INTERNAL_ERROR , SSL_F_QUIC_SET_ENCRYPTION_SECRETS ,
238
238
ERR_R_INTERNAL_ERROR );
239
239
return 0 ;
240
240
}
241
241
} else {
242
- if (!ssl -> quic_method -> set_encryption_secrets (ssl , level , write_secret ,
243
- read_secret , len )) {
242
+ if (!ssl -> quic_method -> set_encryption_secrets (ssl , level , s2c_secret ,
243
+ c2s_secret , len )) {
244
244
SSLfatal (ssl , SSL_AD_INTERNAL_ERROR , SSL_F_QUIC_SET_ENCRYPTION_SECRETS ,
245
245
ERR_R_INTERNAL_ERROR );
246
246
return 0 ;
0 commit comments