From 436b9895689e3c0dcf15da7e162dee17abc204d9 Mon Sep 17 00:00:00 2001 From: nathan Date: Sat, 20 Sep 2014 02:17:25 +0200 Subject: [PATCH] Removed dependency on JavaLauncher, it's now JavaLauncher-Util -- which is shared --- Dorkbox-Util/.classpath | 2 +- Dorkbox-Util/src/dorkbox/util/Sys.java | 2 -- Dorkbox-Util/src/dorkbox/util/crypto/Crypto.java | 6 +++--- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Dorkbox-Util/.classpath b/Dorkbox-Util/.classpath index 8671dc9..e3ce5ef 100644 --- a/Dorkbox-Util/.classpath +++ b/Dorkbox-Util/.classpath @@ -23,6 +23,6 @@ - + diff --git a/Dorkbox-Util/src/dorkbox/util/Sys.java b/Dorkbox-Util/src/dorkbox/util/Sys.java index 3f03a18..2160ba0 100644 --- a/Dorkbox-Util/src/dorkbox/util/Sys.java +++ b/Dorkbox-Util/src/dorkbox/util/Sys.java @@ -717,7 +717,6 @@ public class Sys { } } jarFile.close(); - } // Files inside of box deployment else if (connection instanceof BoxURLConnection) { @@ -743,7 +742,6 @@ public class Sys { } } - /** * remove directories from the search. make sure it's a class file shortcut so we don't load ALL .class files! * diff --git a/Dorkbox-Util/src/dorkbox/util/crypto/Crypto.java b/Dorkbox-Util/src/dorkbox/util/crypto/Crypto.java index 6989ec2..cacc4c8 100644 --- a/Dorkbox-Util/src/dorkbox/util/crypto/Crypto.java +++ b/Dorkbox-Util/src/dorkbox/util/crypto/Crypto.java @@ -69,6 +69,8 @@ import org.bouncycastle.jce.spec.ECParameterSpec; import org.bouncycastle.math.ec.ECFieldElement; import org.bouncycastle.math.ec.ECPoint; +import dorkbox.urlHandler.Box; + /** * http://en.wikipedia.org/wiki/NSA_Suite_B * http://www.nsa.gov/ia/programs/suiteb_cryptography/ @@ -168,9 +170,7 @@ public class Crypto { * Specifically, to return the hash of the ALL files/directories inside the jar, minus the action specified (LGPL) files. */ public static final byte[] hashJarContentsExcludeAction(JarFile jarFile, Digest digest, int action) throws IOException { - // repack token: ':|', from BoxHandler. - // if this is CHANGED, make sure to update it there as well. - String token = ":|"; + String token = Box.repack; Enumeration jarElements = jarFile.entries();