diff options
| author | Abhishek Koneru <akoneru@redhat.com> | 2014-02-26 13:15:57 -0500 |
|---|---|---|
| committer | Abhishek Koneru <akoneru@redhat.com> | 2014-03-19 19:17:39 -0400 |
| commit | 24294c097dd0dd9f7de0202443a8c8e34807bb2f (patch) | |
| tree | 03e393bb71fb1263ee85571b26a0f108e1133e1b /base/server/cms/src | |
| parent | fbd1b96a35946b7ebf36afea3f3a2a50dcbf193f (diff) | |
Changes to KeyClient on the java side.
The KeyClient class on the java side is modified to
have a similar design as the KeyClient class on the python side.
Diffstat (limited to 'base/server/cms/src')
| -rw-r--r-- | base/server/cms/src/com/netscape/cms/servlet/base/PKIService.java | 5 | ||||
| -rw-r--r-- | base/server/cms/src/com/netscape/cms/servlet/csadmin/ConfigurationUtils.java | 6 |
2 files changed, 4 insertions, 7 deletions
diff --git a/base/server/cms/src/com/netscape/cms/servlet/base/PKIService.java b/base/server/cms/src/com/netscape/cms/servlet/base/PKIService.java index 27dea60db..2b8a4ada3 100644 --- a/base/server/cms/src/com/netscape/cms/servlet/base/PKIService.java +++ b/base/server/cms/src/com/netscape/cms/servlet/base/PKIService.java @@ -50,9 +50,6 @@ import com.netscape.certsrv.logging.ILogger; */ public class PKIService { - public static final String HEADER = "-----BEGIN NEW CERTIFICATE REQUEST-----"; - public static final String TRAILER = "-----END NEW CERTIFICATE REQUEST-----"; - // caching parameters public static final int DEFAULT_LONG_CACHE_LIFETIME = 1000; @@ -141,7 +138,7 @@ public class PKIService { public CertData createCertificateData(org.mozilla.jss.crypto.X509Certificate cert) throws CertificateEncodingException { CertData data = new CertData(); - String b64 = HEADER + CMS.BtoA(cert.getEncoded()) + TRAILER; + String b64 = CertData.HEADER + CMS.BtoA(cert.getEncoded()) + CertData.FOOTER; data.setEncoded(b64); return data; } diff --git a/base/server/cms/src/com/netscape/cms/servlet/csadmin/ConfigurationUtils.java b/base/server/cms/src/com/netscape/cms/servlet/csadmin/ConfigurationUtils.java index 2ef7090f6..3019716db 100644 --- a/base/server/cms/src/com/netscape/cms/servlet/csadmin/ConfigurationUtils.java +++ b/base/server/cms/src/com/netscape/cms/servlet/csadmin/ConfigurationUtils.java @@ -224,7 +224,7 @@ public class ConfigurationUtils { config.setServerURI(protocol + "://" + hostname + ":" + port + path); config.setCertNickname(clientnickname); - PKIClient client = new PKIClient(config); + PKIClient client = new PKIClient(config, null); PKIConnection connection = client.getConnection(); return connection.post(map); } @@ -338,7 +338,7 @@ public class ConfigurationUtils { config.setUsername(user); config.setPassword(passwd); - PKIClient client = new PKIClient(config); + PKIClient client = new PKIClient(config, null); PKIConnection connection = client.getConnection(); // Ignore the "UNTRUSTED_ISSUER" validity status @@ -3595,7 +3595,7 @@ public class ConfigurationUtils { config.setCertNickname(dbNick); config.setCertPassword(dbPass); - PKIClient client = new PKIClient(config); + PKIClient client = new PKIClient(config, null); PKIConnection connection = client.getConnection(); // Ignore the "UNTRUSTED_ISSUER" and "CA_CERT_INVALID" validity status |