Add psiphond support for CONJOUR-OSSH

psiphon/common/protocol/protocol.go

@@ -41,6 +41,7 @@ const (
 	TUNNEL_PROTOCOL_FRONTED_MEEK_QUIC_OBFUSCATED_SSH = "FRONTED-MEEK-QUIC-OSSH"
 	TUNNEL_PROTOCOL_MARIONETTE_OBFUSCATED_SSH        = "MARIONETTE-OSSH"
 	TUNNEL_PROTOCOL_TAPDANCE_OBFUSCATED_SSH          = "TAPDANCE-OSSH"
+	TUNNEL_PROTOCOL_CONJOUR_OBFUSCATED_SSH           = "CONJOUR-OSSH"
 
 	SERVER_ENTRY_SOURCE_EMBEDDED   = "EMBEDDED"
 	SERVER_ENTRY_SOURCE_REMOTE     = "REMOTE"
@@ -106,12 +107,14 @@ var SupportedTunnelProtocols = TunnelProtocols{
 	TUNNEL_PROTOCOL_FRONTED_MEEK_QUIC_OBFUSCATED_SSH,
 	TUNNEL_PROTOCOL_MARIONETTE_OBFUSCATED_SSH,
 	TUNNEL_PROTOCOL_TAPDANCE_OBFUSCATED_SSH,
+	TUNNEL_PROTOCOL_CONJOUR_OBFUSCATED_SSH,
 }
 
 var DefaultDisabledTunnelProtocols = TunnelProtocols{
+	TUNNEL_PROTOCOL_FRONTED_MEEK_QUIC_OBFUSCATED_SSH,
 	TUNNEL_PROTOCOL_MARIONETTE_OBFUSCATED_SSH,
 	TUNNEL_PROTOCOL_TAPDANCE_OBFUSCATED_SSH,
-	TUNNEL_PROTOCOL_FRONTED_MEEK_QUIC_OBFUSCATED_SSH,
+	TUNNEL_PROTOCOL_CONHOUR_OBFUSCATED_SSH,
 }
 
 var SupportedServerEntrySources = TunnelProtocols{
@@ -172,7 +175,12 @@ func TunnelProtocolUsesMarionette(protocol string) bool {
 }
 
 func TunnelProtocolUsesTapdance(protocol string) bool {
-	return protocol == TUNNEL_PROTOCOL_TAPDANCE_OBFUSCATED_SSH
+	return protocol == TUNNEL_PROTOCOL_TAPDANCE_OBFUSCATED_SSH ||
+		protocol == TUNNEL_PROTOCOL_CONJOUR_OBFUSCATED_SSH
+}
+
+func TunnelProtocolUsesDarkDecoys(protocol string) bool {
+	return protocol == TUNNEL_PROTOCOL_CONJOUR_OBFUSCATED_SSH
 }
 
 func TunnelProtocolIsResourceIntensive(protocol string) bool {