From d0a3eaa8a3a7383c87e9031ae68e03865c90f27e Mon Sep 17 00:00:00 2001
From: Marten Seemann <martenseemann@gmail.com>
Date: Mon, 25 Nov 2019 09:09:34 +0700
Subject: [PATCH] improve logging of handshake messages

---
 internal/handshake/crypto_setup.go | 9 +++++++--
 session.go                         | 1 -
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/internal/handshake/crypto_setup.go b/internal/handshake/crypto_setup.go
index a075e609f..f698db668 100644
--- a/internal/handshake/crypto_setup.go
+++ b/internal/handshake/crypto_setup.go
@@ -288,14 +288,19 @@ func (h *cryptoSetup) HandleMessage(data []byte, encLevel protocol.EncryptionLev
 	if encLevel == protocol.Encryption1RTT {
 		h.handlePostHandshakeMessage()
 	}
+	var strFinished bool
 	switch h.perspective {
 	case protocol.PerspectiveClient:
-		return h.handleMessageForClient(msgType)
+		strFinished = h.handleMessageForClient(msgType)
 	case protocol.PerspectiveServer:
-		return h.handleMessageForServer(msgType)
+		strFinished = h.handleMessageForServer(msgType)
 	default:
 		panic("")
 	}
+	if strFinished {
+		h.logger.Debugf("Done with encryption level %s.", encLevel)
+	}
+	return strFinished
 }
 
 func (h *cryptoSetup) checkEncryptionLevel(msgType messageType, encLevel protocol.EncryptionLevel) error {
diff --git a/session.go b/session.go
index d99e2083e..94f4632d3 100644
--- a/session.go
+++ b/session.go
@@ -873,7 +873,6 @@ func (s *session) handleCryptoFrame(frame *wire.CryptoFrame, encLevel protocol.E
 	if err != nil {
 		return err
 	}
-	s.logger.Debugf("Handled crypto frame at level %s. encLevelChanged: %t", encLevel, encLevelChanged)
 	if encLevelChanged {
 		s.tryDecryptingQueuedPackets()
 	}