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

Merge pull request #511 from lucas-clemente/simplify

Browse Source 
Simplify code in a few places
This commit is contained in:
Lucas Clemente
2017-04-13 17:06:41 +02:00
committed by GitHub
parent 26ed505969 013d7fdb30
commit 130620d18c
13 changed files with 22 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
handshake/crypto_setup_client.go
View File

@@ -413,7 +413,7 @@ func (h *cryptoSetupClient) getTags() (map[Tag][]byte, error) {
tags[TagCCS] = ccs
}
versionTag := make([]byte, 4, 4)
versionTag := make([]byte, 4)
binary.LittleEndian.PutUint32(versionTag, protocol.VersionNumberToTag(h.version))
tags[TagVER] = versionTag
@@ -431,7 +431,7 @@ func (h *cryptoSetupClient) getTags() (map[Tag][]byte, error) {
leafCert := h.certManager.GetLeafCert()
if leafCert != nil {
certHash, _ := h.certManager.GetLeafCertHash()
xlct := make([]byte, 8, 8)
xlct := make([]byte, 8)
binary.LittleEndian.PutUint64(xlct, certHash)
tags[TagNONC] = h.nonc

5
handshake/crypto_setup_server.go
View File

@@ -156,10 +156,7 @@ func (h *cryptoSetupServer) handleMessage(chloData []byte, cryptoData map[Tag][]
return false, err
}
_, err = h.cryptoStream.Write(reply)
if err != nil {
return false, err
}
return false, nil
return false, err
}
// Open a message

4
handshake/ephermal_cache.go
View File

@@ -29,14 +29,14 @@ func getEphermalKEX() (res crypto.KeyExchange) {
res = kexCurrent
t := kexCurrentTime
kexMutex.RUnlock()
if res != nil && time.Now().Sub(t) < kexLifetime {
if res != nil && time.Since(t) < kexLifetime {
return res
}
kexMutex.Lock()
defer kexMutex.Unlock()
// Check if still unfulfilled
if kexCurrent == nil || time.Now().Sub(kexCurrentTime) > kexLifetime {
if kexCurrent == nil || time.Since(kexCurrentTime) > kexLifetime {
kex, err := crypto.NewCurve25519KEX()
if err != nil {
utils.Errorf("could not set KEX: %s", err.Error())