summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorawnuk <awnuk@c9f7a03b-bd48-0410-a16d-cbbf54688b0b>2011-08-02 00:03:40 +0000
committerawnuk <awnuk@c9f7a03b-bd48-0410-a16d-cbbf54688b0b>2011-08-02 00:03:40 +0000
commit797a1497b7f6a6f6b91ec1108a3993fe239477d7 (patch)
treed182f91c477d6173b4a11255b2c011624f6b016d
parentbfc084ae3d23bb33fce94abf0e81525704f2932c (diff)
downloadpki-797a1497b7f6a6f6b91ec1108a3993fe239477d7.tar.gz
pki-797a1497b7f6a6f6b91ec1108a3993fe239477d7.tar.xz
pki-797a1497b7f6a6f6b91ec1108a3993fe239477d7.zip
Fixed bugzilla bug #717041 - Improve escaping of some enrollment inputs
git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@2093 c9f7a03b-bd48-0410-a16d-cbbf54688b0b
-rw-r--r--pki/base/common/src/com/netscape/cms/profile/def/EnrollDefault.java13
1 files changed, 13 insertions, 0 deletions
diff --git a/pki/base/common/src/com/netscape/cms/profile/def/EnrollDefault.java b/pki/base/common/src/com/netscape/cms/profile/def/EnrollDefault.java
index 20c124dbc..c45798281 100644
--- a/pki/base/common/src/com/netscape/cms/profile/def/EnrollDefault.java
+++ b/pki/base/common/src/com/netscape/cms/profile/def/EnrollDefault.java
@@ -766,8 +766,21 @@ public abstract class EnrollDefault implements IPolicyDefault, ICertInfoPolicyDe
if (c == ',' || c == '=' || c == '+' || c == '<' ||
c == '>' || c == '#' || c == ';' || c == '\r' ||
c == '\n' || c == '\\' || c == '"') {
+ if ((c == 0x5c) && ((i+1) < v.length())) {
+ int nextC = v.charAt(i+1);
+ if ((c == 0x5c) && (nextC == ',' || nextC == '=' || nextC == '+' ||
+ nextC == '<' || nextC == '>' || nextC == '#' ||
+ nextC == ';' || nextC == '\r' || nextC == '\n' ||
+ nextC == '\\' || nextC == '"')) {
+ if (doubleEscape) result.append('\\');
+ } else {
result.append('\\');
if (doubleEscape) result.append('\\');
+ }
+ } else {
+ result.append('\\');
+ if (doubleEscape) result.append('\\');
+ }
}
if (c == '\r') {
result.append("0D");