kfd: fixup warning

Signed-off-by: Arthur Gautier <[email protected]>

Author: baloo

openssl-sys/src/ossl_typ.rs

@@ -1062,8 +1062,6 @@ cfg_if! {
 
 cfg_if! {
     if #[cfg(ossl300)] {
-        #[repr(C)]
-        // TODO(baloo): is that safe?
-        pub struct OSSL_LIB_CTX {}
+        pub enum OSSL_LIB_CTX {}
     }
 }

openssl/src/kdf.rs

@@ -1,21 +1,14 @@
-use cfg_if::cfg_if;
 use std::error;
 use std::ffi::{CStr, CString, NulError};
 use std::fmt;
-use std::io;
-use std::io::prelude::*;
-use std::ops::{Deref, DerefMut};
 use std::ptr;
 use std::str;
 
 use crate::error::ErrorStack;
 use crate::hash::MessageDigest;
-use crate::nid::Nid;
 use crate::params::{Params, ParamsBuilder};
 use crate::{cvt, cvt_cp, cvt_p};
 
-use ffi::{EVP_KDF_CTX_free, EVP_KDF_CTX_new};
-
 #[derive(Debug)]
 pub enum KDFError {
     Utf8Error(str::Utf8Error),
@@ -43,7 +36,7 @@ impl From<ErrorStack> for KDFError {
 }
 
 impl fmt::Display for KDFError {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         use KDFError::*;
         match self {
             Utf8Error(ref e) => e.fmt(f),

openssl/src/params.rs

@@ -84,11 +84,11 @@ pub struct ParamsBuilder(Vec<(&'static [u8], Param)>);
 
 impl ParamsBuilder {
     pub fn with_capacity(capacity: usize) -> Self {
-        let mut params = Vec::with_capacity(capacity);
+        let params = Vec::with_capacity(capacity);
         Self(params)
     }
 
-    pub fn build(mut self) -> Params {
+    pub fn build(self) -> Params {
         let len = self.0.len();
 
         let mut params = Params {
@@ -106,17 +106,17 @@ impl ParamsBuilder {
             use Param::*;
             let v = unsafe {
                 match p {
-                    I32(mut v) => {
+                    I32(v) => {
                         let pname = name.as_ptr() as *const i8;
-                        ffi::OSSL_PARAM_construct_int(pname, v)
+                        ffi::OSSL_PARAM_construct_int(pname, *v)
                     }
-                    Vec(mut buf, len) => {
+                    Vec(buf, len) => {
                         let pname = name.as_ptr() as *const i8;
-                        ffi::OSSL_PARAM_construct_octet_string(pname, buf, *len)
+                        ffi::OSSL_PARAM_construct_octet_string(pname, *buf, *len)
                     }
-                    String(mut buf, len) => {
+                    String(buf, len) => {
                         let pname = name.as_ptr() as *const i8;
-                        ffi::OSSL_PARAM_construct_utf8_string(pname, buf, *len)
+                        ffi::OSSL_PARAM_construct_utf8_string(pname, *buf, *len)
                     }
                 }
             };