summaryrefslogtreecommitdiffstats
path: root/security
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2009-03-02 22:54:18 -0800
committerThe Android Open Source Project <initial-contribution@android.com>2009-03-02 22:54:18 -0800
commitd11a65b017fde8c4c997f41ee59e87e90d68b3f5 (patch)
tree6aed8b4923ca428942cbaa7e848d50237a3d31e0 /security
parentac4f307115a738b0206030fe0d127f7c7f035b03 (diff)
downloadlibcore-d11a65b017fde8c4c997f41ee59e87e90d68b3f5.zip
libcore-d11a65b017fde8c4c997f41ee59e87e90d68b3f5.tar.gz
libcore-d11a65b017fde8c4c997f41ee59e87e90d68b3f5.tar.bz2
auto import from //depot/cupcake/@137055
Diffstat (limited to 'security')
-rw-r--r--security/src/main/java/org/bouncycastle/asn1/x509/X509NameTokenizer.java13
1 files changed, 12 insertions, 1 deletions
diff --git a/security/src/main/java/org/bouncycastle/asn1/x509/X509NameTokenizer.java b/security/src/main/java/org/bouncycastle/asn1/x509/X509NameTokenizer.java
index 035e924..8f0d08b 100644
--- a/security/src/main/java/org/bouncycastle/asn1/x509/X509NameTokenizer.java
+++ b/security/src/main/java/org/bouncycastle/asn1/x509/X509NameTokenizer.java
@@ -66,6 +66,17 @@ public class X509NameTokenizer
{
if (escaped || quoted)
{
+ // BEGIN android-added
+ // copied from a newer version of BouncyCastle
+ if (c == '#' && buf.charAt(buf.length() - 1) == '=')
+ {
+ buf.append('\\');
+ }
+ else if (c == '+' && seperator != '+')
+ {
+ buf.append('\\');
+ }
+ // END android-added
buf.append(c);
escaped = false;
}
@@ -88,4 +99,4 @@ public class X509NameTokenizer
index = end;
return buf.toString().trim();
}
-}
+} \ No newline at end of file