From 11cb69d2ce62f5fc85e40fc60d32e8eaf6888cb7 Mon Sep 17 00:00:00 2001
From: Marten Seemann <martenseemann@gmail.com>
Date: Fri, 2 Dec 2016 19:32:11 +0700
Subject: [PATCH] optimize reading of diversification nonces from the
 PublicHeader

---
 public_header.go | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/public_header.go b/public_header.go
index 797f130ea..9613ea25a 100644
--- a/public_header.go
+++ b/public_header.go
@@ -162,13 +162,10 @@ func ParsePublicHeader(b *bytes.Reader, packetSentBy protocol.Perspective) (*Pub
 		// see https://github.com/lucas-clemente/quic-go/issues/232
 		if !header.VersionFlag && !header.ResetFlag {
 			header.DiversificationNonce = make([]byte, 32)
-			for i := 0; i < 32; i++ {
-				var val byte
-				val, err = b.ReadByte()
-				if err != nil {
-					return nil, err
-				}
-				header.DiversificationNonce[i] = val
+			// this Read can never return an EOF for a valid packet, since the diversification nonce is followed by the packet number
+			_, err = b.Read(header.DiversificationNonce)
+			if err != nil {
+				return nil, err
 			}
 		}
 	}