Commit 7eee39f1 authored by Steven Fackler's avatar Steven Fackler
Browse files

Rustfmt

parent 7f4ceb51

openssl-sys/build/main.rs

+4 −2
Original line number Diff line number Diff line
@@ -404,7 +404,8 @@ VERSION(OPENSSL, OPENSSL_VERSION_NUMBER) 
VERSION(LIBRESSL, LIBRESSL_VERSION_NUMBER)

#endif

"

    ).unwrap();

    )

    .unwrap();



    for define in DEFINES {

        write!(
@@ -415,7 +416,8 @@ RUST_CONF_{define} 
#endif

",

            define = define

        ).unwrap();

        )

        .unwrap();

    }



    file.flush().unwrap();

openssl-sys/src/dh.rs

+1 −6
Original line number Diff line number Diff line
@@ -15,10 +15,5 @@ extern "C" { 
    pub fn DH_get_2048_256() -> *mut DH;



    #[cfg(any(ossl110, libressl273))]

    pub fn DH_set0_pqg(

        dh: *mut DH,

        p: *mut BIGNUM,

        q: *mut BIGNUM,

        g: *mut BIGNUM,

    ) -> c_int;

    pub fn DH_set0_pqg(dh: *mut DH, p: *mut BIGNUM, q: *mut BIGNUM, g: *mut BIGNUM) -> c_int;

}

openssl-sys/src/dsa.rs

+2 −11
Original line number Diff line number Diff line
@@ -49,18 +49,9 @@ extern "C" { 
        q: *mut *const BIGNUM,

    );

    #[cfg(any(ossl110, libressl273))]

    pub fn DSA_set0_pqg(

        d: *mut DSA,

        p: *mut BIGNUM,

        q: *mut BIGNUM,

        q: *mut BIGNUM,

    ) -> c_int;

    pub fn DSA_set0_pqg(d: *mut DSA, p: *mut BIGNUM, q: *mut BIGNUM, q: *mut BIGNUM) -> c_int;

    #[cfg(any(ossl110, libressl273))]

    pub fn DSA_get0_key(

        d: *const DSA,

        pub_key: *mut *const BIGNUM,

        priv_key: *mut *const BIGNUM,

    );

    pub fn DSA_get0_key(d: *const DSA, pub_key: *mut *const BIGNUM, priv_key: *mut *const BIGNUM);

    #[cfg(any(ossl110, libressl273))]

    pub fn DSA_set0_key(d: *mut DSA, pub_key: *mut BIGNUM, priv_key: *mut BIGNUM) -> c_int;

}

openssl-sys/src/lib.rs

+8 −5
Original line number Diff line number Diff line
@@ -25,8 +25,8 @@ pub use object::*; 
pub use ocsp::*;

pub use ossl_typ::*;

pub use pem::*;

pub use pkcs7::*;

pub use pkcs12::*;

pub use pkcs7::*;

pub use rand::*;

pub use rsa::*;

pub use safestack::*;
@@ -62,8 +62,8 @@ mod object; 
mod ocsp;

mod ossl_typ;

mod pem;

mod pkcs7;

mod pkcs12;

mod pkcs7;

mod rand;

mod rsa;

mod safestack;
@@ -78,9 +78,12 @@ mod x509_vfy; 
mod x509v3;



// FIXME remove

pub type PasswordCallback =

    unsafe extern "C" fn(buf: *mut c_char, size: c_int, rwflag: c_int, user_data: *mut c_void)

        -> c_int;

pub type PasswordCallback = unsafe extern "C" fn(

    buf: *mut c_char,

    size: c_int,

    rwflag: c_int,

    user_data: *mut c_void,

) -> c_int;



#[cfg(ossl110)]

pub fn init() {

openssl-sys/src/macros.rs

+1 −1
Original line number Diff line number Diff line
@@ -65,5 +65,5 @@ macro_rules! stack { 
                }

            }

        }

    }

    };

}