Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 29CF7200D24 for ; Tue, 10 Oct 2017 00:26:54 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 283B71609E0; Mon, 9 Oct 2017 22:26:54 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 6DD5F1609CE for ; Tue, 10 Oct 2017 00:26:53 +0200 (CEST) Received: (qmail 1876 invoked by uid 500); 9 Oct 2017 22:26:52 -0000 Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Tomcat Developers List" Delivered-To: mailing list dev@tomcat.apache.org Received: (qmail 1866 invoked by uid 99); 9 Oct 2017 22:26:52 -0000 Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 09 Oct 2017 22:26:52 +0000 Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 83C593A040C for ; Mon, 9 Oct 2017 22:26:49 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1811620 - /tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/OpenSSLCipherConfigurationParser.java Date: Mon, 09 Oct 2017 22:26:47 -0000 To: dev@tomcat.apache.org From: schultz@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20171009222650.83C593A040C@svn01-us-west.apache.org> archived-at: Mon, 09 Oct 2017 22:26:54 -0000 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