summaryrefslogtreecommitdiffstats
path: root/security/src
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2009-03-03 14:03:56 -0800
committerThe Android Open Source Project <initial-contribution@android.com>2009-03-03 14:03:56 -0800
commit2fb02ef3025449e24e756a7f645ea6eab7a1fd4f (patch)
tree15baa1ab62b329c09dc7a8e912b0f14c7e67d40b /security/src
parentd11a65b017fde8c4c997f41ee59e87e90d68b3f5 (diff)
downloadlibcore-2fb02ef3025449e24e756a7f645ea6eab7a1fd4f.zip
libcore-2fb02ef3025449e24e756a7f645ea6eab7a1fd4f.tar.gz
libcore-2fb02ef3025449e24e756a7f645ea6eab7a1fd4f.tar.bz2
auto import from //depot/cupcake/@132589
Diffstat (limited to 'security/src')
-rw-r--r--security/src/main/java/org/bouncycastle/asn1/x509/X509NameTokenizer.java13
1 files changed, 1 insertions, 12 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 8f0d08b..035e924 100644
--- a/security/src/main/java/org/bouncycastle/asn1/x509/X509NameTokenizer.java
+++ b/security/src/main/java/org/bouncycastle/asn1/x509/X509NameTokenizer.java
@@ -66,17 +66,6 @@ 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;
}
@@ -99,4 +88,4 @@ public class X509NameTokenizer
index = end;
return buf.toString().trim();
}
-} \ No newline at end of file
+}