From 4b67aefb83dd172902cdbd64a2a95415bd51bcf5 Mon Sep 17 00:00:00 2001
From: Marten Seemann <martenseemann@gmail.com>
Date: Fri, 11 Nov 2016 10:50:50 +0700
Subject: [PATCH] generate a client nonce once, when reading a server config
 multiple times

---
 handshake/crypto_setup_client.go      |  9 ++++++---
 handshake/crypto_setup_client_test.go | 13 +++++++++++++
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/handshake/crypto_setup_client.go b/handshake/crypto_setup_client.go
index fc575c18..a51a2305 100644
--- a/handshake/crypto_setup_client.go
+++ b/handshake/crypto_setup_client.go
@@ -97,6 +97,7 @@ func (h *cryptoSetupClient) handleREJMessage(cryptoData map[Tag][]byte) error {
 		h.sno = sno
 	}
 
+	// TODO: what happens if the server sends a different server config in two packets?
 	if scfg, ok := cryptoData[TagSCFG]; ok {
 		h.serverConfig, err = parseServerConfig(scfg)
 		if err != nil {
@@ -104,9 +105,11 @@ func (h *cryptoSetupClient) handleREJMessage(cryptoData map[Tag][]byte) error {
 		}
 
 		// now that we have a server config, we can use its OBIT value to generate a client nonce
-		err = h.generateClientNonce()
-		if err != nil {
-			return err
+		if len(h.nonc) == 0 {
+			err = h.generateClientNonce()
+			if err != nil {
+				return err
+			}
 		}
 	}
 
diff --git a/handshake/crypto_setup_client_test.go b/handshake/crypto_setup_client_test.go
index 59445f8e..e10c736e 100644
--- a/handshake/crypto_setup_client_test.go
+++ b/handshake/crypto_setup_client_test.go
@@ -90,6 +90,19 @@ var _ = Describe("Crypto setup", func() {
 				Expect(cs.nonc).To(HaveLen(32))
 			})
 
+			It("only generates a client nonce once, when reading multiple server configs", func() {
+				b := &bytes.Buffer{}
+				WriteHandshakeMessage(b, TagSCFG, getDefaultServerConfigClient())
+				tagMap[TagSCFG] = b.Bytes()
+				err := cs.handleREJMessage(tagMap)
+				Expect(err).ToNot(HaveOccurred())
+				nonc := cs.nonc
+				Expect(nonc).ToNot(BeEmpty())
+				err = cs.handleREJMessage(tagMap)
+				Expect(err).ToNot(HaveOccurred())
+				Expect(cs.nonc).To(Equal(nonc))
+			})
+
 			It("passes on errors from reading the server config", func() {
 				b := &bytes.Buffer{}
 				WriteHandshakeMessage(b, TagSHLO, make(map[Tag][]byte))