@@ -731,6 +731,13 @@ def compute_tls13_early_secrets(self, external=False):
731
731
b"" .join (self .handshake_messages ))
732
732
self .tls13_derived_secrets ["early_exporter_secret" ] = ees
733
733
734
+ if self .nss_keys :
735
+ cets = self .nss_keys .get ('CLIENT_EARLY_TRAFFIC_SECRET' , {}).get (self .client_random , cets )
736
+ self .tls13_derived_secrets ["client_handshake_traffic_secret" ] = cets
737
+
738
+ ees = self .nss_keys .get ('EARLY_EXPORTER_SECRET' , {}).get (self .client_random , ees )
739
+ self .tls13_derived_secrets ["server_handshake_traffic_secret" ] = ees
740
+
734
741
if self .connection_end == "server" :
735
742
if self .prcs :
736
743
self .prcs .tls13_derive_keys (cets )
@@ -768,6 +775,13 @@ def compute_tls13_handshake_secrets(self):
768
775
b"" .join (self .handshake_messages ))
769
776
self .tls13_derived_secrets ["server_handshake_traffic_secret" ] = shts
770
777
778
+ if self .nss_keys :
779
+ chts = self .nss_keys .get ('CLIENT_HANDSHAKE_TRAFFIC_SECRET' , {}).get (self .client_random , chts )
780
+ self .tls13_derived_secrets ["client_handshake_traffic_secret" ] = chts
781
+
782
+ shts = self .nss_keys .get ('SERVER_HANDSHAKE_TRAFFIC_SECRET' , {}).get (self .client_random , shts )
783
+ self .tls13_derived_secrets ["server_handshake_traffic_secret" ] = shts
784
+
771
785
def compute_tls13_traffic_secrets (self ):
772
786
"""
773
787
Ciphers key and IV are updated accordingly for Application data.
@@ -801,6 +815,16 @@ def compute_tls13_traffic_secrets(self):
801
815
b"" .join (self .handshake_messages ))
802
816
self .tls13_derived_secrets ["exporter_secret" ] = es
803
817
818
+ if self .nss_keys :
819
+ cts0 = self .nss_keys .get ('CLIENT_TRAFFIC_SECRET_0' , {}).get (self .client_random , cts0 )
820
+ self .tls13_derived_secrets ["client_traffic_secrets" ] = [cts0 ]
821
+
822
+ sts0 = self .nss_keys .get ('SERVER_TRAFFIC_SECRET_0' , {}).get (self .client_random , sts0 )
823
+ self .tls13_derived_secrets ["server_traffic_secrets" ] = [sts0 ]
824
+
825
+ es = self .nss_keys .get ('EXPORTER_SECRET' , {}).get (self .client_random , es )
826
+ self .tls13_derived_secrets ["exporter_secret" ] = es
827
+
804
828
if self .connection_end == "server" :
805
829
# self.prcs.tls13_derive_keys(cts0)
806
830
self .pwcs .tls13_derive_keys (sts0 )
0 commit comments