From d11a65b017fde8c4c997f41ee59e87e90d68b3f5 Mon Sep 17 00:00:00 2001
From: The Android Open Source Project <initial-contribution@android.com>
Date: Mon, 2 Mar 2009 22:54:18 -0800
Subject: auto import from //depot/cupcake/@137055

---
 .../java/org/bouncycastle/asn1/x509/X509NameTokenizer.java  | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

(limited to 'security/src')

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
-- 
cgit v1.1