Skip to content

Commit f550eca

Browse files
committed
Add client early traffic secret storage
1 parent 1b787ae commit f550eca

File tree

3 files changed

+4
-1
lines changed

3 files changed

+4
-1
lines changed

ssl/ssl_locl.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1360,6 +1360,7 @@ struct ssl_st {
13601360
unsigned char server_app_traffic_secret[EVP_MAX_MD_SIZE];
13611361
unsigned char client_hand_traffic_secret[EVP_MAX_MD_SIZE];
13621362
unsigned char server_hand_traffic_secret[EVP_MAX_MD_SIZE];
1363+
unsigned char client_early_traffic_secret[EVP_MAX_MD_SIZE];
13631364
unsigned char exporter_master_secret[EVP_MAX_MD_SIZE];
13641365
unsigned char early_exporter_master_secret[EVP_MAX_MD_SIZE];
13651366
EVP_CIPHER_CTX *enc_read_ctx; /* cryptographic state */

ssl/ssl_quic.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ int quic_set_encryption_secrets(SSL *ssl, OSSL_ENCRYPTION_LEVEL level)
207207
/* secrets from the POV of the client */
208208
switch (level) {
209209
case ssl_encryption_early_data:
210-
c2s_secret = ssl->early_secret;
210+
c2s_secret = ssl->client_early_traffic_secret;
211211
break;
212212
case ssl_encryption_handshake:
213213
c2s_secret = ssl->client_hand_traffic_secret;

ssl/tls13_enc.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -744,6 +744,8 @@ int tls13_change_cipher_state(SSL *s, int which)
744744
memcpy(s->client_hand_traffic_secret, secret, hashlen);
745745
else if (label == server_handshake_traffic)
746746
memcpy(s->server_hand_traffic_secret, secret, hashlen);
747+
else if (label == client_early_traffic)
748+
memcpy(s->client_early_traffic_secret, secret, hashlen);
747749
#endif
748750

749751
if (!ssl_log_secret(s, log_label, secret, hashlen)) {

0 commit comments

Comments
 (0)