diff options
| author | Doug Zongker <dougz@google.com> | 2014-06-10 21:01:19 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-06-10 21:01:20 +0000 |
| commit | f166fd8d2328e0bf42c64f564e8622020aceaf59 (patch) | |
| tree | 3bee2a43a87f6596ee8812aaafc30e961b804def | |
| parent | 1db82f37d226bb5b7bbbaeb65952f73073de2b6f (diff) | |
| parent | 260fe11a79535dcda9aa630f84cc1534d62702d9 (diff) | |
| download | extras-f166fd8d2328e0bf42c64f564e8622020aceaf59.tar.gz | |
Merge "don't use sun's base64 encoders"
| -rw-r--r-- | verity/Android.mk | 1 | ||||
| -rw-r--r-- | verity/VeritySigner.java | 7 |
2 files changed, 4 insertions, 4 deletions
diff --git a/verity/Android.mk b/verity/Android.mk index 6af6e672..ba986262 100644 --- a/verity/Android.mk +++ b/verity/Android.mk @@ -14,6 +14,7 @@ LOCAL_SRC_FILES := VeritySigner.java LOCAL_MODULE := VeritySigner LOCAL_JAR_MANIFEST := VeritySigner.mf LOCAL_MODULE_TAGS := optional +LOCAL_STATIC_JAVA_LIBRARIES := bouncycastle-host include $(BUILD_HOST_JAVA_LIBRARY) include $(CLEAR_VARS) diff --git a/verity/VeritySigner.java b/verity/VeritySigner.java index f1d95c82..2ab94cb4 100644 --- a/verity/VeritySigner.java +++ b/verity/VeritySigner.java @@ -16,8 +16,8 @@ package com.android.verity; -import sun.misc.BASE64Decoder; -import sun.misc.BASE64Encoder; +import org.bouncycastle.util.encoders.Base64; + import java.io.DataInputStream; import java.io.File; import java.io.FileInputStream; @@ -40,8 +40,7 @@ class VeritySigner { private static PKCS8EncodedKeySpec pemToDer(String pem) throws Exception { pem = pem.replaceAll("^-.*", ""); String base64_der = pem.replaceAll("-.*$", ""); - BASE64Decoder decoder = new BASE64Decoder(); - byte[] der = decoder.decodeBuffer(base64_der); + byte[] der = Base64.decode(base64_der); return new PKCS8EncodedKeySpec(der); } |