summaryrefslogtreecommitdiffstats
path: root/pki/base/common/src/com/netscape/certsrv
diff options
context:
space:
mode:
Diffstat (limited to 'pki/base/common/src/com/netscape/certsrv')
-rw-r--r--pki/base/common/src/com/netscape/certsrv/apps/CMS.java24
-rw-r--r--pki/base/common/src/com/netscape/certsrv/apps/ICMSEngine.java21
-rw-r--r--pki/base/common/src/com/netscape/certsrv/request/ARequestNotifier.java14
-rw-r--r--pki/base/common/src/com/netscape/certsrv/security/ICryptoSubsystem.java3
-rw-r--r--pki/base/common/src/com/netscape/certsrv/util/HttpInput.java14
5 files changed, 52 insertions, 24 deletions
diff --git a/pki/base/common/src/com/netscape/certsrv/apps/CMS.java b/pki/base/common/src/com/netscape/certsrv/apps/CMS.java
index 018203764..75a7e2059 100644
--- a/pki/base/common/src/com/netscape/certsrv/apps/CMS.java
+++ b/pki/base/common/src/com/netscape/certsrv/apps/CMS.java
@@ -328,7 +328,8 @@ public final class CMS {
*
* @return issuing record
*/
- public static ICRLIssuingPointRecord createCRLIssuingPointRecord(String id, BigInteger crlNumber, Long crlSize, Date thisUpdate, Date nextUpdate) {
+ public static ICRLIssuingPointRecord createCRLIssuingPointRecord(String id, BigInteger crlNumber, Long crlSize,
+ Date thisUpdate, Date nextUpdate) {
return _engine.createCRLIssuingPointRecord(id, crlNumber, crlSize, thisUpdate, nextUpdate);
}
@@ -758,7 +759,8 @@ public final class CMS {
* @param p7 7th parameter
* @return localized log message
*/
- public static String getLogMessage(String msgID, String p1, String p2, String p3, String p4, String p5, String p6, String p7) {
+ public static String getLogMessage(String msgID, String p1, String p2, String p3, String p4, String p5, String p6,
+ String p7) {
return _engine.getLogMessage(msgID, p1, p2, p3, p4, p5, p6, p7);
}
@@ -776,7 +778,8 @@ public final class CMS {
* @param p8 8th parameter
* @return localized log message
*/
- public static String getLogMessage(String msgID, String p1, String p2, String p3, String p4, String p5, String p6, String p7, String p8) {
+ public static String getLogMessage(String msgID, String p1, String p2, String p3, String p4, String p5, String p6,
+ String p7, String p8) {
return _engine.getLogMessage(msgID, p1, p2, p3, p4, p5, p6, p7, p8);
}
@@ -795,7 +798,8 @@ public final class CMS {
* @param p9 9th parameter
* @return localized log message
*/
- public static String getLogMessage(String msgID, String p1, String p2, String p3, String p4, String p5, String p6, String p7, String p8, String p9) {
+ public static String getLogMessage(String msgID, String p1, String p2, String p3, String p4, String p5, String p6,
+ String p7, String p8, String p9) {
return _engine.getLogMessage(msgID, p1, p2, p3, p4, p5, p6, p7, p8, p9);
}
@@ -1019,7 +1023,8 @@ public final class CMS {
* @return general name object
* @exception EBaseException failed to create general name constraint
*/
- public static GeneralName form_GeneralNameAsConstraints(String generalNameChoice, String value) throws EBaseException {
+ public static GeneralName form_GeneralNameAsConstraints(String generalNameChoice, String value)
+ throws EBaseException {
return _engine.form_GeneralName(generalNameChoice, value);
}
@@ -1066,7 +1071,8 @@ public final class CMS {
* @param isValueConfigured true if value is configured
* @exception EBaseException failed to create subject alt name configuration
*/
- public static ISubjAltNameConfig createSubjAltNameConfig(String name, IConfigStore config, boolean isValueConfigured) throws EBaseException {
+ public static ISubjAltNameConfig createSubjAltNameConfig(String name, IConfigStore config, boolean isValueConfigured)
+ throws EBaseException {
return _engine.createSubjAltNameConfig(
name, config, isValueConfigured);
}
@@ -1152,7 +1158,8 @@ public final class CMS {
* @param isPolicyEnabled true if policy is enabled
* @exception EBaseException failed to create subject alt name configuration
*/
- public static IGeneralNameAsConstraintsConfig createGeneralNameAsConstraintsConfig(String name, IConfigStore config, boolean isValueConfigured,
+ public static IGeneralNameAsConstraintsConfig createGeneralNameAsConstraintsConfig(String name,
+ IConfigStore config, boolean isValueConfigured,
boolean isPolicyEnabled) throws EBaseException {
return _engine.createGeneralNameAsConstraintsConfig(
name, config, isValueConfigured, isPolicyEnabled);
@@ -1167,7 +1174,8 @@ public final class CMS {
* @param isPolicyEnabled true if policy is enabled
* @exception EBaseException failed to create subject alt name configuration
*/
- public static IGeneralNamesAsConstraintsConfig createGeneralNamesAsConstraintsConfig(String name, IConfigStore config, boolean isValueConfigured,
+ public static IGeneralNamesAsConstraintsConfig createGeneralNamesAsConstraintsConfig(String name,
+ IConfigStore config, boolean isValueConfigured,
boolean isPolicyEnabled) throws EBaseException {
return _engine.createGeneralNamesAsConstraintsConfig(
name, config, isValueConfigured, isPolicyEnabled);
diff --git a/pki/base/common/src/com/netscape/certsrv/apps/ICMSEngine.java b/pki/base/common/src/com/netscape/certsrv/apps/ICMSEngine.java
index 4a6e6c693..d299b5814 100644
--- a/pki/base/common/src/com/netscape/certsrv/apps/ICMSEngine.java
+++ b/pki/base/common/src/com/netscape/certsrv/apps/ICMSEngine.java
@@ -398,7 +398,8 @@ public interface ICMSEngine extends ISubsystem {
* @param p7 7th parameter
* @return localized log message
*/
- public String getLogMessage(String msgID, String p1, String p2, String p3, String p4, String p5, String p6, String p7);
+ public String getLogMessage(String msgID, String p1, String p2, String p3, String p4, String p5, String p6,
+ String p7);
/**
* Retrieves the centralized log message from LogMessages.properties.
@@ -414,7 +415,8 @@ public interface ICMSEngine extends ISubsystem {
* @param p8 8th parameter
* @return localized log message
*/
- public String getLogMessage(String msgID, String p1, String p2, String p3, String p4, String p5, String p6, String p7, String p8);
+ public String getLogMessage(String msgID, String p1, String p2, String p3, String p4, String p5, String p6,
+ String p7, String p8);
/**
* Retrieves the centralized log message from LogMessages.properties.
@@ -431,7 +433,8 @@ public interface ICMSEngine extends ISubsystem {
* @param p9 9th parameter
* @return localized log message
*/
- public String getLogMessage(String msgID, String p1, String p2, String p3, String p4, String p5, String p6, String p7, String p8, String p9);
+ public String getLogMessage(String msgID, String p1, String p2, String p3, String p4, String p5, String p6,
+ String p7, String p8, String p9);
/**
* Parse ACL resource attributes
@@ -452,7 +455,8 @@ public interface ICMSEngine extends ISubsystem {
*
* @return issuing record
*/
- public ICRLIssuingPointRecord createCRLIssuingPointRecord(String id, BigInteger crlNumber, Long crlSize, Date thisUpdate, Date nextUpdate);
+ public ICRLIssuingPointRecord createCRLIssuingPointRecord(String id, BigInteger crlNumber, Long crlSize,
+ Date thisUpdate, Date nextUpdate);
/**
* Retrieves the default CRL issuing point record name.
@@ -956,7 +960,8 @@ public interface ICMSEngine extends ISubsystem {
* @param isPolicyEnabled true if policy is enabled
* @exception EBaseException failed to create subject alt name configuration
*/
- public IGeneralNameAsConstraintsConfig createGeneralNameAsConstraintsConfig(String name, IConfigStore config, boolean isValueConfigured,
+ public IGeneralNameAsConstraintsConfig createGeneralNameAsConstraintsConfig(String name, IConfigStore config,
+ boolean isValueConfigured,
boolean isPolicyEnabled) throws EBaseException;
/**
@@ -968,7 +973,8 @@ public interface ICMSEngine extends ISubsystem {
* @param isPolicyEnabled true if policy is enabled
* @exception EBaseException failed to create subject alt name configuration
*/
- public IGeneralNamesAsConstraintsConfig createGeneralNamesAsConstraintsConfig(String name, IConfigStore config, boolean isValueConfigured,
+ public IGeneralNamesAsConstraintsConfig createGeneralNamesAsConstraintsConfig(String name, IConfigStore config,
+ boolean isValueConfigured,
boolean isPolicyEnabled) throws EBaseException;
/**
@@ -995,7 +1001,8 @@ public interface ICMSEngine extends ISubsystem {
* @param isValueConfigured true if value is configured
* @exception EBaseException failed to create subject alt name configuration
*/
- public ISubjAltNameConfig createSubjAltNameConfig(String name, IConfigStore config, boolean isValueConfigured) throws EBaseException;
+ public ISubjAltNameConfig createSubjAltNameConfig(String name, IConfigStore config, boolean isValueConfigured)
+ throws EBaseException;
/**
* Retrieves the HTTP Connection for use with connector.
diff --git a/pki/base/common/src/com/netscape/certsrv/request/ARequestNotifier.java b/pki/base/common/src/com/netscape/certsrv/request/ARequestNotifier.java
index 47f54a6dc..3d1c4095e 100644
--- a/pki/base/common/src/com/netscape/certsrv/request/ARequestNotifier.java
+++ b/pki/base/common/src/com/netscape/certsrv/request/ARequestNotifier.java
@@ -232,7 +232,8 @@ public class ARequestNotifier implements IRequestNotifier {
if (!(requestType.equals(IRequest.ENROLLMENT_REQUEST) ||
requestType.equals(IRequest.RENEWAL_REQUEST) ||
requestType.equals(IRequest.REVOCATION_REQUEST) ||
- requestType.equals(IRequest.CMCREVOKE_REQUEST) || requestType.equals(IRequest.UNREVOCATION_REQUEST))) {
+ requestType.equals(IRequest.CMCREVOKE_REQUEST) || requestType
+ .equals(IRequest.UNREVOCATION_REQUEST))) {
continue;
}
if (i == 0 && id.equals(r.getRequestId().toString())) {
@@ -244,7 +245,8 @@ public class ARequestNotifier implements IRequestNotifier {
}
if (mRequests.size() < mMaxRequests) {
mRequests.addElement(r.getRequestId().toString());
- CMS.debug("getRequest added " + r.getRequestType() + " request " + r.getRequestId().toString() +
+ CMS.debug("getRequest added " + r.getRequestType() + " request " + r.getRequestId().toString()
+ +
" to mRequests: " + mRequests.size() + " (" + mMaxRequests + ")");
} else {
break;
@@ -512,7 +514,9 @@ class RunListeners implements Runnable {
* RunListeners thread implementation.
*/
public void run() {
- CMS.debug("RunListeners::" + ((mRequestNotifier != null && mRequestNotifier.getNumberOfRequests() > 0) ? " Queue: " + mRequestNotifier.getNumberOfRequests() : " noQueue") +
+ CMS.debug("RunListeners::"
+ + ((mRequestNotifier != null && mRequestNotifier.getNumberOfRequests() > 0) ? " Queue: "
+ + mRequestNotifier.getNumberOfRequests() : " noQueue") +
" " + ((mRequest != null) ? " SingleRequest" : " noSingleRequest"));
do {
if (mRequestNotifier != null)
@@ -528,7 +532,9 @@ class RunListeners implements Runnable {
mRequestNotifier.updatePublishingStatus(mRequest.getRequestId().toString());
}
}
- CMS.debug("RunListeners: " + ((mRequestNotifier != null && mRequestNotifier.getNumberOfRequests() > 0) ? " Queue: " + mRequestNotifier.getNumberOfRequests() : " noQueue") +
+ CMS.debug("RunListeners: "
+ + ((mRequestNotifier != null && mRequestNotifier.getNumberOfRequests() > 0) ? " Queue: "
+ + mRequestNotifier.getNumberOfRequests() : " noQueue") +
" " + ((mRequest != null) ? " SingleRequest" : " noSingleRequest"));
if (mRequestNotifier != null)
mListeners = mRequestNotifier.getListeners();
diff --git a/pki/base/common/src/com/netscape/certsrv/security/ICryptoSubsystem.java b/pki/base/common/src/com/netscape/certsrv/security/ICryptoSubsystem.java
index 50a0e1a16..3d26d6f3a 100644
--- a/pki/base/common/src/com/netscape/certsrv/security/ICryptoSubsystem.java
+++ b/pki/base/common/src/com/netscape/certsrv/security/ICryptoSubsystem.java
@@ -467,5 +467,6 @@ public interface ICryptoSubsystem extends ISubsystem {
* @return certificate
* @exception EBaseException failed to sign certificate template
*/
- public X509CertImpl getSignedCert(KeyCertData data, String certType, java.security.PrivateKey priKey) throws EBaseException;
+ public X509CertImpl getSignedCert(KeyCertData data, String certType, java.security.PrivateKey priKey)
+ throws EBaseException;
}
diff --git a/pki/base/common/src/com/netscape/certsrv/util/HttpInput.java b/pki/base/common/src/com/netscape/certsrv/util/HttpInput.java
index 9b7eec1d2..04877d92a 100644
--- a/pki/base/common/src/com/netscape/certsrv/util/HttpInput.java
+++ b/pki/base/common/src/com/netscape/certsrv/util/HttpInput.java
@@ -147,7 +147,8 @@ public class HttpInput {
i.equals("2048") || i.equals("4096")) {
return i;
}
- throw new IOException("Invalid key length '" + i + "'. Currently supported key lengths are 256, 512, 1024, 2048, 4096.");
+ throw new IOException("Invalid key length '" + i
+ + "'. Currently supported key lengths are 256, 512, 1024, 2048, 4096.");
}
public static String getKeySize(HttpServletRequest request, String name, String keyType)
@@ -158,7 +159,8 @@ public class HttpInput {
i.equals("2048") || i.equals("4096")) {
return i;
} else {
- throw new IOException("Invalid key length '" + i + "'. Currently supported RSA key lengths are 256, 512, 1024, 2048, 4096.");
+ throw new IOException("Invalid key length '" + i
+ + "'. Currently supported RSA key lengths are 256, 512, 1024, 2048, 4096.");
}
}
if (keyType.equals("ecc")) {
@@ -171,7 +173,10 @@ public class HttpInput {
if ((p >= 112) && (p <= 571))
return i;
else {
- throw new IOException("Invalid key length '" + i + "'. Please consult your security officer for a proper length, or take the default value. Here are examples of some commonly used key lengths: 256, 384, 521.");
+ throw new IOException(
+ "Invalid key length '"
+ + i
+ + "'. Please consult your security officer for a proper length, or take the default value. Here are examples of some commonly used key lengths: 256, 384, 521.");
}
/*
@@ -260,7 +265,8 @@ public class HttpInput {
Pattern p = Pattern.compile("[A-Za-z0-9]+[A-Za-z0-9 -]*");
Matcher m = p.matcher(v);
if (!m.matches()) {
- throw new IOException("Invalid characters found in Security Domain Name " + v + ". Valid characters are A-Z, a-z, 0-9, dash and space");
+ throw new IOException("Invalid characters found in Security Domain Name " + v
+ + ". Valid characters are A-Z, a-z, 0-9, dash and space");
}
return v;
}
generated by cgit (git 2.34.1) at 2024-07-03 15:11:06 +0000