Skip to content

Commit 9695829

Browse files
committed
TUN-8857: remove restriction for using FIPS and PQ
## Summary When the FIPS compliance was achieved with HTTP/2 Transport the technology at the time wasn't available or certified to be used in tandem with Post-Quantum encryption. Nowadays, that is possible, thus, we can also remove this restriction from Cloudflared. Closes TUN-8857
1 parent 31a870b commit 9695829

File tree

3 files changed

+9
-12
lines changed

3 files changed

+9
-12
lines changed

cmd/cloudflared/tunnel/cmd.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ import (
3131
"github.com/cloudflare/cloudflared/credentials"
3232
"github.com/cloudflare/cloudflared/diagnostic"
3333
"github.com/cloudflare/cloudflared/edgediscovery"
34-
"github.com/cloudflare/cloudflared/fips"
3534
"github.com/cloudflare/cloudflared/ingress"
3635
"github.com/cloudflare/cloudflared/logger"
3736
"github.com/cloudflare/cloudflared/management"
@@ -926,7 +925,6 @@ func tunnelFlags(shouldHide bool) []cli.Flag {
926925
Usage: "When given creates an experimental post-quantum secure tunnel",
927926
Aliases: []string{"pq"},
928927
EnvVars: []string{"TUNNEL_POST_QUANTUM"},
929-
Hidden: fips.IsFipsEnabled(),
930928
}),
931929
altsrc.NewBoolFlag(&cli.BoolFlag{
932930
Name: "management-diagnostics",

cmd/cloudflared/tunnel/configuration.go

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ import (
2323
"github.com/cloudflare/cloudflared/edgediscovery"
2424
"github.com/cloudflare/cloudflared/edgediscovery/allregions"
2525
"github.com/cloudflare/cloudflared/features"
26-
"github.com/cloudflare/cloudflared/fips"
2726
"github.com/cloudflare/cloudflared/ingress"
2827
"github.com/cloudflare/cloudflared/orchestration"
2928
"github.com/cloudflare/cloudflared/supervisor"
@@ -125,10 +124,6 @@ func prepareTunnelConfig(
125124

126125
transportProtocol := c.String("protocol")
127126

128-
if c.Bool("post-quantum") && fips.IsFipsEnabled() {
129-
return nil, nil, fmt.Errorf("post-quantum not supported in FIPS mode")
130-
}
131-
132127
featureSelector, err := features.NewFeatureSelector(ctx, namedTunnel.Credentials.AccountTag, c.StringSlice("features"), c.Bool("post-quantum"), log)
133128
if err != nil {
134129
return nil, nil, errors.Wrap(err, "Failed to create feature selector")

component-tests/test_pq.py

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
from util import LOGGER, nofips, start_cloudflared, wait_tunnel_ready
1+
from util import LOGGER, start_cloudflared, wait_tunnel_ready
22

33

4-
@nofips
54
class TestPostQuantum:
65
def _extra_config(self):
76
config = {
@@ -12,6 +11,11 @@ def _extra_config(self):
1211
def test_post_quantum(self, tmp_path, component_tests_config):
1312
config = component_tests_config(self._extra_config())
1413
LOGGER.debug(config)
15-
with start_cloudflared(tmp_path, config, cfd_pre_args=["tunnel", "--ha-connections", "1"], cfd_args=["run", "--post-quantum"], new_process=True):
16-
wait_tunnel_ready(tunnel_url=config.get_url(),
17-
require_min_connections=1)
14+
with start_cloudflared(
15+
tmp_path,
16+
config,
17+
cfd_pre_args=["tunnel", "--ha-connections", "1"],
18+
cfd_args=["run", "--post-quantum"],
19+
new_process=True,
20+
):
21+
wait_tunnel_ready(tunnel_url=config.get_url(), require_min_connections=1)

0 commit comments

Comments
 (0)