Replace custom Base64 class with the Android platform class.
This commit is contained in:
parent
37286ac7d4
commit
e3e2db13d8
|
@ -1,130 +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 kellinwood.logging.LoggerInterface;
|
||||
import kellinwood.logging.LoggerManager;
|
||||
|
||||
import java.io.ByteArrayOutputStream;
|
||||
import java.io.OutputStream;
|
||||
import java.lang.reflect.Method;
|
||||
|
||||
/*
|
||||
* This class provides Base64 encoding services using one of several possible
|
||||
* implementations available elsewhere in the classpath. Supported implementations
|
||||
* are android.util.Base64 and org.bouncycastle.util.encoders.Base64Encoder.
|
||||
* These APIs are accessed via reflection, and as long as at least one is available
|
||||
* Base64 encoding is possible. This technique provides compatibility across different
|
||||
* Android OS versions, and also allows zipsigner-lib to operate in desktop environments
|
||||
* as long as the BouncyCastle provider jar is in the classpath.
|
||||
*
|
||||
* android.util.Base64 was added in API level 8 (Android 2.2, Froyo)
|
||||
* org.bouncycastle.util.encoders.Base64Encoder was removed in API level 11 (Android 3.0, Honeycomb)
|
||||
*
|
||||
*/
|
||||
@SuppressWarnings("unchecked")
|
||||
public class Base64 {
|
||||
|
||||
static Method aEncodeMethod = null; // Reference to the android.util.Base64.encode() method, if available
|
||||
static Method aDecodeMethod = null; // Reference to the android.util.Base64.decode() method, if available
|
||||
|
||||
static Object bEncoder = null; // Reference to an org.bouncycastle.util.encoders.Base64Encoder instance, if available
|
||||
static Method bEncodeMethod = null; // Reference to the bEncoder.encode() method, if available
|
||||
|
||||
static Object bDecoder = null; // Reference to an org.bouncycastle.util.encoders.Base64Encoder instance, if available
|
||||
static Method bDecodeMethod = null; // Reference to the bEncoder.encode() method, if available
|
||||
|
||||
static LoggerInterface logger = null;
|
||||
|
||||
static {
|
||||
|
||||
Class<Object> clazz;
|
||||
|
||||
logger = LoggerManager.getLogger(Base64.class.getName());
|
||||
|
||||
try {
|
||||
clazz = (Class<Object>) Class.forName("android.util.Base64");
|
||||
// Looking for encode( byte[] input, int flags)
|
||||
aEncodeMethod = clazz.getMethod("encode", byte[].class, Integer.TYPE);
|
||||
aDecodeMethod = clazz.getMethod("decode", byte[].class, Integer.TYPE);
|
||||
logger.info(clazz.getName() + " is available.");
|
||||
} catch (ClassNotFoundException x) {
|
||||
} // Ignore
|
||||
catch (Exception x) {
|
||||
logger.error("Failed to initialize use of android.util.Base64", x);
|
||||
}
|
||||
|
||||
try {
|
||||
clazz = (Class<Object>) Class.forName("org.bouncycastle.util.encoders.Base64Encoder");
|
||||
bEncoder = clazz.newInstance();
|
||||
// Looking for encode( byte[] input, int offset, int length, OutputStream output)
|
||||
bEncodeMethod = clazz.getMethod("encode", byte[].class, Integer.TYPE, Integer.TYPE, OutputStream.class);
|
||||
logger.info(clazz.getName() + " is available.");
|
||||
// Looking for decode( byte[] input, int offset, int length, OutputStream output)
|
||||
bDecodeMethod = clazz.getMethod("decode", byte[].class, Integer.TYPE, Integer.TYPE, OutputStream.class);
|
||||
|
||||
} catch (ClassNotFoundException x) {
|
||||
} // Ignore
|
||||
catch (Exception x) {
|
||||
logger.error("Failed to initialize use of org.bouncycastle.util.encoders.Base64Encoder", x);
|
||||
}
|
||||
|
||||
if (aEncodeMethod == null && bEncodeMethod == null)
|
||||
throw new IllegalStateException("No base64 encoder implementation is available.");
|
||||
}
|
||||
|
||||
|
||||
public static String encode(byte[] data) {
|
||||
try {
|
||||
if (aEncodeMethod != null) {
|
||||
// Invoking a static method call, using null for the instance value
|
||||
byte[] encodedBytes = (byte[]) aEncodeMethod.invoke(null, data, 2);
|
||||
return new String(encodedBytes);
|
||||
} else if (bEncodeMethod != null) {
|
||||
ByteArrayOutputStream baos = new ByteArrayOutputStream();
|
||||
bEncodeMethod.invoke(bEncoder, data, 0, data.length, baos);
|
||||
return new String(baos.toByteArray());
|
||||
}
|
||||
} catch (Exception x) {
|
||||
throw new IllegalStateException(x.getClass().getName() + ": " + x.getMessage());
|
||||
}
|
||||
|
||||
|
||||
throw new IllegalStateException("No base64 encoder implementation is available.");
|
||||
}
|
||||
|
||||
public static byte[] decode(byte[] data) {
|
||||
try {
|
||||
if (aDecodeMethod != null) {
|
||||
// Invoking a static method call, using null for the instance value
|
||||
byte[] decodedBytes = (byte[]) aDecodeMethod.invoke(null, data, 2);
|
||||
return decodedBytes;
|
||||
} else if (bDecodeMethod != null) {
|
||||
ByteArrayOutputStream baos = new ByteArrayOutputStream();
|
||||
bDecodeMethod.invoke(bEncoder, data, 0, data.length, baos);
|
||||
return baos.toByteArray();
|
||||
}
|
||||
} catch (Exception x) {
|
||||
throw new IllegalStateException(x.getClass().getName() + ": " + x.getMessage());
|
||||
}
|
||||
|
||||
|
||||
throw new IllegalStateException("No base64 encoder implementation is available.");
|
||||
}
|
||||
}
|
|
@ -29,6 +29,8 @@
|
|||
|
||||
package kellinwood.security.zipsigner;
|
||||
|
||||
import android.util.Base64;
|
||||
|
||||
import kellinwood.logging.LoggerInterface;
|
||||
import kellinwood.logging.LoggerManager;
|
||||
import kellinwood.zipio.ZioEntry;
|
||||
|
@ -441,11 +443,11 @@ public class ZipSigner {
|
|||
|
||||
Attributes attr = null;
|
||||
if (input != null) {
|
||||
java.util.jar.Attributes inAttr = input.getAttributes(name);
|
||||
Attributes inAttr = input.getAttributes(name);
|
||||
if (inAttr != null) attr = new Attributes(inAttr);
|
||||
}
|
||||
if (attr == null) attr = new Attributes();
|
||||
attr.putValue("SHA1-Digest", Base64.encode(md.digest()));
|
||||
attr.putValue("SHA1-Digest", Base64.encodeToString(md.digest(), Base64.NO_WRAP));
|
||||
output.getEntries().put(name, attr);
|
||||
}
|
||||
}
|
||||
|
@ -473,7 +475,7 @@ public class ZipSigner {
|
|||
manifest.write(print);
|
||||
print.flush();
|
||||
|
||||
out.write(("SHA1-Digest-Manifest: " + Base64.encode(md.digest()) + "\r\n\r\n").getBytes());
|
||||
out.write(("SHA1-Digest-Manifest: " + Base64.encodeToString(md.digest(), Base64.NO_WRAP) + "\r\n\r\n").getBytes());
|
||||
|
||||
Map<String, Attributes> entries = manifest.getEntries();
|
||||
for (Map.Entry<String, Attributes> entry : entries.entrySet()) {
|
||||
|
@ -489,9 +491,8 @@ public class ZipSigner {
|
|||
print.flush();
|
||||
|
||||
out.write(nameEntry.getBytes());
|
||||
out.write(("SHA1-Digest: " + Base64.encode(md.digest()) + "\r\n\r\n").getBytes());
|
||||
out.write(("SHA1-Digest: " + Base64.encodeToString(md.digest(), Base64.NO_WRAP) + "\r\n\r\n").getBytes());
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -1,71 +0,0 @@
|
|||
|
||||
package kellinwood.security.zipsigner.optional;
|
||||
|
||||
import kellinwood.logging.LoggerInterface;
|
||||
import kellinwood.logging.LoggerManager;
|
||||
import kellinwood.security.zipsigner.Base64;
|
||||
import org.bouncycastle.util.encoders.HexTranslator;
|
||||
|
||||
import java.security.MessageDigest;
|
||||
import java.util.Locale;
|
||||
|
||||
/**
|
||||
* User: ken
|
||||
* Date: 1/17/13
|
||||
*/
|
||||
public class Fingerprint {
|
||||
|
||||
static LoggerInterface logger = LoggerManager.getLogger(Fingerprint.class.getName());
|
||||
|
||||
static byte[] calcDigest(String algorithm, byte[] encodedCert) {
|
||||
byte[] result = null;
|
||||
try {
|
||||
MessageDigest messageDigest = MessageDigest.getInstance(algorithm);
|
||||
messageDigest.update(encodedCert);
|
||||
result = messageDigest.digest();
|
||||
} catch (Exception x) {
|
||||
logger.error(x.getMessage(), x);
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
public static String hexFingerprint(String algorithm, byte[] encodedCert) {
|
||||
try {
|
||||
byte[] digest = calcDigest(algorithm, encodedCert);
|
||||
if (digest == null) return null;
|
||||
HexTranslator hexTranslator = new HexTranslator();
|
||||
byte[] hex = new byte[digest.length * 2];
|
||||
hexTranslator.encode(digest, 0, digest.length, hex, 0);
|
||||
StringBuilder builder = new StringBuilder();
|
||||
for (int i = 0; i < hex.length; i += 2) {
|
||||
builder.append((char) hex[i]);
|
||||
builder.append((char) hex[i + 1]);
|
||||
if (i != (hex.length - 2)) builder.append(':');
|
||||
}
|
||||
return builder.toString().toUpperCase(Locale.ENGLISH);
|
||||
} catch (Exception x) {
|
||||
logger.error(x.getMessage(), x);
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
// public static void main(String[] args) {
|
||||
// byte[] data = "The Silence of the Lambs is a really good movie.".getBytes();
|
||||
// System.out.println(hexFingerprint("MD5", data));
|
||||
// System.out.println(hexFingerprint("SHA1", data));
|
||||
// System.out.println(base64Fingerprint("SHA1", data));
|
||||
//
|
||||
// }
|
||||
|
||||
public static String base64Fingerprint(String algorithm, byte[] encodedCert) {
|
||||
String result = null;
|
||||
try {
|
||||
byte[] digest = calcDigest(algorithm, encodedCert);
|
||||
if (digest == null) return result;
|
||||
return Base64.encode(digest);
|
||||
} catch (Exception x) {
|
||||
logger.error(x.getMessage(), x);
|
||||
}
|
||||
return result;
|
||||
}
|
||||
}
|
|
@ -1,9 +1,10 @@
|
|||
|
||||
package kellinwood.security.zipsigner.optional;
|
||||
|
||||
import android.util.Base64;
|
||||
|
||||
import kellinwood.logging.LoggerInterface;
|
||||
import kellinwood.logging.LoggerManager;
|
||||
import kellinwood.security.zipsigner.Base64;
|
||||
|
||||
import javax.crypto.Cipher;
|
||||
import javax.crypto.spec.SecretKeySpec;
|
||||
|
@ -84,7 +85,7 @@ public class PasswordObfuscator {
|
|||
w.write(password);
|
||||
w.flush();
|
||||
byte[] encoded = cipher.doFinal(baos.toByteArray());
|
||||
return Base64.encode(encoded);
|
||||
return Base64.encodeToString(encoded, Base64.NO_WRAP);
|
||||
} catch (Exception x) {
|
||||
logger.error("Failed to obfuscate password", x);
|
||||
}
|
||||
|
@ -105,7 +106,7 @@ public class PasswordObfuscator {
|
|||
Cipher cipher = Cipher.getInstance("AES/ECB/PKCS5Padding");
|
||||
SecretKeySpec skeySpec = new SecretKeySpec(x.getBytes(), "AES");
|
||||
cipher.init(Cipher.DECRYPT_MODE, skeySpec);
|
||||
byte[] bytes = cipher.doFinal(Base64.decode(password.getBytes()));
|
||||
byte[] bytes = cipher.doFinal(Base64.decode(password.getBytes(), Base64.NO_WRAP));
|
||||
BufferedReader r = new BufferedReader(new InputStreamReader(new ByteArrayInputStream(bytes)));
|
||||
char[] cb = new char[128];
|
||||
int length = 0;
|
||||
|
|
Loading…
Reference in New Issue