Skip to content

Commit ea808b8

Browse files
committed
Rename enableOCSP to enableRevocationCheck
Since verification with CRL-DP is introduced and it is enabled using this parameter the name is modified to be not related only to OCSP.
1 parent b8f1b44 commit ea808b8

File tree

3 files changed

+27
-20
lines changed

3 files changed

+27
-20
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
= Paramater Changes =
2+
3+
== enableOCSP become enableRevocationCheck ==
4+
5+
Since verification with CRL-DP is introduced and it is enabled using
6+
this parameter in `server.xml` connector, the name is modified to be not related only to OCSP.
7+

tomcat/src/main/java/org/dogtagpki/jss/tomcat/Http11NioProtocol.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -73,12 +73,12 @@ public void setServerCertNickFile(String serverCertNickFile) {
7373
tomcatjss.setServerCertNickFile(serverCertNickFile);
7474
}
7575

76-
public boolean getEnabledOCSP() {
77-
return tomcatjss.getEnableOCSP();
76+
public boolean getEnableRevocationCheck() {
77+
return tomcatjss.getEnableRevocationCheck();
7878
}
7979

80-
public void setEnableOCSP(boolean enableOCSP) {
81-
tomcatjss.setEnableOCSP(enableOCSP);
80+
public void setEnableRevocationCheck(boolean enableRevocationCheck) {
81+
tomcatjss.setEnableRevocationCheck(enableRevocationCheck);
8282
}
8383

8484
public String getOcspResponderURL() {

tomcat/src/main/java/org/dogtagpki/jss/tomcat/TomcatJSS.java

+16-16
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ public class TomcatJSS implements SSLSocketListener {
8888
boolean requireClientAuth;
8989
boolean wantClientAuth;
9090

91-
boolean enableOCSP;
91+
boolean enableRevocationCheck;
9292
String ocspResponderURL;
9393
String ocspResponderCertNickname;
9494
int ocspCacheSize = 1000; // entries
@@ -183,12 +183,12 @@ public boolean getWantClientAuth() {
183183
return wantClientAuth;
184184
}
185185

186-
public boolean getEnableOCSP() {
187-
return enableOCSP;
186+
public boolean getEnableRevocationCheck() {
187+
return enableRevocationCheck;
188188
}
189189

190-
public void setEnableOCSP(boolean enableOCSP) {
191-
this.enableOCSP = enableOCSP;
190+
public void setEnableRevocationCheck(boolean enableRevocationCheck) {
191+
this.enableRevocationCheck = enableRevocationCheck;
192192
}
193193

194194
public String getOcspResponderURL() {
@@ -267,9 +267,9 @@ public void loadJSSConfig(Properties config) {
267267
if (passwordFileProp != null)
268268
setPasswordFile(passwordFileProp);
269269

270-
String enableOCSPProp = config.getProperty("enableOCSP");
271-
if (enableOCSPProp != null)
272-
setEnableOCSP(Boolean.parseBoolean(enableOCSPProp));
270+
String enableRevocationCheckProp = config.getProperty("enableRevocationCheck");
271+
if (enableRevocationCheckProp != null)
272+
setEnableRevocationCheck(Boolean.parseBoolean(enableRevocationCheckProp));
273273

274274
String ocspResponderURLProp = config.getProperty("ocspResponderURL");
275275
if (ocspResponderURLProp != null)
@@ -343,9 +343,9 @@ public void loadTomcatConfig(Document document) throws XPathExpressionException
343343
if (serverCertNickFileProp != null)
344344
setServerCertNickFile(serverCertNickFileProp);
345345

346-
String enableOCSPProp = connector.getAttribute("enableOCSP");
347-
if (enableOCSPProp != null)
348-
setEnableOCSP(Boolean.parseBoolean(enableOCSPProp));
346+
String enableRevocationCheckProp = connector.getAttribute("enableRevocationCheck");
347+
if (enableRevocationCheckProp != null)
348+
setEnableRevocationCheck(Boolean.parseBoolean(enableRevocationCheckProp));
349349

350350
String ocspResponderURLProp = connector.getAttribute("ocspResponderURL");
351351
if (ocspResponderURLProp != null)
@@ -469,7 +469,7 @@ public void init() throws KeyDatabaseException, CertDatabaseException, GeneralSe
469469
logger.debug("wantClientAuth: {}", wantClientAuth);
470470

471471
if (requireClientAuth || wantClientAuth) {
472-
configureOCSP();
472+
configureRevocationCheck();
473473
}
474474

475475
// 12 hours = 43200 seconds
@@ -549,12 +549,12 @@ public CryptoToken getToken(String tag) throws NoSuchTokenException {
549549
return null;
550550
}
551551

552-
public void configureOCSP() throws GeneralSecurityException, ConfigurationException {
552+
public void configureRevocationCheck() throws GeneralSecurityException, ConfigurationException {
553553

554-
logger.info("configuring OCSP");
554+
logger.info("configuring Revocation Check");
555555

556-
logger.debug("enableOCSP: {}", enableOCSP);
557-
if (!enableOCSP) {
556+
logger.debug("enableCertificateCheck: {}", enableRevocationCheck);
557+
if (!enableRevocationCheck) {
558558
return;
559559
}
560560

0 commit comments

Comments
 (0)