Merge tag 'android-4.3_r2.1' into cm-10.2cm-10.2.1cm-10.2.0cm-10.2-M1stable/cm-10.2cm-10.2

Android 4.3 release 2.1

1 files changed, 16 insertions, 0 deletions

diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/DERT61String.java b/bcprov/src/main/java/org/bouncycastle/asn1/DERT61String.java
index ee2979b..956b9c7 100644
--- a/bcprov/src/main/java/org/bouncycastle/asn1/DERT61String.java
+++ b/bcprov/src/main/java/org/bouncycastle/asn1/DERT61String.java
@@ -27,6 +27,18 @@ public class DERT61String
             return (DERT61String)obj;
         }
 
+        if (obj instanceof byte[])
+        {
+            try
+            {
+                return (DERT61String)fromByteArray((byte[])obj);
+            }
+            catch (Exception e)
+            {
+                throw new IllegalArgumentException("encoding error in getInstance: " + e.toString());
+            }
+        }
+
         throw new IllegalArgumentException("illegal object in getInstance: " + obj.getClass().getName());
     }
 
@@ -70,12 +82,16 @@ public class DERT61String
     public DERT61String(
         String   string)
     {
+        // BEGIN android-changed
         this.string = Strings.toByteArray(string);
+        // END android-changed
     }
 
     public String getString()
     {
+        // BEGIN android-changed
         return Strings.fromByteArray(string);
+        // END android-changed
     }
 
     public String toString()