gr1ffon/quic-go
1
0
Fork 0
forked from quic-go/quic-go
Code Pull Requests Activity

add sni to crypto.Signer interface

Browse Source
This commit is contained in:
Lucas Clemente
2016-05-08 22:23:36 +02:00
parent 4d545d96ca
commit 6738f0eadf
6 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
crypto/proof_rsa.go
View File

@@ -42,7 +42,7 @@ func NewRSASigner(tlsConfig *tls.Config) (Signer, error) {
}
// SignServerProof signs CHLO and server config for use in the server proof
func (kd *rsaSigner) SignServerProof(chlo []byte, serverConfigData []byte) ([]byte, error) {
func (kd *rsaSigner) SignServerProof(sni string, chlo []byte, serverConfigData []byte) ([]byte, error) {
hash := sha256.New()
if len(chlo) > 0 {
// Version >= 31
@@ -58,7 +58,7 @@ func (kd *rsaSigner) SignServerProof(chlo []byte, serverConfigData []byte) ([]by
}
// GetCertCompressed gets the certificate in the format described by the QUIC crypto doc
func (kd *rsaSigner) GetCertCompressed() []byte {
func (kd *rsaSigner) GetCertCompressed(sni string) []byte {
b := &bytes.Buffer{}
b.WriteByte(1) // Entry type compressed
b.WriteByte(0) // Entry type end_of_list
@@ -80,6 +80,6 @@ func (kd *rsaSigner) GetCertCompressed() []byte {
}
// GetCertUncompressed gets the certificate in DER
func (kd *rsaSigner) GetCertUncompressed() []byte {
func (kd *rsaSigner) GetCertUncompressed(sni string) []byte {
return kd.cert.Raw
}

4
crypto/proof_rsa_test.go
View File

@@ -24,7 +24,7 @@ var _ = Describe("ProofRsa", func() {
z.Write(cert)
z.Close()
kd := &rsaSigner{cert: &x509.Certificate{Raw: cert}}
Expect(kd.GetCertCompressed()).To(Equal(append([]byte{
Expect(kd.GetCertCompressed("")).To(Equal(append([]byte{
0x01, 0x00,
0x08, 0x00, 0x00, 0x00,
}, certZlib.Bytes()...)))
@@ -33,7 +33,7 @@ var _ = Describe("ProofRsa", func() {
It("gives valid signatures", func() {
kd, err := NewRSASigner(testdata.GetTLSConfig())
Expect(err).ToNot(HaveOccurred())
signature, err := kd.SignServerProof([]byte{'C', 'H', 'L', 'O'}, []byte{'S', 'C', 'F', 'G'})
signature, err := kd.SignServerProof("", []byte{'C', 'H', 'L', 'O'}, []byte{'S', 'C', 'F', 'G'})
Expect(err).ToNot(HaveOccurred())
// Generated with:
// ruby -e 'require "digest"; p Digest::SHA256.digest("QUIC CHLO and server config signature\x00" + "\x20\x00\x00\x00" + Digest::SHA256.digest("CHLO") + "SCFG")'

6
crypto/signer.go
View File

@@ -2,7 +2,7 @@ package crypto
// A Signer holds a certificate and a private key
type Signer interface {
SignServerProof(chlo []byte, serverConfigData []byte) ([]byte, error)
GetCertCompressed() []byte
GetCertUncompressed() []byte
SignServerProof(sni string, chlo []byte, serverConfigData []byte) ([]byte, error)
GetCertCompressed(sni string) []byte
GetCertUncompressed(sni string) []byte
}