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 /bcprov/src/main/java/org/bouncycastle/asn1 | |
| parent | 7d18f46ad1dc37e346d5eaf896bc6f2319cee728 (diff) | |
| download | bouncycastle-9de1ab87afa71c0d39d17fdf260028552202bd3b.tar.gz | |
Revert of DERT61String change from 44021512997b337e6079e46fd4230ce979c20b6f
Bug: 8685209
Change-Id: I72865d6db1ff567da4b24566fa3878053819f826
Diffstat (limited to 'bcprov/src/main/java/org/bouncycastle/asn1')
| -rw-r--r-- | bcprov/src/main/java/org/bouncycastle/asn1/DERT61String.java | 8 |
1 files changed, 6 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() |