diff options
| author | Brian Carlstrom <bdc@google.com> | 2013-04-22 19:00:24 -0700 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2013-04-22 19:04:38 -0700 |
| commit | 9de1ab87afa71c0d39d17fdf260028552202bd3b (patch) | |
| tree | e8e74a0bba36edfaa4133cff26cbfbffed7b4442 /patches | |
| parent | 7d18f46ad1dc37e346d5eaf896bc6f2319cee728 (diff) | |
| download | android_external_bouncycastle-9de1ab87afa71c0d39d17fdf260028552202bd3b.tar.gz android_external_bouncycastle-9de1ab87afa71c0d39d17fdf260028552202bd3b.tar.bz2 android_external_bouncycastle-9de1ab87afa71c0d39d17fdf260028552202bd3b.zip | |
Revert of DERT61String change from 44021512997b337e6079e46fd4230ce979c20b6f
Bug: 8685209
Change-Id: I72865d6db1ff567da4b24566fa3878053819f826
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/bcprov.patch | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/patches/bcprov.patch b/patches/bcprov.patch index 695215b..c72b40f 100644 --- a/patches/bcprov.patch +++ b/patches/bcprov.patch @@ -130,6 +130,28 @@ diff -Naur bcprov-jdk15on-148.orig/org/bouncycastle/asn1/DERPrintableString.java /** * return a printable string from the passed in object. +diff -Naur bcprov-jdk15on-148.orig/org/bouncycastle/asn1/DERT61String.java bcprov-jdk15on-148/org/bouncycastle/asn1/DERT61String.java +--- bcprov-jdk15on-148.orig/org/bouncycastle/asn1/DERT61String.java 2013-02-10 00:37:58.000000000 +0000 ++++ bcprov-jdk15on-148/org/bouncycastle/asn1/DERT61String.java 2013-01-31 02:26:40.000000000 +0000 +@@ -82,12 +82,16 @@ + public DERT61String( + String string) + { +- this.string = Strings.toUTF8ByteArray(string); ++ // BEGIN android-changed ++ this.string = Strings.toByteArray(string); ++ // END android-changed + } + + public String getString() + { +- return Strings.fromUTF8ByteArray(string); ++ // BEGIN android-changed ++ return Strings.fromByteArray(string); ++ // END android-changed + } + + public String toString() diff -Naur bcprov-jdk15on-148.orig/org/bouncycastle/asn1/cms/ContentInfo.java bcprov-jdk15on-148/org/bouncycastle/asn1/cms/ContentInfo.java --- bcprov-jdk15on-148.orig/org/bouncycastle/asn1/cms/ContentInfo.java 2013-02-10 00:37:58.000000000 +0000 +++ bcprov-jdk15on-148/org/bouncycastle/asn1/cms/ContentInfo.java 2012-09-17 23:04:47.000000000 +0000 |