Attachment 1485355 Details for Bug 1630469 – Revised upstream fix.

[patch] Revised upstream fix.

ocsp-master1.patch (text/plain), 1.23 KB, created by Jack Magne on 2018-09-21 01:07:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jack Magne

Created: 2018-09-21 01:07:01 UTC

Size: 1.23 KB

patch

obsolete

>diff --git a/src/org/apache/tomcat/util/net/jss/TomcatJSS.java b/src/org/apache/tomcat/util/net/jss/TomcatJSS.java
>index 7719ee3..bda9d88 100644
>--- a/src/org/apache/tomcat/util/net/jss/TomcatJSS.java
>+++ b/src/org/apache/tomcat/util/net/jss/TomcatJSS.java
>@@ -500,13 +500,24 @@ public class TomcatJSS implements SSLSocketListener {
>         }
> 
>         logger.debug("ocspResponderURL: " + ocspResponderURL);
>+ 
>         if (StringUtils.isEmpty(ocspResponderURL)) {
>-            throw new Exception("Missing ocspResponderURL");
>+            ocspResponderURL = null;
>         }
> 
>         logger.debug("ocspResponderCertNickname: " + ocspResponderCertNickname);
>         if (StringUtils.isEmpty(ocspResponderCertNickname)) {
>-            throw new Exception("Missing ocspResponderCertNickname");
>+            ocspResponderCertNickname = null;
>+        }
>+
>+        // Check to see if the ocsp url and nickname are both set or not set
>+
>+        if (ocspResponderURL == null && ocspResponderCertNickname != null) {
>+            throw new Exception("Missing OCSP responder URL");
>+        }
>+
>+        if (ocspResponderURL != null && ocspResponderCertNickname == null) {
>+            throw new Exception("Missing OCSP responder certificate nickname");
>         }
>

Actions: View | Diff

Attachments on bug 1630469: 1485347 | 1485353 | 1485355