diff --git a/.gitignore b/.gitignore index 77db69e..323e57b 100644 --- a/.gitignore +++ b/.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* diff --git a/LICENSE b/LICENSE deleted file mode 100644 index 5c304d1..0000000 --- a/LICENSE +++ /dev/null @@ -1,201 +0,0 @@ -Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "{}" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright {yyyy} {name of copyright owner} - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/README.md b/README.md index e3e7ea5..6ef1877 100644 --- a/README.md +++ b/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. diff --git a/build.xml b/build.xml index 63c4961..19e0b2f 100644 --- a/build.xml +++ b/build.xml @@ -1,5 +1,5 @@ - + @@ -27,7 +27,7 @@ - + @@ -37,4 +37,15 @@ + + + + + + + + + + + diff --git a/src/kellinwood/security/zipsigner/Base64.java b/src/kellinwood/security/zipsigner/Base64.java deleted file mode 100644 index 33d6285..0000000 --- a/src/kellinwood/security/zipsigner/Base64.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright (C) 2010 Ken Ellinwood. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package kellinwood.security.zipsigner; - -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()); - } - -} \ No newline at end of file diff --git a/src/net/fornwall/apksigner/Base64.java b/src/net/fornwall/apksigner/Base64.java new file mode 100644 index 0000000..cc51c04 --- /dev/null +++ b/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()); + } + +} \ No newline at end of file diff --git a/src/kellinwood/security/zipsigner/optional/CertCreator.java b/src/net/fornwall/apksigner/CertCreator.java similarity index 98% rename from src/kellinwood/security/zipsigner/optional/CertCreator.java rename to src/net/fornwall/apksigner/CertCreator.java index 8c38269..7dd1c47 100644 --- a/src/kellinwood/security/zipsigner/optional/CertCreator.java +++ b/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; diff --git a/src/kellinwood/security/zipsigner/optional/JKS.java b/src/net/fornwall/apksigner/JKS.java similarity index 99% rename from src/kellinwood/security/zipsigner/optional/JKS.java rename to src/net/fornwall/apksigner/JKS.java index 1e7f140..64f4352 100644 --- a/src/kellinwood/security/zipsigner/optional/JKS.java +++ b/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; diff --git a/src/kellinwood/security/zipsigner/KeySet.java b/src/net/fornwall/apksigner/KeySet.java similarity index 93% rename from src/kellinwood/security/zipsigner/KeySet.java rename to src/net/fornwall/apksigner/KeySet.java index d7575d9..ec32b71 100644 --- a/src/kellinwood/security/zipsigner/KeySet.java +++ b/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; diff --git a/src/kellinwood/security/zipsigner/optional/KeyStoreFileManager.java b/src/net/fornwall/apksigner/KeyStoreFileManager.java similarity index 98% rename from src/kellinwood/security/zipsigner/optional/KeyStoreFileManager.java rename to src/net/fornwall/apksigner/KeyStoreFileManager.java index fd2ddee..a226adc 100644 --- a/src/kellinwood/security/zipsigner/optional/KeyStoreFileManager.java +++ b/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; diff --git a/src/kellinwood/security/zipsigner/optional/LoadKeystoreException.java b/src/net/fornwall/apksigner/LoadKeystoreException.java similarity index 86% rename from src/kellinwood/security/zipsigner/optional/LoadKeystoreException.java rename to src/net/fornwall/apksigner/LoadKeystoreException.java index 736a26d..c7cd9b3 100644 --- a/src/kellinwood/security/zipsigner/optional/LoadKeystoreException.java +++ b/src/net/fornwall/apksigner/LoadKeystoreException.java @@ -1,4 +1,4 @@ -package kellinwood.security.zipsigner.optional; +package net.fornwall.apksigner; import java.io.IOException; diff --git a/src/kellinwood/zipsigner/cmdline/Main.java b/src/net/fornwall/apksigner/Main.java similarity index 94% rename from src/kellinwood/zipsigner/cmdline/Main.java rename to src/net/fornwall/apksigner/Main.java index 4576ba0..ff1f2b3 100644 --- a/src/kellinwood/zipsigner/cmdline/Main.java +++ b/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 { diff --git a/src/kellinwood/security/zipsigner/optional/SignatureBlockGenerator.java b/src/net/fornwall/apksigner/SignatureBlockGenerator.java similarity index 95% rename from src/kellinwood/security/zipsigner/optional/SignatureBlockGenerator.java rename to src/net/fornwall/apksigner/SignatureBlockGenerator.java index 0d0d9b6..c36933d 100644 --- a/src/kellinwood/security/zipsigner/optional/SignatureBlockGenerator.java +++ b/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.*; diff --git a/src/kellinwood/security/zipsigner/ZipSigner.java b/src/net/fornwall/apksigner/ZipSigner.java similarity index 82% rename from src/kellinwood/security/zipsigner/ZipSigner.java rename to src/net/fornwall/apksigner/ZipSigner.java index ac7c733..1a720bc 100644 --- a/src/kellinwood/security/zipsigner/ZipSigner.java +++ b/src/net/fornwall/apksigner/ZipSigner.java @@ -1,32 +1,4 @@ -/* - * Copyright (C) 2010 Ken Ellinwood - * Copyright (C) 2008 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/* This file is a heavily modified version of com.android.signapk.SignApk.java. - * The changes include: - * - addition of the signZip() convenience methods - * - addition of a progress listener interface - * - removal of main() - * - switch to a signature generation method that verifies - * in Android recovery - * - eliminated dependency on sun.security and sun.misc APIs by - * using signature block template files. - */ - -package kellinwood.security.zipsigner; +package net.fornwall.apksigner; import java.io.ByteArrayOutputStream; import java.io.File; @@ -49,17 +21,13 @@ import java.util.jar.Manifest; import java.util.regex.Pattern; -import kellinwood.security.zipsigner.optional.KeyStoreFileManager; -import kellinwood.security.zipsigner.optional.SignatureBlockGenerator; -import kellinwood.zipio.ZioEntry; -import kellinwood.zipio.ZipInput; -import kellinwood.zipio.ZipOutput; +import net.fornwall.apksigner.zipio.ZioEntry; +import net.fornwall.apksigner.zipio.ZipInput; +import net.fornwall.apksigner.zipio.ZipOutput; /** * This is a modified copy of com.android.signapk.SignApk.java. It provides an API to sign JAR files (including APKs and * Zip/OTA updates) in a way compatible with the mincrypt verifier, using SHA1 and RSA keys. - * - * Please see the README.txt file in the root of this project for usage instructions. */ public class ZipSigner { diff --git a/src/kellinwood/zipio/CentralEnd.java b/src/net/fornwall/apksigner/zipio/CentralEnd.java similarity index 98% rename from src/kellinwood/zipio/CentralEnd.java rename to src/net/fornwall/apksigner/zipio/CentralEnd.java index 392b36b..d4723f3 100644 --- a/src/kellinwood/zipio/CentralEnd.java +++ b/src/net/fornwall/apksigner/zipio/CentralEnd.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package kellinwood.zipio; +package net.fornwall.apksigner.zipio; import java.io.IOException; diff --git a/src/kellinwood/zipio/ZioEntry.java b/src/net/fornwall/apksigner/zipio/ZioEntry.java similarity index 99% rename from src/kellinwood/zipio/ZioEntry.java rename to src/net/fornwall/apksigner/zipio/ZioEntry.java index 74dc5a4..c45c72c 100644 --- a/src/kellinwood/zipio/ZioEntry.java +++ b/src/net/fornwall/apksigner/zipio/ZioEntry.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package kellinwood.zipio; +package net.fornwall.apksigner.zipio; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/src/kellinwood/zipio/ZioEntryInputStream.java b/src/net/fornwall/apksigner/zipio/ZioEntryInputStream.java similarity index 98% rename from src/kellinwood/zipio/ZioEntryInputStream.java rename to src/net/fornwall/apksigner/zipio/ZioEntryInputStream.java index e509d3d..c4f2c4b 100644 --- a/src/kellinwood/zipio/ZioEntryInputStream.java +++ b/src/net/fornwall/apksigner/zipio/ZioEntryInputStream.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package kellinwood.zipio; +package net.fornwall.apksigner.zipio; import java.io.IOException; import java.io.InputStream; diff --git a/src/kellinwood/zipio/ZioEntryOutputStream.java b/src/net/fornwall/apksigner/zipio/ZioEntryOutputStream.java similarity index 98% rename from src/kellinwood/zipio/ZioEntryOutputStream.java rename to src/net/fornwall/apksigner/zipio/ZioEntryOutputStream.java index 7d38039..9024bbf 100644 --- a/src/kellinwood/zipio/ZioEntryOutputStream.java +++ b/src/net/fornwall/apksigner/zipio/ZioEntryOutputStream.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package kellinwood.zipio; +package net.fornwall.apksigner.zipio; import java.io.IOException; import java.io.OutputStream; diff --git a/src/kellinwood/zipio/ZipInput.java b/src/net/fornwall/apksigner/zipio/ZipInput.java similarity index 98% rename from src/kellinwood/zipio/ZipInput.java rename to src/net/fornwall/apksigner/zipio/ZipInput.java index 543618d..28429d8 100644 --- a/src/kellinwood/zipio/ZipInput.java +++ b/src/net/fornwall/apksigner/zipio/ZipInput.java @@ -1,4 +1,4 @@ -package kellinwood.zipio; +package net.fornwall.apksigner.zipio; import java.io.IOException; import java.io.RandomAccessFile; diff --git a/src/kellinwood/zipio/ZipOutput.java b/src/net/fornwall/apksigner/zipio/ZipOutput.java similarity index 98% rename from src/kellinwood/zipio/ZipOutput.java rename to src/net/fornwall/apksigner/zipio/ZipOutput.java index 4e27d09..a643cb1 100644 --- a/src/kellinwood/zipio/ZipOutput.java +++ b/src/net/fornwall/apksigner/zipio/ZipOutput.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package kellinwood.zipio; +package net.fornwall.apksigner.zipio; import java.io.IOException; import java.io.OutputStream; diff --git a/stub.sh b/stub.sh new file mode 100644 index 0000000..7e97e21 --- /dev/null +++ b/stub.sh @@ -0,0 +1,11 @@ +#!/bin/sh + +MYSELF=`which "$0" 2>/dev/null` + +[ $? -gt 0 -a -f "$0" ] && MYSELF="./$0" + +java=java +if test -n "$JAVA_HOME"; then java="$JAVA_HOME/bin/java"; fi + +exec "$java" -jar $MYSELF "$@" +exit 1 diff --git a/test/CreateZipFileTest.java b/test/net/fornwall/apksigner/CreateZipFileTest.java similarity index 96% rename from test/CreateZipFileTest.java rename to test/net/fornwall/apksigner/CreateZipFileTest.java index 4e6dd42..1647e5c 100644 --- a/test/CreateZipFileTest.java +++ b/test/net/fornwall/apksigner/CreateZipFileTest.java @@ -1,3 +1,4 @@ +package net.fornwall.apksigner; import static org.junit.Assert.assertEquals; import java.io.File; @@ -8,15 +9,15 @@ import java.util.zip.ZipEntry; import java.util.zip.ZipFile; -import kellinwood.zipio.ZioEntry; -import kellinwood.zipio.ZipInput; -import kellinwood.zipio.ZipOutput; - import org.junit.After; import org.junit.Assert; import org.junit.Before; import org.junit.Test; +import net.fornwall.apksigner.zipio.ZioEntry; +import net.fornwall.apksigner.zipio.ZipInput; +import net.fornwall.apksigner.zipio.ZipOutput; + public class CreateZipFileTest { private final File testDir = new File(getClass().getResource("/simple_test.zip").getFile()).getParentFile(); diff --git a/test/KeyStoreTest.java b/test/net/fornwall/apksigner/KeyStoreTest.java similarity index 95% rename from test/KeyStoreTest.java rename to test/net/fornwall/apksigner/KeyStoreTest.java index 0626f86..4990ca9 100644 --- a/test/KeyStoreTest.java +++ b/test/net/fornwall/apksigner/KeyStoreTest.java @@ -1,3 +1,4 @@ +package net.fornwall.apksigner; import java.io.BufferedReader; import java.io.File; import java.io.InputStreamReader; @@ -9,9 +10,9 @@ import org.junit.Assert; import org.junit.Test; -import kellinwood.security.zipsigner.optional.KeyStoreFileManager; -import kellinwood.security.zipsigner.optional.LoadKeystoreException; -import kellinwood.zipsigner.cmdline.Main; +import net.fornwall.apksigner.KeyStoreFileManager; +import net.fornwall.apksigner.LoadKeystoreException; +import net.fornwall.apksigner.Main; public class KeyStoreTest { diff --git a/test/ZipInputTest.java b/test/net/fornwall/apksigner/ZipInputTest.java similarity index 90% rename from test/ZipInputTest.java rename to test/net/fornwall/apksigner/ZipInputTest.java index 6a58dea..add278e 100644 --- a/test/ZipInputTest.java +++ b/test/net/fornwall/apksigner/ZipInputTest.java @@ -1,3 +1,4 @@ +package net.fornwall.apksigner; import static org.junit.Assert.assertEquals; import java.text.SimpleDateFormat; @@ -5,11 +6,11 @@ import java.util.Date; import java.util.HashSet; -import kellinwood.zipio.ZioEntry; -import kellinwood.zipio.ZipInput; - import org.junit.Test; +import net.fornwall.apksigner.zipio.ZioEntry; +import net.fornwall.apksigner.zipio.ZipInput; + public class ZipInputTest { @Test