summaryrefslogtreecommitdiffstats
path: root/base/server/cms/src
diff options
context:
space:
mode:
authorChristina Fu <cfu@redhat.com>2014-06-11 18:15:06 -0700
committerChristina Fu <cfu@redhat.com>2014-06-16 14:34:26 -0700
commit002e2625e187398b4100ab41ac43eec4b8c1cf5f (patch)
tree3de4a86083ea01618fbce033d059345f0bd45c38 /base/server/cms/src
parente399ad4a78a8a9b931c643f94190e441e767f22b (diff)
ticket #941 Part1 TPS Rewrite: Enrollment, Recovery, KeyRecovery, revoke/unrevoke processor
Diffstat (limited to 'base/server/cms/src')
-rw-r--r--base/server/cms/src/com/netscape/cms/servlet/profile/ProfileSubmitServlet.java7
-rw-r--r--base/server/cms/src/org/dogtagpki/server/connector/IRemoteRequest.java8
2 files changed, 9 insertions, 6 deletions
diff --git a/base/server/cms/src/com/netscape/cms/servlet/profile/ProfileSubmitServlet.java b/base/server/cms/src/com/netscape/cms/servlet/profile/ProfileSubmitServlet.java
index 0153ca6bb..3f8d4c479 100644
--- a/base/server/cms/src/com/netscape/cms/servlet/profile/ProfileSubmitServlet.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/profile/ProfileSubmitServlet.java
@@ -308,11 +308,14 @@ public class ProfileSubmitServlet extends ProfileServlet {
if (outputNames != null) {
while (outputNames.hasMoreElements()) {
String outputName = outputNames.nextElement();
- if (!outputName.equals("b64_cert") && !outputName.equals("pkcs7"))
+ if (!outputName.equals("b64_cert") &&
+ !outputName.equals("der") &&
+ !outputName.equals("pkcs7"))
continue;
try {
String outputValue = profileOutput.getValue(outputName, locale, reqs[i]);
- if (outputName.equals("b64_cert")) {
+ if (outputName.equals("b64_cert") ||
+ outputName.equals("der")) {
String ss = Cert.normalizeCertStrAndReq(outputValue);
outputValue = Cert.stripBrackets(ss);
byte[] bcode = CMS.AtoB(outputValue);
diff --git a/base/server/cms/src/org/dogtagpki/server/connector/IRemoteRequest.java b/base/server/cms/src/org/dogtagpki/server/connector/IRemoteRequest.java
index d6978e0cf..103aece02 100644
--- a/base/server/cms/src/org/dogtagpki/server/connector/IRemoteRequest.java
+++ b/base/server/cms/src/org/dogtagpki/server/connector/IRemoteRequest.java
@@ -82,10 +82,10 @@ public interface IRemoteRequest {
// CA response params
public static final String CA_OP = "op";
- public static final String CA_RESPONSE_RenewedCertificate_x509 = "X509Certificate";
- public static final String CA_RESPONSE_RenewedCertificate_b64 = "b64";
- public static final String CA_RESPONSE_RenewedCertificate_SubjectDN = "SubjectDN";
- public static final String CA_RESPONSE_RenewedCertificate_serial = "serialno";
+ public static final String CA_RESPONSE_Certificate_x509 = "X509Certificate";
+ public static final String CA_RESPONSE_Certificate_b64 = "b64";
+ public static final String CA_RESPONSE_Certificate_SubjectDN = "SubjectDN";
+ public static final String CA_RESPONSE_Certificate_serial = "serialno";
// KRA request params
public static final String KRA_UserId = "userid";