Commit 70496c9f authored by sanketh's avatar sanketh
Browse files

address review comments

parent 003e6f2c

openssl/src/hash.rs

+44 −6
Original line number Diff line number Diff line
@@ -280,8 +280,11 @@ impl Hasher { 


    /// Feeds data into the hasher.

    pub fn update(&mut self, data: &[u8]) -> Result<(), ErrorStack> {

        if self.state == Finalized {

            self.init()?;

        match self.state {

            #[cfg(ossl330)]

            Squeeze => self.init()?,

            Finalized => self.init()?,

            _ => {}

        }

        unsafe {

            cvt(ffi::EVP_DigestUpdate(
@@ -298,6 +301,9 @@ impl Hasher { 
    /// The output will be as long as the buf.

    #[cfg(ossl330)]

    pub fn squeeze_xof(&mut self, buf: &mut [u8]) -> Result<(), ErrorStack> {

        if self.state == Finalized {

            self.init()?;

        }

        unsafe {

            cvt(ffi::EVP_DigestSqueeze(

                self.ctx,
@@ -311,8 +317,11 @@ impl Hasher { 


    /// Returns the hash of the data written and resets the non-XOF hasher.

    pub fn finish(&mut self) -> Result<DigestBytes, ErrorStack> {

        if self.state == Finalized {

            self.init()?;

        match self.state {

            #[cfg(ossl330)]

            Squeeze => self.init()?,

            Finalized => self.init()?,

            _ => {}

        }

        unsafe {

            #[cfg(not(boringssl))]
@@ -337,8 +346,11 @@ impl Hasher { 
    /// The hash will be as long as the buf.

    #[cfg(ossl111)]

    pub fn finish_xof(&mut self, buf: &mut [u8]) -> Result<(), ErrorStack> {

        if self.state == Finalized {

            self.init()?;

        match self.state {

            #[cfg(ossl330)]

            Squeeze => self.init()?,

            Finalized => self.init()?,

            _ => {}

        }

        unsafe {

            cvt(ffi::EVP_DigestFinalXOF(
@@ -576,6 +588,32 @@ mod tests { 
        assert_eq!(&*res, &*null);

    }



    #[cfg(ossl330)]

    #[test]

    fn test_finish_then_squeeze() {

        let digest = MessageDigest::shake_128();

        let mut h = Hasher::new(digest).unwrap();

        let mut buf = vec![0; digest.size()];

        h.finish_xof(&mut buf).unwrap();

        h.squeeze_xof(&mut buf).unwrap();

        let null = hash(digest, &[]).unwrap();

        assert_eq!(&*buf, &*null);

    }



    #[cfg(ossl330)]

    #[test]

    fn test_squeeze_then_update() {

        let digest = MessageDigest::shake_128();

        let data = Vec::from_hex(MD5_TESTS[6].0).unwrap();

        let mut h = Hasher::new(digest).unwrap();

        let mut buf = vec![0; digest.size()];

        h.squeeze_xof(&mut buf).unwrap();

        h.update(&data).unwrap();

        h.squeeze_xof(&mut buf).unwrap();

        let null = hash(digest, &data).unwrap();

        assert_eq!(&*buf, &*null);

    }



    #[test]

    #[allow(clippy::redundant_clone)]

    fn test_clone() {