Rename module

app

@@ -1 +1 @@
-Subproject commit 19af5f9e0be9e725264d85552fd60f46bffff32d
+Subproject commit b05d2d3a2dc7835d0d074986903a0f633ccc0f15

build.py

@@ -320,11 +320,11 @@ def zip_uninstaller(args):
 
 def sign_adjust_zip(unsigned, output):
 	signer_name = 'zipsigner-2.1.jar'
-	jarsigner = os.path.join('crypto', 'build', 'libs', signer_name)
+	jarsigner = os.path.join('utils', 'build', 'libs', signer_name)
 
 	if not os.path.exists(jarsigner):
 		header('* Building ' + signer_name)
-		proc = subprocess.run('{} crypto:shadowJar'.format(os.path.join('.', 'gradlew')), shell=True)
+		proc = subprocess.run('{} utils:shadowJar'.format(os.path.join('.', 'gradlew')), shell=True)
 		if proc.returncode != 0:
 			error('Build {} failed!'.format(signer_name))
 
@@ -349,7 +349,7 @@ def cleanup(args):
 
 	if 'java' in args.target:
 		header('* Cleaning java')
-		subprocess.run('{} app:clean snet:clean crypto:clean'.format(os.path.join('.', 'gradlew')), shell=True)
+		subprocess.run('{} app:clean snet:clean utils:clean'.format(os.path.join('.', 'gradlew')), shell=True)
 		for f in os.listdir('out'):
 			if '.apk' in f:
 				rm(os.path.join('out', f))

settings.gradle

@@ -1 +1 @@
-include ':app', ':core', ':crypto', ':snet'
+include ':app', ':core', ':utils', ':snet'

utils/build.gradle

@@ -8,7 +8,7 @@ targetCompatibility = "1.8"
 
 jar {
     manifest {
-        attributes 'Main-Class': 'com.topjohnwu.crypto.ZipSigner'
+        attributes 'Main-Class': 'com.topjohnwu.utils.ZipSigner'
     }
 }
 

utils/src/main/java/com/topjohnwu/utils/ByteArrayStream.java

@@ -1,4 +1,4 @@
-package com.topjohnwu.crypto;
+package com.topjohnwu.utils;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;

utils/src/main/java/com/topjohnwu/utils/CryptoUtils.java

@@ -1,4 +1,4 @@
-package com.topjohnwu.crypto;
+package com.topjohnwu.utils;
 
 import org.bouncycastle.asn1.ASN1InputStream;
 import org.bouncycastle.asn1.ASN1ObjectIdentifier;
@@ -22,7 +22,6 @@ import java.security.spec.ECPrivateKeySpec;
 import java.security.spec.ECPublicKeySpec;
 import java.security.spec.InvalidKeySpecException;
 import java.security.spec.PKCS8EncodedKeySpec;
-import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
 

utils/src/main/java/com/topjohnwu/utils/JarMap.java

@@ -1,4 +1,4 @@
-package com.topjohnwu.crypto;
+package com.topjohnwu.utils;
 
 import java.io.Closeable;
 import java.io.File;

utils/src/main/java/com/topjohnwu/utils/SignAPK.java

@@ -1,4 +1,4 @@
-package com.topjohnwu.crypto;
+package com.topjohnwu.utils;
 
 import org.bouncycastle.asn1.ASN1InputStream;
 import org.bouncycastle.asn1.ASN1ObjectIdentifier;
@@ -18,11 +18,9 @@ import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder;
 import org.bouncycastle.operator.jcajce.JcaDigestCalculatorProviderBuilder;
 import org.bouncycastle.util.encoders.Base64;
 
-import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.FilterOutputStream;

utils/src/main/java/com/topjohnwu/utils/SignBoot.java

@@ -1,4 +1,4 @@
-package com.topjohnwu.crypto;
+package com.topjohnwu.utils;
 
 import org.bouncycastle.asn1.ASN1Encodable;
 import org.bouncycastle.asn1.ASN1EncodableVector;

utils/src/main/java/com/topjohnwu/utils/ZipAdjust.java

@@ -1,17 +1,12 @@
-package com.topjohnwu.crypto;
+package com.topjohnwu.utils;
 
-import java.io.DataOutput;
-import java.io.DataOutputStream;
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.io.RandomAccessFile;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
-import java.nio.channels.FileChannel;
-import java.util.Arrays;
 
 public class ZipAdjust {
 

utils/src/main/java/com/topjohnwu/utils/ZipSigner.java

@@ -1,4 +1,4 @@
-package com.topjohnwu.crypto;
+package com.topjohnwu.utils;
 
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
 
@@ -6,9 +6,7 @@ import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
-import java.io.IOException;
 import java.io.InputStream;
 import java.security.Security;