From 5d479d6d5440374f0e53fb3a78355de87f8731d9 Mon Sep 17 00:00:00 2001 From: Dennis Schwerdel Date: Fri, 4 Jan 2019 12:32:48 +0100 Subject: [PATCH] Fixes --- CHANGELOG.md | 4 ++++ src/benches.rs | 2 +- src/config.rs | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index aef55af..7613c3f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ This project follows [semantic versioning](http://semver.org). +### UNRELEASED + +- [fixed] Hashed magics now also consider first character (**incompatible**) + ### v0.8.2 (2018-01-02) - [changed] Using serde instead of rustc_serialize diff --git a/src/benches.rs b/src/benches.rs index 560528e..b5f652b 100644 --- a/src/benches.rs +++ b/src/benches.rs @@ -20,7 +20,7 @@ use super::util::now as util_now; use super::poll::{Poll, Flags}; #[bench] -fn crypto_salsa20(b: &mut Bencher) { +fn crypto_chacha20(b: &mut Bencher) { Crypto::init(); let mut crypto = Crypto::from_shared_key(CryptoMethod::ChaCha20, "test"); let mut payload = [0; 1500]; diff --git a/src/config.rs b/src/config.rs index 8f83787..ec0e499 100644 --- a/src/config.rs +++ b/src/config.rs @@ -170,7 +170,7 @@ impl Config { if let Some(ref name) = self.magic { if name.starts_with("hash:") { let mut s = SipHasher24::new(); - name[6..].hash(&mut s); + name[5..].hash(&mut s); let mut data = [0; 4]; Encoder::write_u32((s.finish() & 0xffff_ffff) as u32, &mut data); data