Attachment 1485353 Details for Bug 1630469 – Upstream version for master , of patch

[patch] Upstream version for master , of patch

ocsp-master.patch (text/plain), 1.44 KB, created by Jack Magne on 2018-09-21 00:24:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jack Magne

Created: 2018-09-21 00:24:30 UTC

Size: 1.44 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..6a52c06 100644
>--- a/src/org/apache/tomcat/util/net/jss/TomcatJSS.java
>+++ b/src/org/apache/tomcat/util/net/jss/TomcatJSS.java
>@@ -500,13 +500,28 @@ public class TomcatJSS implements SSLSocketListener {
>         }
> 
>         logger.debug("ocspResponderURL: " + ocspResponderURL);
>+         
>+        boolean noOCSPResponderURL = false;
>+        boolean noOCSPResponderCertNickname = false;
>+ 
>         if (StringUtils.isEmpty(ocspResponderURL)) {
>-            throw new Exception("Missing ocspResponderURL");
>+            noOCSPResponderURL = true;
>+            ocspResponderURL = null;
>         }
> 
>         logger.debug("ocspResponderCertNickname: " + ocspResponderCertNickname);
>         if (StringUtils.isEmpty(ocspResponderCertNickname)) {
>-            throw new Exception("Missing ocspResponderCertNickname");
>+            noOCSPResponderCertNickname = true;
>+            ocspResponderCertNickname = null;
>+        }
>+
>+        // Check to see if the ocsp url and nickname are both set or not set
>+
>+        if ((noOCSPResponderURL == false && noOCSPResponderCertNickname == false) ||
>+               (noOCSPResponderURL == true && noOCSPResponderCertNickname == true)) {
>+        // No problem, keep going...
>+        } else {
>+            throw new Exception("Incorrect OCSP configuration");
>         }
> 
>         manager.configureOCSP(
>

Actions: View | Diff

Attachments on bug 1630469: 1485347 | 1485353 | 1485355