OSSH prefix overrides OSSH seed transforms

adotkhan · Jun 12, 2023 · 0f91145 · 0f91145
1 parent 2cda1d9
commit 0f91145
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/psiphon/common/obfuscator/obfuscatedSshConn.go b/psiphon/common/obfuscator/obfuscatedSshConn.go
@@ -141,6 +141,13 @@ func NewObfuscatedSSHConn(
 	var readDeobfuscate, writeObfuscate func([]byte)
 	var writeState ObfuscatedSSHWriteState
 
+	// OSSHPrefix supersedes OSSHObfuscatorSeedTransform.
+	// This ensures both tactics are not used simultaneously,
+	// until OSSHObfuscatorSeedTransform is removed.
+	if clientPrefixSpec != nil {
+		obfuscatorSeedTransformerParameters = nil
+	}
+
 	conn = WrapConnWithSkipReader(conn)
 
 	readState := ObfuscatedSSHReadState(OBFUSCATION_READ_STATE_IDENTIFICATION_LINES)