|
 |
356aa5 |
From c7e9138d59833ca0b9437fd130d3d9cb2fdf393d Mon Sep 17 00:00:00 2001
|
|
|
356aa5 |
From: John Magne <jmagne@mharmsen-rhel7.usersys.redhat.com>
|
|
|
356aa5 |
Date: Thu, 20 Sep 2018 21:35:20 -0400
|
|
|
356aa5 |
Subject: [PATCH] Fix for Bug 1630469 - CC: tomcatjss: unable to enable OCSP
|
|
|
356aa5 |
checking from peer AIA extension.
|
|
|
356aa5 |
|
|
|
356aa5 |
Now the server.xml can be configured to enable ocsp AND leave other settings null, to trigger
|
|
|
356aa5 |
NSS to use the AIA extension to locate the ocsp responder.
|
|
|
356aa5 |
|
|
|
356aa5 |
ex:
|
|
|
356aa5 |
|
|
|
356aa5 |
|
|
|
356aa5 |
.....
|
|
|
356aa5 |
enableOCSP="true" ocspCacheSize="1000" ocspMinCacheEntryDuration="60" ocspMaxCacheEntryDuration="120" ocspTimeout="10"
|
|
|
356aa5 |
---
|
|
|
356aa5 |
src/org/apache/tomcat/util/net/jss/JSSSocketFactory.java | 7 +++++--
|
|
|
356aa5 |
1 file changed, 5 insertions(+), 2 deletions(-)
|
|
|
356aa5 |
|
|
|
356aa5 |
diff --git a/src/org/apache/tomcat/util/net/jss/JSSSocketFactory.java b/src/org/apache/tomcat/util/net/jss/JSSSocketFactory.java
|
|
|
356aa5 |
index b38b091..b91c7a4 100644
|
|
|
356aa5 |
--- a/src/org/apache/tomcat/util/net/jss/JSSSocketFactory.java
|
|
|
356aa5 |
+++ b/src/org/apache/tomcat/util/net/jss/JSSSocketFactory.java
|
|
|
356aa5 |
@@ -740,8 +740,11 @@ public class JSSSocketFactory implements
|
|
|
356aa5 |
"ocspResponderCertNickname");
|
|
|
356aa5 |
debugWrite("JSSSocketFactory init - ocspResponderCertNickname"
|
|
|
356aa5 |
+ ocspResponderCertNickname + "\n");
|
|
|
356aa5 |
- if (StringUtils.isNotEmpty(ocspResponderURL) &&
|
|
|
356aa5 |
- StringUtils.isNotEmpty(ocspResponderCertNickname)) {
|
|
|
356aa5 |
+
|
|
|
356aa5 |
+ if ((StringUtils.isNotEmpty(ocspResponderURL) &&
|
|
|
356aa5 |
+ StringUtils.isNotEmpty(ocspResponderCertNickname)) ||
|
|
|
356aa5 |
+ (StringUtils.isEmpty(ocspResponderURL)
|
|
|
356aa5 |
+ && StringUtils.isEmpty(ocspResponderCertNickname))) {
|
|
|
356aa5 |
|
|
|
356aa5 |
ocspConfigured = true;
|
|
|
356aa5 |
try {
|
|
|
356aa5 |
--
|
|
|
356aa5 |
1.8.3.1
|
|
|
356aa5 |
|