Rename packages

.gitignore

@@ -7,6 +7,8 @@ bin/
 *.war
 *.dex
 *.ear
+/apksigner
+/apksigner.jar
 
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*

README.md

@@ -1,6 +1,11 @@
-android-jarsigner
-=================
+apksigner
+=========
+A lightweight APK signing tool that can be run on Android devices.
 
-Getting jarsigner-like functionality on android.
+Usage
+=====
+Run as `apksigner [-p password] keystore input-apk output-apk`. This will use the specified keystore (or creating one if necessary) to create a signed and zipaligned output file.
 
-Stripped down code from https://code.google.com/p/zip-signer/ - not yet ready to use.
+License
+=======
+[Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0). Based on [zip-signer](https://code.google.com/p/zip-signer/) by Ken Ellinwood.

build.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project default="create-jar">
+<project default="create-executable">
 
 	<target name="download-libs">
 		<get src="https://repo1.maven.org/maven2/com/madgag/spongycastle/core/1.54.0.0/core-1.54.0.0.jar" dest="lib/spongcyastle-core.jar"/>
@@ -27,7 +27,7 @@
 	<target name="create-jar" depends="compile">
 		<jar destfile="apksigner.jar" filesetmanifest="mergewithoutmain">
 			<manifest>
-				<attribute name="Main-Class" value="kellinwood.zipsigner.cmdline.Main" />
+				<attribute name="Main-Class" value="net.fornwall.apksigner.Main" />
 				<attribute name="Class-Path" value="." />
 			</manifest>
 			<fileset dir="bin/" />
@@ -37,4 +37,15 @@
 			<zipfileset excludes="META-INF/*.SF" src="lib/commons-cli.jar" />
 		</jar>
 	</target>
+
+	<target name="create-executable" depends="create-jar">
+		<concat destfile="apksigner" binary="true">
+			<filelist>
+				<file name="stub.sh" />
+				<file name="apksigner.jar" />
+			</filelist>
+		</concat>
+		<chmod file="apksigner" perm="a+x" />
+	</target>
+
 </project>

src/net/fornwall/apksigner/Base64.java

@@ -0,0 +1,21 @@
+package net.fornwall.apksigner;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+
+import org.spongycastle.util.encoders.Base64Encoder;
+
+/** Base64 encoding handling in a portable way across Android and JSE. */
+public class Base64 {
+
+	public static String encode(byte[] data) {
+		ByteArrayOutputStream baos = new ByteArrayOutputStream();
+		try {
+			new Base64Encoder().encode(data, 0, data.length, baos);
+		} catch (IOException e) {
+			throw new RuntimeException(e);
+		}
+		return new String(baos.toByteArray());
+	}
+
+}

src/kellinwood/security/zipsigner/optional/CertCreator.java → src/net/fornwall/apksigner/CertCreator.java

@@ -1,4 +1,4 @@
-package kellinwood.security.zipsigner.optional;
+package net.fornwall.apksigner;
 
 import java.io.File;
 import java.io.IOException;
@@ -13,8 +13,6 @@
 import java.util.Map;
 import java.util.Vector;
 
-import kellinwood.security.zipsigner.KeySet;
-
 import org.spongycastle.asn1.ASN1ObjectIdentifier;
 import org.spongycastle.asn1.x500.style.BCStyle;
 import org.spongycastle.jce.X509Principal;

src/kellinwood/security/zipsigner/optional/JKS.java → src/net/fornwall/apksigner/JKS.java

@@ -22,7 +22,7 @@
 power to enforce restrictions on reverse-engineering of their software,
 and it is irresponsible for them to claim they can.  */
 
-package kellinwood.security.zipsigner.optional;
+package net.fornwall.apksigner;
 
 import java.io.ByteArrayInputStream;
 import java.io.DataInputStream;

src/kellinwood/security/zipsigner/KeySet.java → src/net/fornwall/apksigner/KeySet.java

@@ -1,4 +1,4 @@
-package kellinwood.security.zipsigner;
+package net.fornwall.apksigner;
 
 import java.security.PrivateKey;
 import java.security.cert.X509Certificate;

src/kellinwood/security/zipsigner/optional/KeyStoreFileManager.java → src/net/fornwall/apksigner/KeyStoreFileManager.java

@@ -1,4 +1,4 @@
-package kellinwood.security.zipsigner.optional;
+package net.fornwall.apksigner;
 
 import java.io.File;
 import java.io.FileInputStream;

src/kellinwood/security/zipsigner/optional/LoadKeystoreException.java → src/net/fornwall/apksigner/LoadKeystoreException.java

@@ -1,4 +1,4 @@
-package kellinwood.security.zipsigner.optional;
+package net.fornwall.apksigner;
 
 import java.io.IOException;
 

src/kellinwood/zipsigner/cmdline/Main.java → src/net/fornwall/apksigner/Main.java

@@ -1,4 +1,4 @@
-package kellinwood.zipsigner.cmdline;
+package net.fornwall.apksigner;
 
 import java.io.File;
 import java.security.KeyStore;
@@ -13,10 +13,6 @@
 import org.apache.commons.cli.Options;
 import org.apache.commons.cli.ParseException;
 
-import kellinwood.security.zipsigner.ZipSigner;
-import kellinwood.security.zipsigner.optional.CertCreator;
-import kellinwood.security.zipsigner.optional.KeyStoreFileManager;
-
 /** Sign files from the command line using zipsigner-lib. */
 public class Main {
 

src/kellinwood/security/zipsigner/optional/SignatureBlockGenerator.java → src/net/fornwall/apksigner/SignatureBlockGenerator.java

@@ -1,6 +1,4 @@
-package kellinwood.security.zipsigner.optional;
-
-import kellinwood.security.zipsigner.KeySet;
+package net.fornwall.apksigner;
 
 import org.spongycastle.cert.jcajce.JcaCertStore;
 import org.spongycastle.cms.*;