summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEndi S. Dewata <edewata@redhat.com>2016-04-29 05:32:09 +0200
committerEndi S. Dewata <edewata@redhat.com>2016-04-29 05:51:57 +0200
commit6b857d96515d4c2e0db3c44affe804c5d8aa7b44 (patch)
tree9cceb96989eaf37e17bb438af4e6d2d83857a134
parent572880de1ed731c662e097f1fd4e6648b511b780 (diff)
downloadpki-6b857d96515d4c2e0db3c44affe804c5d8aa7b44.tar.gz
pki-6b857d96515d4c2e0db3c44affe804c5d8aa7b44.tar.xz
pki-6b857d96515d4c2e0db3c44affe804c5d8aa7b44.zip
Fixed problem uninstalling standalone KRA.
When installing a standalone KRA the admin certificate is base-64 encoded and stored in the kra.admin.cert property in the CS.cfg. Previously the encoded certificate contains EOL characters which may cause uninstall to fail due to parsing error. The install code has been fixed to normalize the encoded certificate properly.
-rw-r--r--base/server/cms/src/org/dogtagpki/server/rest/SystemConfigService.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/base/server/cms/src/org/dogtagpki/server/rest/SystemConfigService.java b/base/server/cms/src/org/dogtagpki/server/rest/SystemConfigService.java
index a96575d06..f9415f520 100644
--- a/base/server/cms/src/org/dogtagpki/server/rest/SystemConfigService.java
+++ b/base/server/cms/src/org/dogtagpki/server/rest/SystemConfigService.java
@@ -618,6 +618,7 @@ public class SystemConfigService extends PKIService implements SystemConfigResou
if (data.getImportAdminCert().equalsIgnoreCase("true")) {
String b64 = CryptoUtil.stripCertBrackets(data.getAdminCert().trim());
+ b64 = CryptoUtil.normalizeCertStr(b64);
if (data.getStandAlone() && data.getStepTwo()) {
// Stand-alone PKI (Step 2)
CMS.debug("SystemConfigService: Stand-alone " + csType + " Admin Cert");