bindings: use aws-lc-rs instead of aws-lc-sys (#4415)

aws · Feb 15, 2024 · ec044bf · ec044bf
1 parent 0998358
commit ec044bf
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/bindings/rust/s2n-tls-sys/build.rs b/bindings/rust/s2n-tls-sys/build.rs
@@ -13,7 +13,8 @@ fn main() {
 }
 
 fn env<N: AsRef<str>>(name: N) -> String {
-    option_env(name).expect("missing env var")
+    let name = name.as_ref();
+    option_env(name).unwrap_or_else(|| panic!("missing env var {name:?}"))
 }
 
 fn option_env<N: AsRef<str>>(name: N) -> Option<String> {
@@ -197,9 +198,9 @@ impl Default for Libcrypto {
 
                     eprintln!("cargo:rerun-if-env-changed={}", name);
 
-                    let link = format!("aws_lc_{version}_crypto");
                     let include = value;
                     let root = env(format!("DEP_AWS_LC_{version}_ROOT"));
+                    let link = env(format!("DEP_AWS_LC_{version}_LIBCRYPTO"));
 
                     return Self {
                         version,

diff --git a/bindings/rust/s2n-tls-sys/src/lib.rs b/bindings/rust/s2n-tls-sys/src/lib.rs
@@ -7,6 +7,8 @@ mod api;
 pub use api::*;
 
 mod features;
+
+#[allow(unused_imports)]
 pub use features::*;
 
 // Additional defines that don't get imported with bindgen

diff --git a/bindings/rust/s2n-tls-sys/templates/Cargo.template b/bindings/rust/s2n-tls-sys/templates/Cargo.template
@@ -35,7 +35,7 @@ stacktrace = []
 # unstable-foo = []
 
 [dependencies]
-aws-lc-sys = { version = "0.13" }
+aws-lc-rs = { version = "1.6.2" }
 libc = "0.2"
 
 [build-dependencies]