diff options
| author | Jonathan <jonathan@mullvad.net> | 2023-02-14 14:53:50 +0100 |
|---|---|---|
| committer | David Lönnhager <david.l@mullvad.net> | 2023-02-28 10:07:52 +0100 |
| commit | 893705e56e243a4c6e91ffdfded9bfa9f820549e (patch) | |
| tree | 69261095bfccbe47dbeb9ba9d77be0e2fcd4aba6 | |
| parent | f2f7fa7109830a6c5cb695c8ca60bf3f84ab9c10 (diff) | |
| download | mullvadvpn-893705e56e243a4c6e91ffdfded9bfa9f820549e.tar.xz mullvadvpn-893705e56e243a4c6e91ffdfded9bfa9f820549e.zip | |
Allow cli to turn on PQ while MH is on
| -rw-r--r-- | mullvad-cli/src/cmds/relay.rs | 20 | ||||
| -rw-r--r-- | mullvad-cli/src/cmds/tunnel.rs | 21 |
2 files changed, 0 insertions, 41 deletions
diff --git a/mullvad-cli/src/cmds/relay.rs b/mullvad-cli/src/cmds/relay.rs index 27e8df55b9..1497a7da41 100644 --- a/mullvad-cli/src/cmds/relay.rs +++ b/mullvad-cli/src/cmds/relay.rs @@ -592,26 +592,6 @@ impl Relay { if let Some(entry) = matches.values_of("entry location") { wireguard_constraints.entry_location = parse_entry_location_constraint(entry); let use_multihop = wireguard_constraints.entry_location.is_some(); - if use_multihop { - let quantum_resistant = rpc - .get_settings(()) - .await? - .into_inner() - .tunnel_options - .unwrap() - .wireguard - .unwrap() - .quantum_resistant; - if quantum_resistant - == Some(types::QuantumResistantState { - state: i32::from(types::quantum_resistant_state::State::On), - }) - { - return Err(Error::CommandFailed( - "Quantum resistant tunnels do not work when multihop is enabled", - )); - } - } wireguard_constraints.use_multihop = use_multihop; } diff --git a/mullvad-cli/src/cmds/tunnel.rs b/mullvad-cli/src/cmds/tunnel.rs index 042590fcbb..1043769f66 100644 --- a/mullvad-cli/src/cmds/tunnel.rs +++ b/mullvad-cli/src/cmds/tunnel.rs @@ -251,27 +251,6 @@ impl Tunnel { _ => unreachable!("invalid PQ state"), }; let mut rpc = new_rpc_client().await?; - let settings = rpc.get_settings(()).await?; - if quantum_resistant == types::quantum_resistant_state::State::On { - let multihop_is_enabled = settings - .into_inner() - .relay_settings - .unwrap() - .endpoint - .and_then(|endpoint| { - if let types::relay_settings::Endpoint::Normal(settings) = endpoint { - Some(settings.wireguard_constraints.unwrap().use_multihop) - } else { - None - } - }) - .unwrap_or(false); - if multihop_is_enabled { - return Err(Error::CommandFailed( - "Quantum resistant tunnels do not work when multihop is enabled", - )); - } - } rpc.set_quantum_resistant_tunnel(types::QuantumResistantState { state: i32::from(quantum_resistant), }) |