svn commit: r1847116 - /tomcat/trunk/java/org/apache/tomcat/util/net/SSLUtilBase.java

[markt]

Author: markt
Date: Wed Nov 21 15:01:34 2018
New Revision: 1847116

URL: http://svn.apache.org/viewvc?rev=1847116&view=rev
Log:
Simplify duplicated logic
Reported by SpotBugs

Modified:
    tomcat/trunk/java/org/apache/tomcat/util/net/SSLUtilBase.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SSLUtilBase.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SSLUtilBase.java?rev=1847116&r1=1847115&r2=1847116&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/SSLUtilBase.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SSLUtilBase.java Wed Nov 21 
15:01:34 2018
@@ -74,8 +74,7 @@ public abstract class SSLUtilBase implem
         this.enabledProtocols = enabledProtocols.toArray(new 
String[enabledProtocols.size()]);
 
         if (enabledProtocols.contains(Constants.SSL_PROTO_TLSv1_3) &&
-                (sslHostConfig.getCertificateVerification() == 
CertificateVerification.OPTIONAL ||
-                        sslHostConfig.getCertificateVerification() == 
CertificateVerification.OPTIONAL) &&
+                sslHostConfig.getCertificateVerification() == 
CertificateVerification.OPTIONAL &&
                 !isTls13RenegAuthAvailable() && warnTls13) {
             log.warn(sm.getString("jsse.tls13.auth"));
         }



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org