Unverified Commit 1d325624 authored by Steven Fackler's avatar Steven Fackler Committed by GitHub
Browse files

Merge pull request #812 from Eijebong/bump_hex 

Bump hex to 0.3
parents d3fff74a bb5ab2b4

openssl/Cargo.toml

+1 −1
Original line number Diff line number Diff line
@@ -27,5 +27,5 @@ openssl-sys = { version = "0.9.23", path = "../openssl-sys" } 


[dev-dependencies]

tempdir = "0.3"

hex = "0.2"

hex = "0.3"

data-encoding = "2.0"

openssl/src/aes.rs

+2 −2
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
//! extern crate hex;

//! use openssl::aes::{AesKey, KeyError, aes_ige};

//! use openssl::symm::Mode;

//! use hex::{FromHex, ToHex};

//! use hex::FromHex;

//!

//! fn decrypt() -> Result<(), KeyError> {

//!   let raw_key = "000102030405060708090A0B0C0D0E0F";
@@ -38,7 +38,7 @@ 
//!     let key = AesKey::new_encrypt(&key_as_u8)?;

//!     let mut output = vec![0u8; cipher_as_u8.len()];

//!     aes_ige(&cipher_as_u8, &mut output, &key, &mut iv_as_u8, Mode::Encrypt);

//!     assert_eq!(output.to_hex(), "a6ad974d5cea1d36d2f367980907ed32");

//!     assert_eq!(hex::encode(output), "a6ad974d5cea1d36d2f367980907ed32");

//!   }

//!   Ok(())

//! }

openssl/src/hash.rs

+6 −6
Original line number Diff line number Diff line
@@ -265,20 +265,20 @@ pub fn hash(t: MessageDigest, data: &[u8]) -> Result<DigestBytes, ErrorStack> { 


#[cfg(test)]

mod tests {

    use hex::{FromHex, ToHex};

    use hex::{self, FromHex};

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



    use super::*;



    fn hash_test(hashtype: MessageDigest, hashtest: &(&str, &str)) {

        let res = hash(hashtype, &Vec::from_hex(hashtest.0).unwrap()).unwrap();

        assert_eq!(res.to_hex(), hashtest.1);

        assert_eq!(hex::encode(res), hashtest.1);

    }



    fn hash_recycle_test(h: &mut Hasher, hashtest: &(&str, &str)) {

        let _ = h.write_all(&Vec::from_hex(hashtest.0).unwrap()).unwrap();

        let res = h.finish().unwrap();

        assert_eq!(res.to_hex(), hashtest.1);

        assert_eq!(hex::encode(res), hashtest.1);

    }



    // Test vectors from http://www.nsrl.nist.gov/testdata/
@@ -344,18 +344,18 @@ mod tests { 
            let mut h2 = h1.clone();

            h2.write_all(&inp[p..]).unwrap();

            let res = h2.finish().unwrap();

            assert_eq!(res.to_hex(), md5_tests[i].1);

            assert_eq!(hex::encode(res), md5_tests[i].1);

        }

        h1.write_all(&inp[p..]).unwrap();

        let res = h1.finish().unwrap();

        assert_eq!(res.to_hex(), md5_tests[i].1);

        assert_eq!(hex::encode(res), md5_tests[i].1);



        println!("Clone a finished hasher");

        let mut h3 = h1.clone();

        h3.write_all(&Vec::from_hex(md5_tests[i + 1].0).unwrap())

            .unwrap();

        let res = h3.finish().unwrap();

        assert_eq!(res.to_hex(), md5_tests[i + 1].1);

        assert_eq!(hex::encode(res), md5_tests[i + 1].1);

    }



    #[test]

openssl/src/pkcs12.rs

+5 −7
Original line number Diff line number Diff line
@@ -186,7 +186,7 @@ impl Pkcs12Builder { 
#[cfg(test)]

mod test {

    use hash::MessageDigest;

    use hex::ToHex;

    use hex;



    use asn1::Asn1Time;

    use rsa::Rsa;
@@ -204,21 +204,19 @@ mod test { 
        let parsed = pkcs12.parse("mypass").unwrap();



        assert_eq!(

            parsed

            hex::encode(parsed

                .cert

                .fingerprint(MessageDigest::sha1())

                .unwrap()

                .to_hex(),

                .unwrap()),

            "59172d9313e84459bcff27f967e79e6e9217e584"

        );



        let chain = parsed.chain.unwrap();

        assert_eq!(chain.len(), 1);

        assert_eq!(

            chain[0]

            hex::encode(chain[0]

                .fingerprint(MessageDigest::sha1())

                .unwrap()

                .to_hex(),

                .unwrap()),

            "c0cbdf7cdd03c9773e5468e1f6d2da7d5cbb1875"

        );

    }

openssl/src/pkcs5.rs

+2 −2
Original line number Diff line number Diff line
@@ -548,7 +548,7 @@ mod tests { 
    #[test]

    #[cfg(all(feature = "v110", ossl110))]

    fn scrypt() {

        use hex::ToHex;

        use hex;



        let pass = "pleaseletmein";

        let salt = "SodiumChloride";
@@ -565,6 +565,6 @@ mod tests { 
            0,

            &mut actual,

        ).unwrap();

        assert_eq!((&actual[..]).to_hex(), expected);

        assert_eq!(hex::encode(&actual[..]), expected);

    }

}