diff options
Diffstat (limited to 'base/server/cms/src/com')
4 files changed, 13 insertions, 43 deletions
diff --git a/base/server/cms/src/com/netscape/cms/profile/updater/SubsystemGroupUpdater.java b/base/server/cms/src/com/netscape/cms/profile/updater/SubsystemGroupUpdater.java index 7daa8e4d9..4ecc255eb 100644 --- a/base/server/cms/src/com/netscape/cms/profile/updater/SubsystemGroupUpdater.java +++ b/base/server/cms/src/com/netscape/cms/profile/updater/SubsystemGroupUpdater.java @@ -175,14 +175,9 @@ public class SubsystemGroupUpdater implements IProfileUpdater { byte[] certEncoded = cert.getEncoded(); b64 = CMS.BtoA(certEncoded).trim(); - // extract all line separators - StringBuffer sb = new StringBuffer(); - for (int i = 0; i < b64.length(); i++) { - if (!Character.isWhitespace(b64.charAt(i))) { - sb.append(b64.charAt(i)); - } - } - b64 = sb.toString(); + // concatenate lines + b64 = b64.replace("\r", "").replace("\n", ""); + } catch (Exception ence) { CMS.debug("SubsystemGroupUpdater update: user cert encoding failed: " + ence); } diff --git a/base/server/cms/src/com/netscape/cms/servlet/csadmin/RegisterUser.java b/base/server/cms/src/com/netscape/cms/servlet/csadmin/RegisterUser.java index f02932e2b..77ef4d8c3 100644 --- a/base/server/cms/src/com/netscape/cms/servlet/csadmin/RegisterUser.java +++ b/base/server/cms/src/com/netscape/cms/servlet/csadmin/RegisterUser.java @@ -27,8 +27,6 @@ import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import netscape.security.x509.X509CertImpl; - import org.w3c.dom.Node; import com.netscape.certsrv.apps.CMS; @@ -49,6 +47,8 @@ import com.netscape.cms.servlet.common.ICMSTemplateFiller; import com.netscape.cmsutil.util.Utils; import com.netscape.cmsutil.xml.XMLObject; +import netscape.security.x509.X509CertImpl; + /** * This servlet creates a TPS user in the CA, * and it associates TPS's server certificate to @@ -207,14 +207,8 @@ public class RegisterUser extends CMSServlet { audit(auditMessage); } - // extract all line separators - StringBuffer sb = new StringBuffer(); - for (int i = 0; i < certsString.length(); i++) { - if (!Character.isWhitespace(certsString.charAt(i))) { - sb.append(certsString.charAt(i)); - } - } - certsString = sb.toString(); + // concatenate lines + certsString = certsString.replace("\r", "").replace("\n", ""); auditParams = "Scope;;certs+Operation;;OP_ADD+source;;RegisterUser" + "+Resource;;" + uid + diff --git a/base/server/cms/src/com/netscape/cms/servlet/processors/CAProcessor.java b/base/server/cms/src/com/netscape/cms/servlet/processors/CAProcessor.java index 8c4fef12e..4bc738c04 100644 --- a/base/server/cms/src/com/netscape/cms/servlet/processors/CAProcessor.java +++ b/base/server/cms/src/com/netscape/cms/servlet/processors/CAProcessor.java @@ -1024,15 +1024,8 @@ public class CAProcessor extends Processor { base64Data = Utils.base64encode(rawData).trim(); - // extract all line separators from the "base64Data" - StringBuffer sb = new StringBuffer(); - for (int i = 0; i < base64Data.length(); i++) { - if (!Character.isWhitespace(base64Data.charAt(i))) { - sb.append(base64Data.charAt(i)); - - } - } - cert = sb.toString(); + // concatenate lines + cert = base64Data.replace("\r", "").replace("\n", ""); } if (cert != null) { @@ -1180,14 +1173,8 @@ public class CAProcessor extends Processor { base64Data = Utils.base64encode(rawData).trim(); - // extract all line separators from the "base64Data" - StringBuffer sb = new StringBuffer(); - for (int i = 0; i < base64Data.length(); i++) { - if (!Character.isWhitespace(base64Data.charAt(i))) { - sb.append(base64Data.charAt(i)); - } - } - cert = sb.toString(); + // concatenate lines + cert = base64Data.replace("\r", "").replace("\n", ""); } if (cert != null) { diff --git a/base/server/cms/src/com/netscape/cms/servlet/profile/ProfileSubmitCMCServlet.java b/base/server/cms/src/com/netscape/cms/servlet/profile/ProfileSubmitCMCServlet.java index fd155a687..83bab5b7e 100644 --- a/base/server/cms/src/com/netscape/cms/servlet/profile/ProfileSubmitCMCServlet.java +++ b/base/server/cms/src/com/netscape/cms/servlet/profile/ProfileSubmitCMCServlet.java @@ -928,14 +928,8 @@ public class ProfileSubmitCMCServlet extends ProfileServlet { base64Data = Utils.base64encode(rawData).trim(); - // extract all line separators from the "base64Data" - StringBuffer sb = new StringBuffer(); - for (int i = 0; i < base64Data.length(); i++) { - if (!Character.isWhitespace(base64Data.charAt(i))) { - sb.append(base64Data.charAt(i)); - } - } - cert = sb.toString(); + // concatenate lines + cert = base64Data.replace("\r", "").replace("\n", ""); } if (cert != null) { |