diff options
| author | Brian Carlstrom <bdc@google.com> | 2013-04-22 19:00:24 -0700 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2013-04-23 11:45:24 -0700 |
| commit | 57c3bb556ef873a72010d6022edddc14e6bba9be (patch) | |
| tree | 2e7b3d1017b49e6eac5c09a733c3a63e03a4b562 | |
| parent | 8c18c33a4188b609bc9a9b22d0997a9613cf81d1 (diff) | |
| download | bouncycastle-jb-mr2-dev.tar.gz | |
Revert of DERT61String change from 44021512997b337e6079e46fd4230ce979c20b6fandroid-4.3_r3.1android-4.3_r3android-4.3_r2.3android-4.3_r2.2android-4.3_r2.1android-4.3_r2android-4.3_r1.1android-4.3_r1android-4.3_r0.9.1android-4.3_r0.9android-4.3.1_r1jb-mr2.0.0-releasejb-mr2.0-releasejb-mr2-releasejb-mr2-dev
Bug: 8685209
(cherry picked from commit 9de1ab87afa71c0d39d17fdf260028552202bd3b)
Change-Id: I0f75ffdcf0b82fcf600e85da2850cd66abd97e3b
| -rw-r--r-- | bcprov/src/main/java/org/bouncycastle/asn1/DERT61String.java | 8 | ||||
| -rwxr-xr-x | import_bouncycastle.sh | 5 | ||||
| -rw-r--r-- | patches/bcprov.patch | 22 |
3 files changed, 33 insertions, 2 deletions
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/DERT61String.java b/bcprov/src/main/java/org/bouncycastle/asn1/DERT61String.java index bb4e9a84..956b9c7c 100644 --- a/bcprov/src/main/java/org/bouncycastle/asn1/DERT61String.java +++ b/bcprov/src/main/java/org/bouncycastle/asn1/DERT61String.java @@ -82,12 +82,16 @@ public class DERT61String 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 --git a/import_bouncycastle.sh b/import_bouncycastle.sh index 52f65f30..ed278d83 100755 --- a/import_bouncycastle.sh +++ b/import_bouncycastle.sh @@ -163,6 +163,11 @@ function update_timestamps() { find "$git_dir" -type f -print0 | while IFS= read -r -d $'\0' file; do file_rev="$(git rev-list -n 1 HEAD "$file")" + if [ "$file_rev" == "" ]; then + echo + echo -n "WARNING: No file revision for file $file..." + continue + fi file_time="$(git show --pretty=format:%ai --abbrev-commit "$file_rev" | head -n 1)" touch -d "$file_time" "${target_dir}${file#$git_dir}" done diff --git a/patches/bcprov.patch b/patches/bcprov.patch index b0fbd971..0384dbb2 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 |