Cleaner pointer casts #453

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open

kornelski wants to merge 3 commits into master from ptr-cast

boring/src/aes.rs

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -38,7 +38,7 @@
  
    //! ```

    //!

    use crate::ffi;

    use libc::{c_int, c_uint, size_t};

    use libc::{c_int, c_uint};

    use openssl_macros::corresponds;

    use std::mem::MaybeUninit;

    use std::ptr;

    @@ -63,7 +63,7 @@ impl AesKey {
  
                let mut aes_key = MaybeUninit::uninit();

                let r = ffi::AES_set_encrypt_key(

                    key.as_ptr() as *const _,

                    key.as_ptr(),

                    key.len() as c_uint * 8,

                    aes_key.as_mut_ptr(),

                );

    @@ -87,7 +87,7 @@ impl AesKey {
  
                let mut aes_key = MaybeUninit::uninit();

                let r = ffi::AES_set_decrypt_key(

                    key.as_ptr() as *const _,

                    key.as_ptr(),

                    key.len() as c_uint * 8,

                    aes_key.as_mut_ptr(),

                );

    @@ -125,12 +125,11 @@ pub fn wrap_key(
  
            assert!(out.len() >= in_.len() + 8); // Ciphertext is 64 bits longer (see 2.2.1)

            let written = ffi::AES_wrap_key(

                &key.0 as *const _ as *mut _, // this is safe, the implementation only uses the key as a const pointer.

                iv.as_ref()

                    .map_or(ptr::null(), |iv| iv.as_ptr() as *const _),

                out.as_ptr() as *mut _,

                in_.as_ptr() as *const _,

                in_.len() as size_t,

                std::ptr::addr_of!(key.0).cast_mut(), // this is safe, the implementation only uses the key as a const pointer.

                iv.as_ref().map_or(ptr::null(), |iv| iv.as_ptr()),

                out.as_mut_ptr(),

                in_.as_ptr(),

                in_.len(),

            );

            if written <= 0 {

                Err(KeyError(()))

    @@ -164,12 +163,11 @@ pub fn unwrap_key(
  
            assert!(out.len() + 8 <= in_.len());

            let written = ffi::AES_unwrap_key(

                &key.0 as *const _ as *mut _, // this is safe, the implementation only uses the key as a const pointer.

                iv.as_ref()

                    .map_or(ptr::null(), |iv| iv.as_ptr() as *const _),

                out.as_ptr() as *mut _,

                in_.as_ptr() as *const _,

                in_.len() as size_t,

                std::ptr::addr_of!(key.0).cast_mut(), // this is safe, the implementation only uses the key as a const pointer.

                iv.as_ref().map_or(ptr::null(), |iv| iv.as_ptr().cast()),

                out.as_ptr().cast_mut(),

                in_.as_ptr().cast(),

                in_.len(),

            );

            if written <= 0 {

boring/src/asn1.rs

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -26,7 +26,7 @@
  
    //! ```

    use crate::ffi;

    use foreign_types::{ForeignType, ForeignTypeRef};

    use libc::{c_char, c_int, c_long, time_t};

    use libc::{c_int, c_long, time_t};

    use std::cmp::Ordering;

    use std::ffi::CString;

    use std::fmt;

    @@ -408,7 +408,7 @@ impl Asn1StringRef {
  
                    return Err(ErrorStack::get());

                }

                Ok(OpensslString::from_ptr(ptr as *mut c_char))

                Ok(OpensslString::from_ptr(ptr.cast()))

            }

        }

    @@ -549,7 +549,7 @@ impl Asn1BitStringRef {
  
        #[corresponds(ASN1_STRING_length)]

        #[must_use]

        pub fn len(&self) -> usize {

            unsafe { ffi::ASN1_STRING_length(self.as_ptr() as *const _) as usize }

            unsafe { ffi::ASN1_STRING_length(self.as_ptr().cast_const()) as usize }

        }

        /// Determines if the string is empty.

    @@ -591,7 +591,7 @@ impl Asn1Object {
  
            unsafe {

                ffi::init();

                let txt = CString::new(txt).map_err(ErrorStack::internal_error)?;

                let obj: *mut ffi::ASN1_OBJECT = cvt_p(ffi::OBJ_txt2obj(txt.as_ptr() as *const _, 0))?;

                let obj: *mut ffi::ASN1_OBJECT = cvt_p(ffi::OBJ_txt2obj(txt.as_ptr(), 0))?;

                Ok(Asn1Object::from_ptr(obj))

            }

        }

    @@ -608,9 +608,9 @@ impl Asn1ObjectRef {
  
    impl fmt::Display for Asn1ObjectRef {

        fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {

            unsafe {

                let mut buf = [0; 80];

                let mut buf = [0u8; 80];

                let len = ffi::OBJ_obj2txt(

                    buf.as_mut_ptr() as *mut _,

                    buf.as_mut_ptr().cast(),

                    buf.len() as c_int,

                    self.as_ptr(),

                    0,

boring/src/bio.rs

-Original file line number
+Diff line change
@@ Expand Up / @@ -27,12 +27,7 @@ impl<'a> MemBioSlice<'a> { @@
             ffi::init();
             assert!(buf.len() <= BufLen::MAX as usize);
-            let bio = unsafe {
-                cvt_p(BIO_new_mem_buf(
-                    buf.as_ptr() as *const _,
-                    buf.len() as BufLen,
-                ))?
-            };
+            let bio = unsafe { cvt_p(BIO_new_mem_buf(buf.as_ptr().cast(), buf.len() as BufLen))? };
             Ok(MemBioSlice(bio, PhantomData))
         }
@@ Expand Down @@

boring/src/bn.rs

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -24,7 +24,7 @@
  
    //! [`BIGNUM`]: https://wiki.openssl.org/index.php/Manual:Bn_internal(3)

    use crate::ffi;

    use foreign_types::{ForeignType, ForeignTypeRef};

    use libc::{c_int, size_t};

    use libc::c_int;

    use std::cmp::Ordering;

    use std::ffi::CString;

    use std::ops::{Add, Deref, Div, Mul, Neg, Rem, Shl, Shr, Sub};

    @@ -831,7 +831,7 @@ impl BigNum {
  
                ffi::init();

                let c_str = CString::new(s.as_bytes()).map_err(ErrorStack::internal_error)?;

                let mut bn = ptr::null_mut();

                cvt(ffi::BN_dec2bn(&mut bn, c_str.as_ptr() as *const _))?;

                cvt(ffi::BN_dec2bn(&mut bn, c_str.as_ptr()))?;

                Ok(BigNum::from_ptr(bn))

            }

        }

    @@ -843,7 +843,7 @@ impl BigNum {
  
                ffi::init();

                let c_str = CString::new(s.as_bytes()).map_err(ErrorStack::internal_error)?;

                let mut bn = ptr::null_mut();

                cvt(ffi::BN_hex2bn(&mut bn, c_str.as_ptr() as *const _))?;

                cvt(ffi::BN_hex2bn(&mut bn, c_str.as_ptr()))?;

                Ok(BigNum::from_ptr(bn))

            }

        }

    @@ -865,12 +865,7 @@ impl BigNum {
  
            unsafe {

                ffi::init();

                assert!(n.len() <= c_int::MAX as usize);

                cvt_p(ffi::BN_bin2bn(

                    n.as_ptr(),

                    n.len() as size_t,

                    ptr::null_mut(),

                ))

                .map(|p| BigNum::from_ptr(p))

                cvt_p(ffi::BN_bin2bn(n.as_ptr(), n.len(), ptr::null_mut())).map(|p| BigNum::from_ptr(p))

            }

        }

    }

boring/src/derive.rs

-Original file line number
+Diff line change
@@ Expand Up / @@ -64,14 +64,7 @@ impl<'a> Deriver<'a> { @@
         #[corresponds(EVP_PKEY_derive)]
         pub fn derive(&mut self, buf: &mut [u8]) -> Result<usize, ErrorStack> {
             let mut len = buf.len();
-            unsafe {
-                cvt(ffi::EVP_PKEY_derive(
-                    self.0,
-                    buf.as_mut_ptr() as *mut _,
-                    &mut len,
-                ))
-                .map(|_| len)
-            }
+            unsafe { cvt(ffi::EVP_PKEY_derive(self.0, buf.as_mut_ptr(), &mut len)).map(|_| len) }
         }
         /// A convenience function which derives a shared secret and returns it in a new buffer.
@@ Expand Down @@

boring/src/dsa.rs

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -103,7 +103,7 @@ where
  
            unsafe {

                let mut pub_key = ptr::null();

                DSA_get0_key(self.as_ptr(), &mut pub_key, ptr::null_mut());

                BigNumRef::from_ptr(pub_key as *mut _)

                BigNumRef::from_ptr(pub_key.cast_mut())

            }

        }

    }

    @@ -132,7 +132,7 @@ where
  
            unsafe {

                let mut priv_key = ptr::null();

                DSA_get0_key(self.as_ptr(), ptr::null_mut(), &mut priv_key);

                BigNumRef::from_ptr(priv_key as *mut _)

                BigNumRef::from_ptr(priv_key.cast_mut())

            }

        }

    }

    @@ -154,7 +154,7 @@ where
  
            unsafe {

                let mut p = ptr::null();

                DSA_get0_pqg(self.as_ptr(), &mut p, ptr::null_mut(), ptr::null_mut());

                BigNumRef::from_ptr(p as *mut _)

                BigNumRef::from_ptr(p.cast_mut())

            }

        }

    @@ -164,7 +164,7 @@ where
  
            unsafe {

                let mut q = ptr::null();

                DSA_get0_pqg(self.as_ptr(), ptr::null_mut(), &mut q, ptr::null_mut());

                BigNumRef::from_ptr(q as *mut _)

                BigNumRef::from_ptr(q.cast_mut())

            }

        }

    @@ -174,7 +174,7 @@ where
  
            unsafe {

                let mut g = ptr::null();

                DSA_get0_pqg(self.as_ptr(), ptr::null_mut(), ptr::null_mut(), &mut g);

                BigNumRef::from_ptr(g as *mut _)

                BigNumRef::from_ptr(g.cast_mut())

            }

        }

    }

