diff options
Diffstat (limited to 'security/src')
| -rw-r--r-- | security/src/main/java/org/bouncycastle/asn1/x509/X509NameTokenizer.java | 13 |
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 |