From 35a40ac6d8cde982cfc2d8c9527b4abe6c54d4b4 Mon Sep 17 00:00:00 2001 From: Lucas Clemente Date: Fri, 15 Apr 2016 12:37:23 +0200 Subject: [PATCH] rename GetCERTData to GetCertCompressed --- crypto/proof_rsa.go | 4 ++-- crypto/proof_rsa_test.go | 2 +- server_config.go | 6 +++--- session.go | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/crypto/proof_rsa.go b/crypto/proof_rsa.go index c21eebe1..a580d298 100644 --- a/crypto/proof_rsa.go +++ b/crypto/proof_rsa.go @@ -52,8 +52,8 @@ func (kd *KeyData) SignServerProof(chlo []byte, serverConfigData []byte) ([]byte return rsa.SignPSS(rand.Reader, kd.key, crypto.SHA256, hash.Sum(nil), &rsa.PSSOptions{SaltLength: 32}) } -// GetCERTdata gets the certificate in the format described by the QUIC crypto doc -func (kd *KeyData) GetCERTdata() []byte { +// GetCertCompressed gets the certificate in the format described by the QUIC crypto doc +func (kd *KeyData) GetCertCompressed() []byte { b := &bytes.Buffer{} b.WriteByte(1) // Entry type compressed b.WriteByte(0) // Entry type end_of_list diff --git a/crypto/proof_rsa_test.go b/crypto/proof_rsa_test.go index 196fed24..e7feccca 100644 --- a/crypto/proof_rsa_test.go +++ b/crypto/proof_rsa_test.go @@ -21,7 +21,7 @@ var _ = Describe("ProofRsa", func() { z.Write(cert) z.Close() kd := &KeyData{cert: &x509.Certificate{Raw: cert}} - Expect(kd.GetCERTdata()).To(Equal(append([]byte{ + Expect(kd.GetCertCompressed()).To(Equal(append([]byte{ 0x01, 0x00, 0x08, 0x00, 0x00, 0x00, }, certZlib.Bytes()...))) diff --git a/server_config.go b/server_config.go index 058902c1..0d69d812 100644 --- a/server_config.go +++ b/server_config.go @@ -41,7 +41,7 @@ func (s *ServerConfig) Sign(chlo []byte) ([]byte, error) { return s.kd.SignServerProof(chlo, s.Get()) } -// GetCertData returns the certificate data -func (s *ServerConfig) GetCertData() []byte { - return s.kd.GetCERTdata() +// GetCertCompressed returns the certificate data +func (s *ServerConfig) GetCertCompressed() []byte { + return s.kd.GetCertCompressed() } diff --git a/session.go b/session.go index d0bf3454..5a692ff1 100644 --- a/session.go +++ b/session.go @@ -183,7 +183,7 @@ func (s *Session) HandleCryptoHandshake(frame *StreamFrame) error { var serverReply bytes.Buffer handshake.WriteHandshakeMessage(&serverReply, handshake.TagREJ, map[handshake.Tag][]byte{ handshake.TagSCFG: s.ServerConfig.Get(), - handshake.TagCERT: s.ServerConfig.GetCertData(), + handshake.TagCERT: s.ServerConfig.GetCertCompressed(), handshake.TagPROF: proof, })