boring/src/ec.rs

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -183,7 +183,7 @@ impl EcGroupRef {
  
        pub fn generator(&self) -> &EcPointRef {

            unsafe {

                let ptr = ffi::EC_GROUP_get0_generator(self.as_ptr());

                EcPointRef::from_ptr(ptr as *mut _)

                EcPointRef::from_ptr(ptr.cast_mut())

            }

        }

    @@ -497,7 +497,7 @@ where
  
        pub fn private_key(&self) -> &BigNumRef {

            unsafe {

                let ptr = ffi::EC_KEY_get0_private_key(self.as_ptr());

                BigNumRef::from_ptr(ptr as *mut _)

                BigNumRef::from_ptr(ptr.cast_mut())

            }

        }

    }

    @@ -512,7 +512,7 @@ where
  
        pub fn public_key(&self) -> &EcPointRef {

            unsafe {

                let ptr = ffi::EC_KEY_get0_public_key(self.as_ptr());

                EcPointRef::from_ptr(ptr as *mut _)

                EcPointRef::from_ptr(ptr.cast_mut())

            }

        }

    @@ -543,7 +543,7 @@ where
  
        pub fn group(&self) -> &EcGroupRef {

            unsafe {

                let ptr = ffi::EC_KEY_get0_group(self.as_ptr());

                EcGroupRef::from_ptr(ptr as *mut _)

                EcGroupRef::from_ptr(ptr.cast_mut())

            }

        }

