From 4497ddaf132300ee6685d2473969721b7dfaa3d5 Mon Sep 17 00:00:00 2001
From: Dennis Schwerdel <schwerdel@informatik.uni-kl.de>
Date: Wed, 23 Nov 2016 11:37:09 +0100
Subject: [PATCH] Using external siphasher to avoid warning

---
 Cargo.lock    | 7 +++++++
 Cargo.toml    | 1 +
 src/config.rs | 5 +++--
 src/main.rs   | 1 +
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 16dceb1..9297d4d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -16,6 +16,7 @@ dependencies = [
  "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-serialize 0.3.21 (registry+https://github.com/rust-lang/crates.io-index)",
  "signal 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "siphasher 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)",
  "yaml-rust 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -278,6 +279,11 @@ dependencies = [
  "nix 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "siphasher"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "solicit"
 version = "0.4.4"
@@ -443,6 +449,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum rustc_version 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "c5f5376ea5e30ce23c03eb77cbe4962b988deead10910c372b226388b594c084"
 "checksum semver 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)" = "d4f410fedcf71af0345d7607d246e7ad15faaadd49d240ee3b24e5dc21a820ac"
 "checksum signal 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "beb615e58999635b6063277cf520f2d88824955c1056cf4f166b0f55b218512d"
+"checksum siphasher 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b1c3c58c9ac43c530919fe6bd8ef11ae2612f64c2bf8eab9346f5b71ce0617f2"
 "checksum solicit 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "172382bac9424588d7840732b250faeeef88942e37b6e35317dce98cafdd75b2"
 "checksum strsim 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "67f84c44fbb2f91db7fef94554e6b2ac05909c9c0b0bc23bb98d3a1aebfe7f7c"
 "checksum thread-id 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a9539db560102d1cef46b8b78ce737ff0bb64e7e18d35b2a5688f7d097d0ff03"
diff --git a/Cargo.toml b/Cargo.toml
index 4c7e185..384c010 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -25,6 +25,7 @@ net2 = "0.2"
 bitflags = "0.7"
 yaml-rust = "0.3"
 igd = "0.5"
+siphasher = "0.1"
 
 [build-dependencies]
 gcc = "0.3"
diff --git a/src/config.rs b/src/config.rs
index 5a937f4..1fceb81 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -5,7 +5,8 @@ use super::types::{Mode, HeaderMagic};
 use super::crypto::CryptoMethod;
 use super::util::{Encoder, Duration};
 
-use std::hash::{Hash, SipHasher, Hasher};
+use std::hash::{Hash, Hasher};
+use siphasher::sip::SipHasher24;
 
 
 #[derive(RustcDecodable, Debug, PartialEq)]
@@ -135,7 +136,7 @@ impl Config {
     pub fn get_magic(&self) -> HeaderMagic {
         if let Some(ref name) = self.magic {
             if name.starts_with("hash:") {
-                let mut s = SipHasher::new();
+                let mut s = SipHasher24::new();
                 name[6..].hash(&mut s);
                 let mut data = [0; 4];
                 Encoder::write_u32((s.finish() & 0xffffffff) as u32, &mut data);
diff --git a/src/main.rs b/src/main.rs
index f123a67..5e54fef 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -18,6 +18,7 @@ extern crate fnv;
 extern crate net2;
 extern crate yaml_rust;
 extern crate igd;
+extern crate siphasher;
 #[cfg(feature = "bench")] extern crate test;
 
 #[macro_use] pub mod util;