tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From schu...@apache.org
Subject svn commit: r1811620 - /tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/OpenSSLCipherConfigurationParser.java
Date Mon, 09 Oct 2017 22:26:47 GMT
Author: schultz
Date: Mon Oct  9 22:26:47 2017
New Revision: 1811620

URL: http://svn.apache.org/viewvc?rev=1811620&view=rev
Log:
Fix mismatched ciphersuite metadata.

Modified:
    tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/OpenSSLCipherConfigurationParser.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/OpenSSLCipherConfigurationParser.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/OpenSSLCipherConfigurationParser.java?rev=1811620&r1=1811619&r2=1811620&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/OpenSSLCipherConfigurationParser.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/OpenSSLCipherConfigurationParser.java
Mon Oct  9 22:26:47 2017
@@ -880,16 +880,16 @@ public class OpenSSLCipherConfigurationP
                 if(first) {
                     first = false;
                 } else {
-                    if(verbose) {
-                        System.out.println("\t" + cipher.getProtocol() + "\tKx=" + cipher.getKx()
+ "\tAu=" + cipher.getAu() + "\tEnc=" + cipher.getEnc() + "\tMac=" + cipher.getMac());
-                    }
-                    else
+                    if(!verbose)
                         System.out.print(',');
                 }
                 if(useOpenSSLNames)
                     System.out.print(cipher.getOpenSSLAlias());
                 else
                     System.out.print(cipher.name());
+                if(verbose) {
+                    System.out.println("\t" + cipher.getProtocol() + "\tKx=" + cipher.getKx()
+ "\tAu=" + cipher.getAu() + "\tEnc=" + cipher.getEnc() + "\tMac=" + cipher.getMac());
+                }
             }
             System.out.println();
         } else {



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


Mime
View raw message