Skip to content

Commit 141ac85

Browse files
committed
refactor: rrset_signature.rs previusly using rust-crypto have been updated
1 parent 9d5af14 commit 141ac85

File tree

1 file changed

+8
-7
lines changed

1 file changed

+8
-7
lines changed

src/dnssec/rrset_signature.rs

+8-7
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
use sha2::{Sha256, Digest};
2-
use crypto::digest::Digest as RustDigest;
3-
use crypto::sha1::Sha1;
2+
use sha1::Sha1;
43
use data_encoding::BASE64;
54
use crate::message::rdata::Rdata;
65
use crate::message::rdata::dnskey_rdata::DnskeyRdata;
@@ -36,9 +35,10 @@ pub fn verify_rrsig(rrsig: &RRSIGRdata, dnskey: &DnskeyRdata, rrset: &[ResourceR
3635
3 | 5 => {
3736
// (DSA/RSA)/SHA1
3837
let mut sha1 = Sha1::new();
39-
sha1.input(&rrsig_data);
40-
let digest = sha1.result_str();
41-
Ok(digest == BASE64.encode(&signature))
38+
sha1.update(&rrsig_data);
39+
let digest = sha1.finalize();
40+
let hex_digest = hex::encode(digest);
41+
Ok(hex_digest == BASE64.encode(&signature))
4242
},
4343
8 => {
4444
// RSA/SHA256
@@ -54,8 +54,9 @@ pub fn verify_ds(ds_record: &ResourceRecord, dnskey: &DnskeyRdata) -> Result<boo
5454
let hashed_key = match ds_rdata.algorithm {
5555
1 => {
5656
let mut hasher = Sha1::new();
57-
hasher.input(&dnskey_bytes);
58-
hasher.result_str()
57+
hasher.update(&dnskey_bytes);
58+
let result = hasher.finalize();
59+
hex::encode(result)
5960
},
6061
2 => {
6162
let hashed = Sha256::digest(&dnskey_bytes);

0 commit comments

Comments
 (0)