commit cd6e74698951637398c4fa514a1a74816a78fa58
author Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> Sat Dec 31 17:26:25 2022 +0900
committer Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> Sat Dec 31 17:26:25 2022 +0900
tree 1bd7699d823e37064f77fa4563f453b62b5070b2
parent 662fbeaa09f1d0b3373df024e2d1d44d4b2729e6

fixup! Add missing log_event when application uses its own record layer

lib/picotls.c

diff --git a/lib/picotls.c b/lib/picotls.c
index 2ab6e9c..f8fff89 100644
--- a/lib/picotls.c
+++ b/lib/picotls.c
@@ -1634,10 +1634,11 @@
 
     ctx->epoch = epoch;
 
+    log_secret(tls, log_labels[ptls_is_server(tls) == is_enc][epoch],
+               ptls_iovec_init(ctx->secret, tls->key_schedule->hashes[0].algo->digest_size));
+
     /* special path for applications having their own record layer */
     if (tls->ctx->update_traffic_key != NULL) {
-        log_secret(tls, log_labels[ptls_is_server(tls) == is_enc][epoch],
-                   ptls_iovec_init(ctx->secret, tls->key_schedule->hashes[0].algo->digest_size));
         if (skip_notify)
             return 0;
         return tls->ctx->update_traffic_key->cb(tls->ctx->update_traffic_key, tls, is_enc, epoch, ctx->secret);
@@ -1650,8 +1651,6 @@
         return PTLS_ERROR_NO_MEMORY; /* TODO obtain error from ptls_aead_new */
     ctx->seq = 0;
 
-    log_secret(tls, log_labels[ptls_is_server(tls) == is_enc][epoch],
-               ptls_iovec_init(ctx->secret, tls->key_schedule->hashes[0].algo->digest_size));
     PTLS_DEBUGF("[%s] %02x%02x,%02x%02x\n", log_labels[ptls_is_server(tls)][epoch], (unsigned)ctx->secret[0],
                 (unsigned)ctx->secret[1], (unsigned)ctx->aead->static_iv[0], (unsigned)ctx->aead->static_iv[1]);