aboutsummaryrefslogtreecommitdiffstats
path: root/components/net/subresource_integrity.rs
diff options
context:
space:
mode:
authorKsbugbee <ksb30@me.com>2017-05-07 23:03:17 -0400
committerKsbugbee <ksb30@me.com>2017-05-08 13:39:28 -0400
commitb4d894e119b6108c58410d729164bd81812422c6 (patch)
tree16628cf73fb11013f45e3df97a16c1afcc2fcbda /components/net/subresource_integrity.rs
parent4e390e2630f244e77032ded404ca885c3e3ed8a7 (diff)
downloadservo-b4d894e119b6108c58410d729164bd81812422c6.tar.gz
servo-b4d894e119b6108c58410d729164bd81812422c6.zip
Use hash2 instead of deprecated hash
Removed X's from PULL_REQUEST_TEMPLATE.md Commented changes
Diffstat (limited to 'components/net/subresource_integrity.rs')
-rw-r--r--components/net/subresource_integrity.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/components/net/subresource_integrity.rs b/components/net/subresource_integrity.rs
index 68cc6b7c930..ae6cfe9c14a 100644
--- a/components/net/subresource_integrity.rs
+++ b/components/net/subresource_integrity.rs
@@ -4,7 +4,7 @@
use base64;
use net_traits::response::{Response, ResponseBody, ResponseType};
-use openssl::hash::{MessageDigest, hash};
+use openssl::hash::{MessageDigest, hash2};
use std::iter::Filter;
use std::str::Split;
use std::sync::MutexGuard;
@@ -119,7 +119,7 @@ fn apply_algorithm_to_response(body: MutexGuard<ResponseBody>,
message_digest: MessageDigest)
-> String {
if let ResponseBody::Done(ref vec) = *body {
- let response_digest = hash(message_digest, vec).unwrap();
+ let response_digest = hash2(message_digest, vec).unwrap(); //Now hash2
base64::encode(&response_digest)
} else {
unreachable!("Tried to calculate digest of incomplete response body")