diff --git a/handshake/crypto_setup.go b/handshake/crypto_setup.go index 389401f49..b84bcb35b 100644 --- a/handshake/crypto_setup.go +++ b/handshake/crypto_setup.go @@ -146,12 +146,7 @@ func (h *CryptoSetup) isInchoateCHLO(cryptoData map[Tag][]byte) bool { } func (h *CryptoSetup) handleInchoateCHLO(data []byte) ([]byte, error) { - var chloOrNil []byte - if h.version > protocol.VersionNumber(30) { - chloOrNil = data - } - - proof, err := h.scfg.Sign(chloOrNil) + proof, err := h.scfg.Sign(data) if err != nil { return nil, err } diff --git a/handshake/crypto_setup_test.go b/handshake/crypto_setup_test.go index 6313fdde9..3ac9da9d8 100644 --- a/handshake/crypto_setup_test.go +++ b/handshake/crypto_setup_test.go @@ -120,13 +120,6 @@ var _ = Describe("Crypto setup", func() { Expect(signer.gotCHLO).To(BeTrue()) }) - It("generates REJ messages for version 30", func() { - cs.version = protocol.VersionNumber(30) - _, err := cs.handleInchoateCHLO(sampleCHLO) - Expect(err).ToNot(HaveOccurred()) - Expect(signer.gotCHLO).To(BeFalse()) - }) - It("generates SHLO messages", func() { response, err := cs.handleCHLO([]byte("chlo-data"), map[Tag][]byte{ TagPUBS: []byte("pubs-c"), diff --git a/protocol/version.go b/protocol/version.go index ac284a7e2..2fcee363a 100644 --- a/protocol/version.go +++ b/protocol/version.go @@ -11,7 +11,6 @@ type VersionNumber int // SupportedVersions lists the versions that the server supports var SupportedVersions = []VersionNumber{ - 30, 32, } diff --git a/protocol/version_test.go b/protocol/version_test.go index 470eceacc..52c51a798 100644 --- a/protocol/version_test.go +++ b/protocol/version_test.go @@ -19,7 +19,7 @@ var _ = Describe("Version", func() { }) It("has proper tag list", func() { - Expect(protocol.SupportedVersionsAsTags).To(Equal([]byte("Q030Q032"))) + Expect(protocol.SupportedVersionsAsTags).To(Equal([]byte("Q032"))) }) It("recognizes supported versions", func() {