mirrors/http-signature-normalization
1
0
Fork 0
mirror of https://git.asonix.dog/asonix/http-signature-normalization.git synced 2024-11-25 10:51:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update sha2 and sha3

Browse source
This commit is contained in:
asonix 2020-06-10 17:15:19 -05:00
parent 85932442fe
commit b0080ae668
3 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
http-signature-normalization-actix/Cargo.toml
View file

@ -33,8 +33,8 @@ chrono = "0.4.6"
futures = "0.3" futures = "0.3"
http-signature-normalization = { version = "0.5.0", path = ".." } http-signature-normalization = { version = "0.5.0", path = ".." }
log = "0.4" log = "0.4"
sha2 = { version = "0.8", optional = true } sha2 = { version = "0.9", optional = true }
sha3 = { version = "0.8", optional = true } sha3 = { version = "0.9", optional = true }
thiserror = "1.0" thiserror = "1.0"
[dev-dependencies] [dev-dependencies]

8
http-signature-normalization-actix/src/digest/sha2.rs
View file

@ -4,8 +4,8 @@ use sha2::{Sha224, Sha256, Sha384, Sha512, Sha512Trunc224, Sha512Trunc256};
use super::{DigestCreate, DigestPart, DigestVerify}; use super::{DigestCreate, DigestPart, DigestVerify};
fn create(digest: &mut impl sha2::Digest, input: &[u8]) -> String { fn create(digest: &mut impl sha2::Digest, input: &[u8]) -> String {
digest.input(input); digest.update(input);
base64::encode(&digest.result_reset()) base64::encode(&digest.finalize_reset())
} }
fn verify(digest: &mut impl sha2::Digest, name: &str, parts: &[DigestPart], bytes: &[u8]) -> bool { fn verify(digest: &mut impl sha2::Digest, name: &str, parts: &[DigestPart], bytes: &[u8]) -> bool {
@ -14,8 +14,8 @@ fn verify(digest: &mut impl sha2::Digest, name: &str, parts: &[DigestPart], byte
.find(|p| p.algorithm.to_lowercase() == name.to_lowercase()) .find(|p| p.algorithm.to_lowercase() == name.to_lowercase())
{ {
debug!("Verifying digest type, {}", name); debug!("Verifying digest type, {}", name);
digest.input(bytes); digest.update(bytes);
let encoded = base64::encode(&digest.result_reset()); let encoded = base64::encode(&digest.finalize_reset());
return part.digest == encoded; return part.digest == encoded;
} }

8
http-signature-normalization-actix/src/digest/sha3.rs
View file

@ -7,8 +7,8 @@ use sha3::{
use super::{DigestCreate, DigestPart, DigestVerify}; use super::{DigestCreate, DigestPart, DigestVerify};
fn create(digest: &mut impl sha2::Digest, input: &[u8]) -> String { fn create(digest: &mut impl sha2::Digest, input: &[u8]) -> String {
digest.input(input); digest.update(input);
base64::encode(&digest.result_reset()) base64::encode(&digest.finalize_reset())
} }
fn verify(digest: &mut impl sha2::Digest, name: &str, parts: &[DigestPart], bytes: &[u8]) -> bool { fn verify(digest: &mut impl sha2::Digest, name: &str, parts: &[DigestPart], bytes: &[u8]) -> bool {
@ -17,8 +17,8 @@ fn verify(digest: &mut impl sha2::Digest, name: &str, parts: &[DigestPart], byte
.find(|p| p.algorithm.to_lowercase() == name.to_lowercase()) .find(|p| p.algorithm.to_lowercase() == name.to_lowercase())
{ {
debug!("Verifying digest type, {}", name); debug!("Verifying digest type, {}", name);
digest.input(bytes); digest.update(bytes);
let encoded = base64::encode(&digest.result_reset()); let encoded = base64::encode(&digest.finalize_reset());
return part.digest == encoded; return part.digest == encoded;
} }