Fix CI build failures

Signed-off-by: David Mulder <[email protected]>

.github/workflows/build.yml

@@ -44,9 +44,11 @@ jobs:
             libdhash-dev \
             libkrb5-dev \
             libpcre2-dev \
-            libclang-13-dev \
+            libclang-dev \
             autoconf \
-            gettext
+            gettext \
+            openssl \
+            libsqlite3-dev
 
       - name: "Fetch submodules"
         run: git submodule init && git submodule update

.github/workflows/clippy.yml

@@ -44,9 +44,11 @@ jobs:
             libdhash-dev \
             libkrb5-dev \
             libpcre2-dev \
-            libclang-13-dev \
+            libclang-dev \
             autoconf \
-            gettext
+            gettext \
+            openssl \
+            libsqlite3-dev
 
       - name: "Fetch submodules"
         run: git submodule init && git submodule update

.github/workflows/test.yml

@@ -44,9 +44,11 @@ jobs:
             libdhash-dev \
             libkrb5-dev \
             libpcre2-dev \
-            libclang-13-dev \
+            libclang-dev \
             autoconf \
-            gettext
+            gettext \
+            openssl \
+            libsqlite3-dev
 
       - name: "Fetch submodules"
         run: git submodule init && git submodule update

Cargo.toml

@@ -8,7 +8,7 @@ members = [
 	"src/glue",
 	"src/kanidm/libs/sketching",
 	"src/proto",
-	"src/kanidm/libs/crypto",
+	"src/crypto",
 	"src/kanidm/libs/users",
 	"src/idmap",
 ]
@@ -75,7 +75,7 @@ tracing-forest = "^0.1.6"
 rusqlite = "^0.31.0"
 hashbrown = { version = "0.14.0", features = ["serde", "inline-more", "ahash"] }
 lru = "^0.12.3"
-kanidm_lib_crypto = { path = "./src/kanidm/libs/crypto", version = "0.5.0" }
+kanidm_lib_crypto = { path = "./src/crypto", version = "0.5.0" }
 kanidm_utils_users = { path = "./src/kanidm/libs/users" }
 walkdir = "2"
 csv = "1.2.2"

src/common/Cargo.toml

@@ -9,6 +9,9 @@ license.workspace = true
 homepage.workspace = true
 repository.workspace = true
 
+[features]
+tpm = ["kanidm-hsm-crypto/tpm"]
+
 [lib]
 name = "himmelblau_unix_common"
 path = "src/lib.rs"

src/crypto/Cargo.toml

@@ -0,0 +1,40 @@
+[package]
+name = "kanidm_lib_crypto"
+version.workspace = true
+authors.workspace = true
+rust-version.workspace = true
+edition.workspace = true
+description = "Kanidm cryptographic functionality"
+license.workspace = true
+homepage.workspace = true
+repository.workspace = true
+
+[features]
+tpm = ["kanidm-hsm-crypto/tpm"]
+
+[lib]
+test = true
+doctest = false
+
+[dependencies]
+argon2 = { workspace = true }
+base64 = { workspace = true }
+base64urlsafedata = { workspace = true }
+hex = { workspace = true }
+kanidm_proto = { workspace = true }
+kanidm-hsm-crypto = { workspace = true }
+
+# We need to explicitly ask for openssl-sys so that we get the version propagated
+# into the build.rs for legacy feature checks.
+openssl-sys = { workspace = true }
+openssl = { workspace = true }
+rand = { workspace = true }
+serde = { workspace = true, features = ["derive"] }
+tracing = { workspace = true }
+uuid = { workspace = true }
+
+[dev-dependencies]
+sketching = { workspace = true }
+
+[lints.rust]
+unexpected_cfgs = { level = "warn", check-cfg = ['cfg(openssl3)'] }

src/crypto/src

@@ -0,0 +1 @@
+../kanidm/libs/crypto/src

src/daemon/src/tasks_daemon.rs

@@ -9,6 +9,7 @@
 #![deny(clippy::await_holding_lock)]
 #![deny(clippy::needless_pass_by_value)]
 #![deny(clippy::trivially_copy_pass_by_ref)]
+#![allow(unexpected_cfgs)]
 
 use std::ffi::CString;
 use std::os::unix::ffi::OsStrExt;