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

simplify ParseHandshakeMessage signature

Browse Source
This commit is contained in:
Lucas Clemente
2016-09-05 23:19:46 +02:00
parent b93f4ec831
commit e3b8c413a5
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
handshake/handshake_message.go
View File

@@ -13,24 +13,25 @@ import (
)
// ParseHandshakeMessage reads a crypto message
func ParseHandshakeMessage(r utils.ReadStream) (Tag, map[Tag][]byte, error) {
messageTag, err := utils.ReadUint32(r)
if err != nil {
return 0, nil, err
}
func ParseHandshakeMessage(r io.Reader) (Tag, map[Tag][]byte, error) {
slice4 := make([]byte, 4)
nPairs, err := utils.ReadUint32(r)
if err != nil {
if _, err := io.ReadFull(r, slice4); err != nil {
return 0, nil, err
}
messageTag := Tag(binary.LittleEndian.Uint32(slice4))
if _, err := io.ReadFull(r, slice4); err != nil {
return 0, nil, err
}
nPairs := binary.LittleEndian.Uint32(slice4)
if nPairs > protocol.CryptoMaxParams {
return 0, nil, qerr.CryptoTooManyEntries
}
index := make([]byte, nPairs*8)
_, err = io.ReadFull(r, index)
if err != nil {
if _, err := io.ReadFull(r, index); err != nil {
return 0, nil, err
}
@@ -47,8 +48,7 @@ func ParseHandshakeMessage(r utils.ReadStream) (Tag, map[Tag][]byte, error) {
}
data := make([]byte, dataLen)
_, err = io.ReadFull(r, data)
if err != nil {
if _, err := io.ReadFull(r, data); err != nil {
return 0, nil, err
}
@@ -56,7 +56,7 @@ func ParseHandshakeMessage(r utils.ReadStream) (Tag, map[Tag][]byte, error) {
dataStart = dataEnd
}
return Tag(messageTag), resultMap, nil
return messageTag, resultMap, nil
}
// WriteHandshakeMessage writes a crypto message