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

testing

Browse source
This commit is contained in:
jmwample 2023-07-16 10:03:08 -06:00
parent e2467ffd04
commit d1757c6b77
No known key found for this signature in database
GPG key ID: 6A71BAEF103011C1
1 changed files with 28 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

32
u_server.go
View file

@ -34,8 +34,7 @@ type ServerSessionState struct {
// //
// Warning: you should probably not use this function, unless you are absolutely // Warning: you should probably not use this function, unless you are absolutely
// sure this is the functionality you are looking for. // sure this is the functionality you are looking for.
func ForgeServerSessionState(masterSecret []byte, chID ClientHelloID) (*ServerSessionState, error) { func ForgeServerSessionState(masterSecret []byte, serverConfig *Config, chID ClientHelloID) (*ServerSessionState, error) {
config := &Config{}
chSpec, err := utlsIdToSpec(chID) chSpec, err := utlsIdToSpec(chID)
if err != nil { if err != nil {
return nil, err return nil, err
@ -48,15 +47,17 @@ func ForgeServerSessionState(masterSecret []byte, chID ClientHelloID) (*ServerSe
} }
clientVersions = makeSupportedVersions(minVers, maxVers) clientVersions = makeSupportedVersions(minVers, maxVers)
vers, ok := config.mutualVersion(roleServer, clientVersions) vers, ok := serverConfig.mutualVersion(roleServer, clientVersions)
if !ok { if !ok {
return nil, fmt.Errorf("unable to select mutual version") return nil, fmt.Errorf("unable to select mutual version")
} else if vers < VersionTLS12 {
return nil, fmt.Errorf("selected mutual version too old")
} }
clientCipherSuites := make([]uint16, len(chSpec.CipherSuites)) clientCipherSuites := make([]uint16, len(chSpec.CipherSuites))
copy(clientCipherSuites, chSpec.CipherSuites) copy(clientCipherSuites, chSpec.CipherSuites)
chosenCiphersuite, err := pickCipherSuite(clientCipherSuites, vers, config) chosenCiphersuite, err := pickCipherSuite(clientCipherSuites, vers, serverConfig)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -74,6 +75,29 @@ func ForgeServerSessionState(masterSecret []byte, chID ClientHelloID) (*ServerSe
return sessionState, nil return sessionState, nil
} }
func filterClientCiphers(c []*cipherSuite) []*cipherSuite {
return []*cipherSuite{}
}
// func filterClientCipher(c *cipherSuite) bool {
// if c.flags&suiteECDHE != 0 {
// if !hs.ecdheOk {
// return false
// }
// if c.flags&suiteECSign != 0 {
// if !hs.ecSignOk {
// return false
// }
// } else if !hs.rsaSignOk {
// return false
// }
// } else if !hs.rsaDecryptOk {
// return false
// }
// return true
// }
// Marshal serializes the sessionState object to bytes. // Marshal serializes the sessionState object to bytes.
func (ss *ServerSessionState) Marshal() ([]byte, error) { func (ss *ServerSessionState) Marshal() ([]byte, error) {
pss := ss.toPrivate() pss := ss.toPrivate()