update to newer version of DynDigest trait which allows clone.

windelbouwman · windelbouwman · commit 7ab5d53642aa · 2019-06-30T10:10:17.000+02:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/vm/Cargo.toml b/vm/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2018"
 
 [dependencies]
 # Crypto:
-digest = "0.8"
+digest = "0.8.1"
 md-5 = "0.8"
 sha-1 = "0.8"
 sha2 = "0.8"
diff --git a/vm/src/stdlib/hashlib.rs b/vm/src/stdlib/hashlib.rs
@@ -5,8 +5,6 @@ use crate::obj::objtype::PyClassRef;
 use crate::pyobject::{PyClassImpl, PyObjectRef, PyResult, PyValue};
 use crate::vm::VirtualMachine;
 use std::cell::RefCell;
-// use std::clone::Clone;
-// use std::ops::Deref;
 use std::fmt;
 
 use blake2::{Blake2b, Blake2s};
@@ -79,7 +77,7 @@ impl PyHasher {
     }
 
     fn get_digest(&self) -> Vec<u8> {
-        self.buffer.borrow_mut().get_digest()
+        self.buffer.borrow().get_digest()
     }
 }
 
@@ -201,7 +199,6 @@ pub fn make_module(vm: &VirtualMachine) -> PyObjectRef {
 /// Generic wrapper patching around the hashing libraries.
 struct HashWrapper {
     inner: Box<DynDigest>,
-    data: Vec<u8>,
 }
 
 impl HashWrapper {
@@ -210,10 +207,7 @@ impl HashWrapper {
         D: DynDigest,
         D: Sized,
     {
-        HashWrapper {
-            inner: Box::new(d),
-            data: vec![],
-        }
+        HashWrapper { inner: Box::new(d) }
     }
 
     fn md5() -> Self {
@@ -274,18 +268,15 @@ impl HashWrapper {
     }
 
     fn input(&mut self, data: &[u8]) {
-        // TODO: this is super not efficient. Find a better way for this.
-        self.data.extend(data);
+        self.inner.input(data);
     }
 
     fn digest_size(&self) -> usize {
         self.inner.output_size()
     }
 
-    fn get_digest(&mut self) -> Vec<u8> {
-        // TODO: this is super not efficient. Find a better way for this:
-        self.inner.input(&self.data);
-        let res = self.inner.result_reset().to_vec();
-        res
+    fn get_digest(&self) -> Vec<u8> {
+        let cloned = self.inner.clone();
+        cloned.result().to_vec()
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,6 @@ use crate::obj::objtype::PyClassRef;`
`5`	`5`	`use crate::pyobject::{PyClassImpl, PyObjectRef, PyResult, PyValue};`
`6`	`6`	`use crate::vm::VirtualMachine;`
`7`	`7`	`use std::cell::RefCell;`
`8`		`-// use std::clone::Clone;`
`9`		`-// use std::ops::Deref;`
`10`	`8`	`use std::fmt;`
`11`	`9`
`12`	`10`	`use blake2::{Blake2b, Blake2s};`
`@@ -79,7 +77,7 @@ impl PyHasher {`
`79`	`77`	`}`
`80`	`78`
`81`	`79`	`fn get_digest(&self) -> Vec<u8> {`
`82`		`- self.buffer.borrow_mut().get_digest()`
	`80`	`+ self.buffer.borrow().get_digest()`
`83`	`81`	`}`
`84`	`82`	`}`
`85`	`83`
`@@ -201,7 +199,6 @@ pub fn make_module(vm: &VirtualMachine) -> PyObjectRef {`
`201`	`199`	`/// Generic wrapper patching around the hashing libraries.`
`202`	`200`	`struct HashWrapper {`
`203`	`201`	`inner: Box<DynDigest>,`
`204`		`- data: Vec<u8>,`
`205`	`202`	`}`
`206`	`203`
`207`	`204`	`impl HashWrapper {`
`@@ -210,10 +207,7 @@ impl HashWrapper {`
`210`	`207`	`D: DynDigest,`
`211`	`208`	`D: Sized,`
`212`	`209`	`{`
`213`		`- HashWrapper {`
`214`		`- inner: Box::new(d),`
`215`		`- data: vec![],`
`216`		`- }`
	`210`	`+ HashWrapper { inner: Box::new(d) }`
`217`	`211`	`}`
`218`	`212`
`219`	`213`	`fn md5() -> Self {`
`@@ -274,18 +268,15 @@ impl HashWrapper {`
`274`	`268`	`}`
`275`	`269`
`276`	`270`	`fn input(&mut self, data: &[u8]) {`
`277`		`- // TODO: this is super not efficient. Find a better way for this.`
`278`		`- self.data.extend(data);`
	`271`	`+ self.inner.input(data);`
`279`	`272`	`}`
`280`	`273`
`281`	`274`	`fn digest_size(&self) -> usize {`
`282`	`275`	`self.inner.output_size()`
`283`	`276`	`}`
`284`	`277`
`285`		`- fn get_digest(&mut self) -> Vec<u8> {`
`286`		`- // TODO: this is super not efficient. Find a better way for this:`
`287`		`- self.inner.input(&self.data);`
`288`		`- let res = self.inner.result_reset().to_vec();`
`289`		`- res`
	`278`	`+ fn get_digest(&self) -> Vec<u8> {`
	`279`	`+ let cloned = self.inner.clone();`
	`280`	`+ cloned.result().to_vec()`
`290`	`281`	`}`
`291`	`282`	`}`