Unverified Commit 03bc8192 authored by Steven Fackler's avatar Steven Fackler
Browse files

clippy

parent b60f3b8f

openssl-sys/src/rsa.rs

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ pub unsafe fn EVP_PKEY_CTX_set0_rsa_oaep_label( 
        EVP_PKEY_OP_TYPE_CRYPT,

        EVP_PKEY_CTRL_RSA_OAEP_LABEL,

        len,

        label as *mut c_void,

        label,

    )

}

openssl/src/encrypt.rs

+3 −3
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ 
//! assert_eq!(&*decrypted, data);

//! ```

#[cfg(any(ossl102, libressl310))]

use libc::{c_int, c_void};

use libc::c_int;

use std::{marker::PhantomData, ptr};



use crate::error::ErrorStack;
@@ -174,7 +174,7 @@ impl<'a> Encrypter<'a> { 


            cvt(ffi::EVP_PKEY_CTX_set0_rsa_oaep_label(

                self.pctx,

                p as *mut c_void,

                p,

                label.len() as c_int,

            ))

            .map(|_| ())
@@ -378,7 +378,7 @@ impl<'a> Decrypter<'a> { 


            cvt(ffi::EVP_PKEY_CTX_set0_rsa_oaep_label(

                self.pctx,

                p as *mut c_void,

                p,

                label.len() as c_int,

            ))

            .map(|_| ())

openssl/src/ssl/callbacks.rs

+9 −0
Original line number Diff line number Diff line
@@ -86,6 +86,7 @@ where 
        };

        // Give the callback mutable slices into which it can write the identity and psk.

        let identity_sl = slice::from_raw_parts_mut(identity as *mut u8, max_identity_len as usize);

        #[allow(clippy::unnecessary_cast)]

        let psk_sl = slice::from_raw_parts_mut(psk as *mut u8, max_psk_len as usize);

        match (*callback)(ssl, hint, identity_sl, psk_sl) {

            Ok(psk_len) => psk_len as u32,
@@ -124,6 +125,7 @@ where 
            Some(CStr::from_ptr(identity).to_bytes())

        };

        // Give the callback mutable slices into which it can write the psk.

        #[allow(clippy::unnecessary_cast)]

        let psk_sl = slice::from_raw_parts_mut(psk as *mut u8, max_psk_len as usize);

        match (*callback)(ssl, identity, psk_sl) {

            Ok(psk_len) => psk_len as u32,
@@ -194,6 +196,7 @@ where 
            .ssl_context()

            .ex_data(SslContext::cached_ex_index::<F>())

            .expect("BUG: alpn callback missing") as *const F;

        #[allow(clippy::unnecessary_cast)]

        let protos = slice::from_raw_parts(inbuf as *const u8, inlen as usize);



        match (*callback)(ssl, protos) {
@@ -412,6 +415,7 @@ where 
        .expect("BUG: session context missing")

        .ex_data(SslContext::cached_ex_index::<F>())

        .expect("BUG: get session callback missing") as *const F;

    #[allow(clippy::unnecessary_cast)]

    let data = slice::from_raw_parts(data as *const u8, len as usize);



    match (*callback)(ssl, data) {
@@ -455,6 +459,7 @@ where 
        .ssl_context()

        .ex_data(SslContext::cached_ex_index::<F>())

        .expect("BUG: stateless cookie generate callback missing") as *const F;

    #[allow(clippy::unnecessary_cast)]

    let slice = slice::from_raw_parts_mut(cookie as *mut u8, ffi::SSL_COOKIE_LENGTH as usize);

    match (*callback)(ssl, slice) {

        Ok(len) => {
@@ -482,6 +487,7 @@ where 
        .ssl_context()

        .ex_data(SslContext::cached_ex_index::<F>())

        .expect("BUG: stateless cookie verify callback missing") as *const F;

    #[allow(clippy::unnecessary_cast)]

    let slice = slice::from_raw_parts(cookie as *const c_uchar as *const u8, cookie_len);

    (*callback)(ssl, slice) as c_int

}
@@ -503,6 +509,7 @@ where 
            .expect("BUG: cookie generate callback missing") as *const F;

        // We subtract 1 from DTLS1_COOKIE_LENGTH as the ostensible value, 256, is erroneous but retained for

        // compatibility. See comments in dtls1.h.

        #[allow(clippy::unnecessary_cast)]

        let slice =

            slice::from_raw_parts_mut(cookie as *mut u8, ffi::DTLS1_COOKIE_LENGTH as usize - 1);

        match (*callback)(ssl, slice) {
@@ -542,6 +549,7 @@ where 
            .ssl_context()

            .ex_data(SslContext::cached_ex_index::<F>())

            .expect("BUG: cookie verify callback missing") as *const F;

        #[allow(clippy::unnecessary_cast)]

        let slice =

            slice::from_raw_parts(cookie as *const c_uchar as *const u8, cookie_len as usize);

        (*callback)(ssl, slice) as c_int
@@ -654,6 +662,7 @@ where 
            .ex_data(SslContext::cached_ex_index::<F>())

            .expect("BUG: custom ext parse callback missing") as *const F;

        let ectx = ExtensionContext::from_bits_truncate(context);

        #[allow(clippy::unnecessary_cast)]

        let slice = slice::from_raw_parts(input as *const u8, inlen);

        let cert = if ectx.contains(ExtensionContext::TLS1_3_CERTIFICATE) {

            Some((chainidx, X509Ref::from_ptr(x)))

openssl/src/ssl/mod.rs

+1 −0
Original line number Diff line number Diff line
@@ -2132,6 +2132,7 @@ impl SslSessionRef { 
        unsafe {

            let mut len = 0;

            let p = ffi::SSL_SESSION_get_id(self.as_ptr(), &mut len);

            #[allow(clippy::unnecessary_cast)]

            slice::from_raw_parts(p as *const u8, len as usize)

        }

    }

openssl/src/x509/mod.rs

+2 −0
Original line number Diff line number Diff line
@@ -2102,6 +2102,7 @@ impl GeneralNameRef { 
            let ptr = ASN1_STRING_get0_data(d as *mut _);

            let len = ffi::ASN1_STRING_length(d as *mut _);



            #[allow(clippy::unnecessary_cast)]

            let slice = slice::from_raw_parts(ptr as *const u8, len as usize);

            // IA5Strings are stated to be ASCII (specifically IA5). Hopefully

            // OpenSSL checks that when loading a certificate but if not we'll
@@ -2155,6 +2156,7 @@ impl GeneralNameRef { 
            let ptr = ASN1_STRING_get0_data(d as *mut _);

            let len = ffi::ASN1_STRING_length(d as *mut _);



            #[allow(clippy::unnecessary_cast)]

            Some(slice::from_raw_parts(ptr as *const u8, len as usize))

        }

    }