boring/src/ecdsa.rs

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -2,7 +2,7 @@
  
    use crate::ffi;

    use foreign_types::{ForeignType, ForeignTypeRef};

    use libc::{c_int, size_t};

    use libc::c_int;

    use openssl_macros::corresponds;

    use std::mem;

    use std::ptr;

    @@ -36,10 +36,10 @@ impl EcdsaSig {
  
                assert!(data.len() <= c_int::MAX as usize);

                let sig = cvt_p(ffi::ECDSA_do_sign(

                    data.as_ptr(),

                    data.len() as size_t,

                    data.len(),

                    eckey.as_ptr(),

                ))?;

                Ok(EcdsaSig::from_ptr(sig as *mut _))

                Ok(EcdsaSig::from_ptr(sig))

            }

        }

    @@ -51,7 +51,7 @@ impl EcdsaSig {
  
                let sig = cvt_p(ffi::ECDSA_SIG_new())?;

                ECDSA_SIG_set0(sig, r.as_ptr(), s.as_ptr());

                mem::forget((r, s));

                Ok(EcdsaSig::from_ptr(sig as *mut _))

                Ok(EcdsaSig::from_ptr(sig))

            }

        }

    @@ -83,7 +83,7 @@ impl EcdsaSigRef {
  
                assert!(data.len() <= c_int::MAX as usize);

                cvt_n(ffi::ECDSA_do_verify(

                    data.as_ptr(),

                    data.len() as size_t,

                    data.len(),

                    self.as_ptr(),

                    eckey.as_ptr(),

                ))

    @@ -98,7 +98,7 @@ impl EcdsaSigRef {
  
            unsafe {

                let mut r = ptr::null();

                ECDSA_SIG_get0(self.as_ptr(), &mut r, ptr::null_mut());

                BigNumRef::from_ptr(r as *mut _)

                BigNumRef::from_ptr(r.cast_mut())

            }

        }

    @@ -109,7 +109,7 @@ impl EcdsaSigRef {
  
            unsafe {

                let mut s = ptr::null();

                ECDSA_SIG_get0(self.as_ptr(), ptr::null_mut(), &mut s);

                BigNumRef::from_ptr(s as *mut _)

                BigNumRef::from_ptr(s.cast_mut())

            }

        }

    }

