diff --git a/crypto/proof_rsa.go b/crypto/proof_rsa.go index acef70d1..7b1bfd96 100644 --- a/crypto/proof_rsa.go +++ b/crypto/proof_rsa.go @@ -56,8 +56,8 @@ func (kd *rsaSigner) SignServerProof(sni string, chlo []byte, serverConfigData [ ) } -// GetCertCompressed gets the certificate in the format described by the QUIC crypto doc -func (kd *rsaSigner) GetCertCompressed(sni string) ([]byte, error) { +// GetCertsCompressed gets the certificate in the format described by the QUIC crypto doc +func (kd *rsaSigner) GetCertsCompressed(sni string) ([]byte, error) { cert, err := kd.getCertForSNI(sni) if err != nil { return nil, err diff --git a/crypto/proof_rsa_test.go b/crypto/proof_rsa_test.go index d4340452..7207b60a 100644 --- a/crypto/proof_rsa_test.go +++ b/crypto/proof_rsa_test.go @@ -30,7 +30,7 @@ var _ = Describe("ProofRsa", func() { }, }, } - certCompressed, err := kd.GetCertCompressed("") + certCompressed, err := kd.GetCertsCompressed("") Expect(err).ToNot(HaveOccurred()) Expect(certCompressed).To(Equal(append([]byte{ 0x01, 0x00, diff --git a/crypto/signer.go b/crypto/signer.go index 92d962c9..2243eea7 100644 --- a/crypto/signer.go +++ b/crypto/signer.go @@ -3,6 +3,6 @@ package crypto // A Signer holds a certificate and a private key type Signer interface { SignServerProof(sni string, chlo []byte, serverConfigData []byte) ([]byte, error) - GetCertCompressed(sni string) ([]byte, error) + GetCertsCompressed(sni string) ([]byte, error) GetLeafCert(sni string) ([]byte, error) } diff --git a/handshake/crypto_setup.go b/handshake/crypto_setup.go index 23c06161..98232d60 100644 --- a/handshake/crypto_setup.go +++ b/handshake/crypto_setup.go @@ -175,7 +175,7 @@ func (h *CryptoSetup) handleInchoateCHLO(sni string, data []byte) ([]byte, error return nil, err } - certCompressed, err := h.scfg.GetCertCompressed(sni) + certCompressed, err := h.scfg.GetCertsCompressed(sni) if err != nil { return nil, err } diff --git a/handshake/crypto_setup_test.go b/handshake/crypto_setup_test.go index 59901f99..0d27ae75 100644 --- a/handshake/crypto_setup_test.go +++ b/handshake/crypto_setup_test.go @@ -39,7 +39,7 @@ func (s *mockSigner) SignServerProof(sni string, chlo []byte, serverConfigData [ } return []byte("proof"), nil } -func (*mockSigner) GetCertCompressed(sni string) ([]byte, error) { +func (*mockSigner) GetCertsCompressed(sni string) ([]byte, error) { return []byte("certcompressed"), nil } func (*mockSigner) GetLeafCert(sni string) ([]byte, error) { diff --git a/handshake/server_config.go b/handshake/server_config.go index 51741ea1..157151d4 100644 --- a/handshake/server_config.go +++ b/handshake/server_config.go @@ -49,7 +49,7 @@ func (s *ServerConfig) Sign(sni string, chlo []byte) ([]byte, error) { return s.signer.SignServerProof(sni, chlo, s.Get()) } -// GetCertCompressed returns the certificate data -func (s *ServerConfig) GetCertCompressed(sni string) ([]byte, error) { - return s.signer.GetCertCompressed(sni) +// GetCertsCompressed returns the certificate data +func (s *ServerConfig) GetCertsCompressed(sni string) ([]byte, error) { + return s.signer.GetCertsCompressed(sni) }