From 98e3ca47e687a68254d4696ece3292806bcedc4f Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Sat, 24 Sep 2016 16:00:56 +0000
Subject: [PATCH] Utils: Move SipHashInline from util to crypto
---
core/java/src/net/i2p/{util => crypto}/SipHashInline.java | 6 ++++--
core/java/src/net/i2p/util/SipHash.java | 4 +++-
2 files changed, 7 insertions(+), 3 deletions(-)
rename core/java/src/net/i2p/{util => crypto}/SipHashInline.java (98%)
diff --git a/core/java/src/net/i2p/util/SipHashInline.java b/core/java/src/net/i2p/crypto/SipHashInline.java
similarity index 98%
rename from core/java/src/net/i2p/util/SipHashInline.java
rename to core/java/src/net/i2p/crypto/SipHashInline.java
index 7d02b2b1a6..90a212ce12 100644
--- a/core/java/src/net/i2p/util/SipHashInline.java
+++ b/core/java/src/net/i2p/crypto/SipHashInline.java
@@ -1,4 +1,4 @@
-package net.i2p.util;
+package net.i2p.crypto;
/*
* As pulled from https://github.com/nahi/siphash-java-inline
@@ -33,7 +33,9 @@ package net.i2p.util;
*
* I2P mods: add off/len version
*
- * @since 0.9.5, public since 0.9.27
+ * For constant keys see net.i2p.util.SipHash
+ *
+ * @since 0.9.5, Moved to net.i2p.crypto and public since 0.9.27
*/
public final class SipHashInline {
diff --git a/core/java/src/net/i2p/util/SipHash.java b/core/java/src/net/i2p/util/SipHash.java
index 36efce0062..d1af7f82a4 100644
--- a/core/java/src/net/i2p/util/SipHash.java
+++ b/core/java/src/net/i2p/util/SipHash.java
@@ -3,8 +3,10 @@ package net.i2p.util;
// uncomment to test reference implementation
//import com.github.emboss.siphash.*;
+import net.i2p.crypto.SipHashInline;
+
/**
- * Wrapper around SipHashInline
+ * Wrapper around SipHashInline with constant per-JVM keys
*
* @since 0.9.5
*/
--
GitLab