small fixes and clippy

- fix build with pkg-config
- handle clippy warnings
- skip tests for esdm and jitter rng

Signed-off-by: Markus Theil <[email protected]>

Author: thillux

botan-sys/build/main.rs

@@ -159,16 +159,14 @@ fn find_botan_include_dir() -> std::path::PathBuf {
         for major in [3, 2] {
             let lib_name = format!("botan-{}", major);
 
-            let statik = if cfg!(feature = "static") {
-                true
-            } else {
-                false
-            };
+            let statik = cfg!(feature = "static");
 
             if let Ok(config) = pkg_config::Config::new().statik(statik).probe(&lib_name) {
                 return config.include_paths[0].clone();
             }
         }
+
+        panic!("Unable to find the headers corresponding with any supported version of Botan");
     }
 
     #[cfg(not(feature = "pkg-config"))]
@@ -206,7 +204,7 @@ fn find_botan_include_dir() -> std::path::PathBuf {
             }
         }
 
-        panic!("Unable to find the headers cooresponding with any supported version of Botan");
+        panic!("Unable to find the headers corresponding with any supported version of Botan");
     }
 }
 

botan/Cargo.toml

@@ -25,4 +25,8 @@ default = ["std"]
 std = []
 vendored = ["botan-sys/vendored"]
 static = ["botan-sys/static"]
-pkg-config = ["botan-sys/pkg-config"]
+pkg-config = ["botan-sys/pkg-config"]
+
+[lints.clippy]
+# introduced because of from_str
+should_implement_trait = "allow"

botan/src/rng.rs

@@ -52,8 +52,11 @@ impl RandomNumberGenerator {
 
     /// Create a new reference to the ESDM PRNG (fully seeded)
     ///
+    /// Availability of this RNG depends on botan being compiled
+    /// with ESDM support.
+    ///
     /// # Examples
-    /// ```
+    /// ```ignore
     /// let esdm_rng = botan::RandomNumberGenerator::new_esdm().unwrap();
     /// ```
     pub fn new_esdm() -> Result<RandomNumberGenerator> {
@@ -62,8 +65,11 @@ impl RandomNumberGenerator {
 
     /// Create a new reference to the ESDM PRNG (with prediction resistance)
     ///
+    /// Availability of this RNG depends on botan being compiled
+    /// with ESDM support.
+    ///
     /// # Examples
-    /// ```
+    /// ```ignore
     /// let esdm_rng = botan::RandomNumberGenerator::new_esdm_pr().unwrap();
     /// ```
     pub fn new_esdm_pr() -> Result<RandomNumberGenerator> {
@@ -72,8 +78,11 @@ impl RandomNumberGenerator {
 
     /// Create a new reference to the Jitter RNG
     ///
+    /// Availability of this RNG depends on botan being compiled
+    /// with Jitter RNG support.
+    ///
     /// # Examples
-    /// ```
+    /// ```ignore
     /// let jitter_rng = botan::RandomNumberGenerator::new_jitter().unwrap();
     /// ```
     pub fn new_jitter() -> Result<RandomNumberGenerator> {