mirrors/utls
1
0
Fork 0
mirror of https://github.com/refraction-networking/utls.git synced 2025-04-03 20:17:36 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'golang-tls-upstream', remove Android

Browse source 
I tested all fingerprints and confirmed that Chrome and Firefox are
working as intended.
Android fingerprints were grossly unpopular, which could a result of
incorrect merge, but either way we'll remove them for now.
This commit is contained in:
Sergey Frolov 2018-06-15 17:25:21 -04:00
commit 9656990081
114 changed files with 4011 additions and 4132 deletions
Download patch file Download diff file Expand all files Collapse all files

20
u_tls_extensions.go
View file

@ -162,16 +162,16 @@ func (e *SupportedPointsExtension) Read(b []byte) (int, error) {
}
type SignatureAlgorithmsExtension struct {
SignatureAndHashes []SignatureAndHash
SupportedSignatureAlgorithms []SignatureScheme
}
func (e *SignatureAlgorithmsExtension) writeToUConn(uc *UConn) error {
uc.HandshakeState.Hello.SignatureAndHashes = e.SignatureAndHashes
uc.HandshakeState.Hello.SupportedSignatureAlgorithms = e.SupportedSignatureAlgorithms
return nil
}
func (e *SignatureAlgorithmsExtension) Len() int {
return 6 + 2*len(e.SignatureAndHashes)
return 6 + 2*len(e.SupportedSignatureAlgorithms)
}
func (e *SignatureAlgorithmsExtension) Read(b []byte) (int, error) {
@ -181,13 +181,13 @@ func (e *SignatureAlgorithmsExtension) Read(b []byte) (int, error) {
// https://tools.ietf.org/html/rfc5246#section-7.4.1.4.1
b[0] = byte(extensionSignatureAlgorithms >> 8)
b[1] = byte(extensionSignatureAlgorithms)
b[2] = byte((2 + 2*len(e.SignatureAndHashes)) >> 8)
b[3] = byte((2 + 2*len(e.SignatureAndHashes)))
b[4] = byte((2 * len(e.SignatureAndHashes)) >> 8)
b[5] = byte((2 * len(e.SignatureAndHashes)))
for i, sigAndHash := range e.SignatureAndHashes {
b[6+2*i] = byte(sigAndHash.Hash)
b[7+2*i] = byte(sigAndHash.Signature)
b[2] = byte((2 + 2*len(e.SupportedSignatureAlgorithms)) >> 8)
b[3] = byte((2 + 2*len(e.SupportedSignatureAlgorithms)))
b[4] = byte((2 * len(e.SupportedSignatureAlgorithms)) >> 8)
b[5] = byte((2 * len(e.SupportedSignatureAlgorithms)))
for i, sigAndHash := range e.SupportedSignatureAlgorithms {
b[6+2*i] = byte(sigAndHash >> 8)
b[7+2*i] = byte(sigAndHash)
}
return e.Len(), io.EOF
}