boring/src/hash.rs

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -1,7 +1,7 @@
  
    use crate::ffi;

    use openssl_macros::corresponds;

    use std::convert::TryInto;

    use std::ffi::{c_uint, c_void};

    use std::ffi::c_uint;

    use std::fmt;

    use std::io;

    use std::io::prelude::*;

    @@ -196,7 +196,7 @@ impl Hasher {
  
            unsafe {

                cvt(ffi::EVP_DigestUpdate(

                    self.ctx,

                    data.as_ptr() as *mut _,

                    data.as_ptr().cast_mut().cast(),

                    data.len(),

                ))?;

            }

    @@ -370,7 +370,7 @@ fn hmac<const N: usize>(
  
        cvt_p(unsafe {

            ffi::HMAC(

                digest.as_ptr(),

                key.as_ptr() as *const c_void,

                key.as_ptr().cast(),

                key.len(),

                data.as_ptr(),

                data.len(),

boring/src/lib.rs

-Original file line number
+Diff line change
@@ Expand Up / @@ -209,6 +209,6 @@ unsafe extern "C" fn free_data_box<T>( @@
         _argp: *mut c_void,
     ) {
         if !ptr.is_null() {
-            drop(Box::<T>::from_raw(ptr as *mut T));
+            drop(Box::<T>::from_raw(ptr.cast::<T>()));
         }
     }

boring/src/macros.rs

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -28,7 +28,7 @@ macro_rules! private_key_from_pem {
  
                    cvt_p($f(bio.as_ptr(),

                             ptr::null_mut(),

                             Some(crate::util::invoke_passwd_cb::<F>),

                             &mut cb as *mut _ as *mut _))

                             ptr::from_mut(&mut cb).cast()))

                        .map(|p| ::foreign_types::ForeignType::from_ptr(p))

                }

            }

boring/src/memcmp.rs

-Original file line number
+Diff line change
@@ Expand Up / @@ -30,7 +30,6 @@ @@
     //! assert!(!eq(&a, &c));
     //! ```
     use crate::ffi;
-    use libc::size_t;
     /// Returns `true` iff `a` and `b` contain the same bytes.
     ///
@@ Expand Down Expand Up / @@ -64,13 +63,7 @@ use libc::size_t; @@
     #[must_use]
     pub fn eq(a: &[u8], b: &[u8]) -> bool {
         assert!(a.len() == b.len());
-        let ret = unsafe {
-            ffi::CRYPTO_memcmp(
-                a.as_ptr() as *const _,
-                b.as_ptr() as *const _,
-                a.len() as size_t,
-            )
-        };
+        let ret = unsafe { ffi::CRYPTO_memcmp(a.as_ptr().cast(), b.as_ptr().cast(), a.len()) };
         ret == 0
     }
@@ Expand Down @@

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Cleaner pointer casts #453

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!

Cleaner pointer casts #453

Are you sure you want to change the base?

Uh oh!

Cleaner pointer casts #453

Uh oh!

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!