[Bug 373567] cert validation issue with ocsp and crldp always being enabled when validating turned on fixed

1 files changed, 8 insertions, 3 deletions

diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/security/CertificateValidator.java b/jetty-util/src/main/java/org/eclipse/jetty/util/security/CertificateValidator.java
index fb2d284388..8e5024ac98 100644
--- a/jetty-util/src/main/java/org/eclipse/jetty/util/security/CertificateValidator.java
+++ b/jetty-util/src/main/java/org/eclipse/jetty/util/security/CertificateValidator.java
@@ -232,10 +232,15 @@ public class CertificateValidator
             }
     
             // Enable On-Line Certificate Status Protocol (OCSP) support
-            Security.setProperty("ocsp.enable","true");
-    
+            if (_enableOCSP)
+            {
+                Security.setProperty("ocsp.enable","true");
+            }
             // Enable Certificate Revocation List Distribution Points (CRLDP) support
-            System.setProperty("com.sun.security.enableCRLDP","true");
+            if (_enableCRLDP)
+            {
+                System.setProperty("com.sun.security.enableCRLDP","true");
+            }
     
             // Build certification path
             CertPathBuilderResult buildResult = CertPathBuilder.getInstance("PKIX").build(pbParams);