kris/th5
1
0
Förgrening 0
Kod Ärenden Pull-förfrågningar Släpp Wiki Aktiviteter

Merge pull request #97 from henrydcase/fix_name

Bläddra i källkod 
Fixes function name
This commit is contained in:
Brendan Mc 2018-06-19 09:23:58 -07:00 committad av GitHub
förälder b9d61edfd5 51a4ff64d8
incheckning 9557e92e52
Ingen känd nyckel hittad för denna signaturen i databasen
GPG-nyckel ID: 4AEE18F83AFDEB23
1 ändrade filer med 5 tillägg och 5 borttagningar
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
handshake_messages.go
Visa fil

@ -41,7 +41,7 @@ type clientHelloMsg struct {
// Marshalling of signature_algorithms extension see https://tools.ietf.org/html/rfc5246#section-7.4.1.4.1 // Marshalling of signature_algorithms extension see https://tools.ietf.org/html/rfc5246#section-7.4.1.4.1
// for more details. Extension is serialized in data buffer // for more details. Extension is serialized in data buffer
// Function advances data slice and returns it, so that it can be used for further processing // Function advances data slice and returns it, so that it can be used for further processing
func marshallExtensionSignatureAlgorithms(data []byte, sigSchemes []SignatureScheme) []byte { func marshalExtensionSignatureAlgorithms(data []byte, sigSchemes []SignatureScheme) []byte {
data[0] = byte(extensionSignatureAlgorithms >> 8) data[0] = byte(extensionSignatureAlgorithms >> 8)
data[1] = byte(extensionSignatureAlgorithms) data[1] = byte(extensionSignatureAlgorithms)
l := 2 + 2*len(sigSchemes) l := 2 + 2*len(sigSchemes)
@ -64,7 +64,7 @@ func marshallExtensionSignatureAlgorithms(data []byte, sigSchemes []SignatureSch
// Unmrshalling of signature_algorithms extension see https://tools.ietf.org/html/rfc5246#section-7.4.1.4.1 // Unmrshalling of signature_algorithms extension see https://tools.ietf.org/html/rfc5246#section-7.4.1.4.1
// for more details. // for more details.
// In case of error function returns alertDecoderError otherwise filled SignatureScheme slice and alertSuccess // In case of error function returns alertDecoderError otherwise filled SignatureScheme slice and alertSuccess
func unmarshallExtensionSignatureAlgorithms(data []byte, length int) ([]SignatureScheme, alert) { func unmarshalExtensionSignatureAlgorithms(data []byte, length int) ([]SignatureScheme, alert) {
if length < 2 || length&1 != 0 { if length < 2 || length&1 != 0 {
return nil, alertDecodeError return nil, alertDecodeError
} }
@ -2131,7 +2131,7 @@ func (m *certificateRequestMsg13) marshal() (x []byte) {
z = z[2:] z = z[2:]
// TODO: this function should be reused by CH // TODO: this function should be reused by CH
z = marshallExtensionSignatureAlgorithms(z, m.supportedSignatureAlgorithms) z = marshalExtensionSignatureAlgorithms(z, m.supportedSignatureAlgorithms)
// certificate_authorities // certificate_authorities
if casLength > 0 { if casLength > 0 {
z[0] = byte(extensionCAs >> 8) z[0] = byte(extensionCAs >> 8)
@ -2197,10 +2197,10 @@ func (m *certificateRequestMsg13) unmarshal(data []byte) alert {
switch extension { switch extension {
case extensionSignatureAlgorithms: case extensionSignatureAlgorithms:
// TODO: unmarshallExtensionSignatureAlgorithms should be shared with CH and pre-1.3 CV // TODO: unmarshalExtensionSignatureAlgorithms should be shared with CH and pre-1.3 CV
// https://tools.ietf.org/html/draft-ietf-tls-tls13-21#section-4.2.3 // https://tools.ietf.org/html/draft-ietf-tls-tls13-21#section-4.2.3
var err alert var err alert
m.supportedSignatureAlgorithms, err = unmarshallExtensionSignatureAlgorithms(data, length) m.supportedSignatureAlgorithms, err = unmarshalExtensionSignatureAlgorithms(data, length)
if err != alertSuccess { if err != alertSuccess {
return err return err
} }