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

Make ApplyConfig() and MarshalClientHello() public

Browse source
This commit is contained in:
Sergey Frolov 2017-09-06 19:26:38 -06:00
parent 5893031118
commit 004572df2e
1 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
u_conn.go
View file

@ -7,6 +7,7 @@ package tls
import ( import (
"bufio" "bufio"
"bytes" "bytes"
"crypto/cipher"
"encoding/binary" "encoding/binary"
"errors" "errors"
"io" "io"
@ -14,7 +15,6 @@ import (
"strconv" "strconv"
"sync" "sync"
"sync/atomic" "sync/atomic"
"crypto/cipher"
) )
type UConn struct { type UConn struct {
@ -60,11 +60,11 @@ func (uconn *UConn) BuildHandshakeState() error {
if err != nil { if err != nil {
return err return err
} }
err = uconn.applyConfig() err = uconn.ApplyConfig()
if err != nil { if err != nil {
return err return err
} }
err = uconn.marshalClientHello() err = uconn.MarshalClientHello()
if err != nil { if err != nil {
return err return err
} }
@ -267,7 +267,6 @@ func (c *UConn) Write(b []byte) (int, error) {
return n + m, c.out.setErrorLocked(err) return n + m, c.out.setErrorLocked(err)
} }
// c.out.Mutex <= L; c.handshakeMutex <= L. // c.out.Mutex <= L; c.handshakeMutex <= L.
func (c *UConn) clientHandshakeWithState(hs *clientHandshakeState) error { func (c *UConn) clientHandshakeWithState(hs *clientHandshakeState) error {
// This code was copied almost as is from tls/handshake_client.go // This code was copied almost as is from tls/handshake_client.go
@ -350,7 +349,7 @@ func (c *UConn) clientHandshakeWithState(hs *clientHandshakeState) error {
return nil return nil
} }
func (uconn *UConn) applyConfig() error { func (uconn *UConn) ApplyConfig() error {
for _, ext := range uconn.Extensions { for _, ext := range uconn.Extensions {
err := ext.writeToUConn(uconn) err := ext.writeToUConn(uconn)
if err != nil { if err != nil {
@ -360,7 +359,7 @@ func (uconn *UConn) applyConfig() error {
return nil return nil
} }
func (uconn *UConn) marshalClientHello() error { func (uconn *UConn) MarshalClientHello() error {
hello := uconn.HandshakeState.Hello hello := uconn.HandshakeState.Hello
headerLength := 2 + 32 + 1 + len(hello.SessionId) + headerLength := 2 + 32 + 1 + len(hello.SessionId) +
2 + len(hello.CipherSuites)*2 + 2 + len(hello.CipherSuites)*2 +