passepartoutvpn
/
tunnelkit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use strict ordering in local options 

And add TLS wrapping.
This commit is contained in:
Davide De Rosa 2019-05-01 10:24:04 +02:00
parent 7389d72f1f
commit 14b7f08fb5
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
TunnelKit/Sources/Core/SessionProxy+Authenticator.swift
View File

@ -97,13 +97,9 @@ extension SessionProxy {
// options string // options string
var opts = [ var opts = [
"V4", "V4",
"dev-type tun", "dev-type tun"
"cipher \(options.fallbackCipher.rawValue)",
"auth \(options.fallbackDigest.rawValue)",
"keysize \(options.fallbackCipher.keySize)",
"key-method 2",
"tls-client"
] ]
//////
if let comp = options.compressionFraming { if let comp = options.compressionFraming {
switch comp { switch comp {
case .compLZO: case .compLZO:
@ -119,6 +115,14 @@ extension SessionProxy {
if let direction = options.tlsWrap?.key.direction?.rawValue { if let direction = options.tlsWrap?.key.direction?.rawValue {
opts.append("keydir \(direction)") opts.append("keydir \(direction)")
} }
opts.append("cipher \(options.cipher?.rawValue ?? "BF-CBC")")
opts.append("auth \(options.fallbackDigest.rawValue)")
opts.append("keysize \(options.fallbackCipher.keySize)")
if let strategy = options.tlsWrap?.strategy {
opts.append("tls-\(strategy)")
}
opts.append("key-method 2")
opts.append("tls-client")
let optsString = opts.joined(separator: ",") let optsString = opts.joined(separator: ",")
log.debug("TLS.auth: Local options: \(optsString)") log.debug("TLS.auth: Local options: \(optsString)")
raw.appendSized(Z(optsString, nullTerminated: true)) raw.appendSized(Z(optsString, nullTerminated: true))
@ -187,7 +191,7 @@ extension SessionProxy {
} }
if let serverOptsString = serverOpts.nullTerminatedString(fromOffset: 0) { if let serverOptsString = serverOpts.nullTerminatedString(fromOffset: 0) {
log.debug("TLS.auth: Parsed server opts: \"\(serverOptsString)\"") log.debug("TLS.auth: Parsed server options: \"\(serverOptsString)\"")
} }
self.serverRandom1 = serverRandom1 self.serverRandom1 = serverRandom1