Skip to content

Commit d5a9055

Browse files
Igor Smolyarigorscs
authored andcommitted
[fips] enable fips rustls by default
1 parent 24df9b9 commit d5a9055

File tree

3 files changed

+3
-13
lines changed

3 files changed

+3
-13
lines changed

.github/workflows/build-rust.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,6 @@ jobs:
6969
- name: Build Rust binaries
7070
run: |
7171
FEATURES="${{ env.CARGO_FEATURES_BASE }}"
72-
case "${{ matrix.target }}" in
73-
*musl*) ;; # OpenSSL’s FIPS mode is implemented as a dynamically loaded provider (fips.so)
74-
*) FEATURES="$FEATURES,fips" ;;
75-
esac
7672
cargo build ${{ env.CARGO_FLAGS }} --features "$FEATURES" --target=${{ matrix.target }}
7773
7874
- name: Print sccache stats
@@ -84,10 +80,6 @@ jobs:
8480
id: collect
8581
run: |
8682
FEATURES="${{ env.CARGO_FEATURES_BASE }}"
87-
case "${{ matrix.target }}" in
88-
*musl*) ;; # OpenSSL’s FIPS mode is implemented as a dynamically loaded provider (fips.so)
89-
*) FEATURES="$FEATURES,fips" ;;
90-
esac
9183
# Run again with --message-format=json to list out executables
9284
# (No real recompile since nothing has changed).
9385
# Then transform newlines to spaces for the artifact step.

crates/adapters/Cargo.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ default = [
2525
"with-redis",
2626
"with-nats",
2727
]
28-
fips = ["rustls/fips"]
2928
with-kafka = ["rdkafka"]
3029
with-deltalake = ["deltalake", "deltalake-catalog-unity"]
3130
with-iceberg = ["feldera-iceberg"]
@@ -110,7 +109,7 @@ utoipa = { workspace = true }
110109
chrono = { workspace = true, features = ["rkyv-64", "serde"] }
111110
colored = { workspace = true }
112111
uuid = { workspace = true, features = ["v4", "std"] }
113-
rustls = { workspace = true }
112+
rustls = { workspace = true, features = ["fips"] }
114113
rkyv = { workspace = true, features = ["std", "size_64"] }
115114
csv-core = { workspace = true }
116115
rand = { workspace = true, features = ["small_rng"] }

crates/pipeline-manager/Cargo.toml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ feldera-types = { workspace = true }
2323
feldera-cloud1-client = { workspace = true }
2424
feldera-ir = { workspace = true }
2525

26-
# Cryptography provider
26+
# Cryptography provider (FIPS enabled by default)
2727
# Make sure this is the same rustls version used by other crates in the dependency tree.
2828
# See the `ensure_default_crypto_provider` function at the root of this crate.
29-
rustls = { workspace = true }
29+
rustls = { workspace = true, features = ["fips"] }
3030

3131
# Logging
3232
tracing = { workspace = true }
@@ -117,7 +117,6 @@ tikv-jemallocator = { workspace = true, features = ["profiling", "unprefixed_mal
117117
default = ["postgresql_embedded"]
118118
feldera-enterprise = []
119119
runtime-version = []
120-
fips = ["rustls/fips"]
121120

122121
[build-dependencies]
123122
change-detection = { workspace = true }

0 commit comments

Comments
 (0)