Commit aa8d31ec authored by Steven Fackler's avatar Steven Fackler
Browse files

fix clippy

parent dd9636f7

openssl-sys/build/find_normal.rs

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ pub fn get_openssl(target: &str) -> (PathBuf, PathBuf) { 
    match (lib_dir, include_dir) {

        (Some(lib_dir), Some(include_dir)) => (lib_dir, include_dir),

        (lib_dir, include_dir) => {

            let openssl_dir = env("OPENSSL_DIR").unwrap_or_else(|| find_openssl_dir(&target));

            let openssl_dir = env("OPENSSL_DIR").unwrap_or_else(|| find_openssl_dir(target));

            let openssl_dir = Path::new(&openssl_dir);

            let lib_dir = lib_dir.unwrap_or_else(|| openssl_dir.join("lib"));

            let include_dir = include_dir.unwrap_or_else(|| openssl_dir.join("include"));

openssl-sys/build/main.rs

+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ fn main() { 


    let libs_env = env("OPENSSL_LIBS");

    let libs = match libs_env.as_ref().and_then(|s| s.to_str()) {

        Some(ref v) => {

        Some(v) => {

            if v.is_empty() {

                vec![]

            } else {

openssl/examples/mk_certs.rs

+3 −3
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ fn mk_ca_cert() -> Result<(X509, PKey<Private>), ErrorStack> { 
/// Make a X509 request with the given private key

fn mk_request(key_pair: &PKey<Private>) -> Result<X509Req, ErrorStack> {

    let mut req_builder = X509ReqBuilder::new()?;

    req_builder.set_pubkey(&key_pair)?;

    req_builder.set_pubkey(key_pair)?;



    let mut x509_name = X509NameBuilder::new()?;

    x509_name.append_entry_by_text("C", "US")?;
@@ -73,7 +73,7 @@ fn mk_request(key_pair: &PKey<Private>) -> Result<X509Req, ErrorStack> { 
    let x509_name = x509_name.build();

    req_builder.set_subject_name(&x509_name)?;



    req_builder.sign(&key_pair, MessageDigest::sha256())?;

    req_builder.sign(key_pair, MessageDigest::sha256())?;

    let req = req_builder.build();

    Ok(req)

}
@@ -131,7 +131,7 @@ fn mk_ca_signed_cert( 
        .build(&cert_builder.x509v3_context(Some(ca_cert), None))?;

    cert_builder.append_extension(subject_alt_name)?;



    cert_builder.sign(&ca_key_pair, MessageDigest::sha256())?;

    cert_builder.sign(ca_key_pair, MessageDigest::sha256())?;

    let cert = cert_builder.build();



    Ok((cert, key_pair))

openssl/src/cms.rs

+1 −1
Original line number Diff line number Diff line
@@ -280,7 +280,7 @@ mod test { 


        let encrypt = CmsContentInfo::encrypt(

            &cert_stack,

            &input.as_bytes(),

            input.as_bytes(),

            Cipher::des_ede3_cbc(),

            CMSOptions::empty(),

        )

openssl/src/encrypt.rs

+4 −4
Original line number Diff line number Diff line
@@ -489,9 +489,9 @@ mod test { 


        let mut decrypter = Decrypter::new(&pkey).unwrap();

        decrypter.set_rsa_padding(Padding::PKCS1).unwrap();

        let buffer_len = decrypter.decrypt_len(&encoded).unwrap();

        let buffer_len = decrypter.decrypt_len(encoded).unwrap();

        let mut decoded = vec![0u8; buffer_len];

        let decoded_len = decrypter.decrypt(&encoded, &mut decoded).unwrap();

        let decoded_len = decrypter.decrypt(encoded, &mut decoded).unwrap();

        let decoded = &decoded[..decoded_len];



        assert_eq!(decoded, &*input);
@@ -520,9 +520,9 @@ mod test { 
        decrypter.set_rsa_padding(Padding::PKCS1_OAEP).unwrap();

        decrypter.set_rsa_oaep_md(md).unwrap();

        decrypter.set_rsa_mgf1_md(md).unwrap();

        let buffer_len = decrypter.decrypt_len(&encoded).unwrap();

        let buffer_len = decrypter.decrypt_len(encoded).unwrap();

        let mut decoded = vec![0u8; buffer_len];

        let decoded_len = decrypter.decrypt(&encoded, &mut decoded).unwrap();

        let decoded_len = decrypter.decrypt(encoded, &mut decoded).unwrap();

        let decoded = &decoded[..decoded_len];



        assert_eq!(decoded, &*input);