-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Mark,
On 10/10/17 4:49 AM, Mark Thomas wrote: > On 09/10/17 22:55, schu...@apache.org wrote: >> Author: schultz Date: Mon Oct 9 21:55:29 2017 New Revision: >> 1811614 >> >> URL: http://svn.apache.org/viewvc?rev=1811614&view=rev Log: Add >> main method to OpenSSLCipherConfigurationParser and wrapper >> script to mimic "openssl ciphers" command. > > <snip/> > >> +# >> --------------------------------------------------------------------- - -------- >> >> +# Script to digest password using the algorithm specified >> +# >> --------------------------------------------------------------------- - -------- > >> > Copy / paste error? Yep, I copied the existing digest.sh script for this purpose and missed that part. Thanks for the heads-up. > Actually, there is a large amount of duplication between this and > other scripts. Time for some refactoring? Possibly. I wasn't entirely sure the purpose for all of that boilerplate stuff at the top of the script, so I decided not to touch it (for now). I'm happy look at opportunities for shared code. There is a script called tool-wrapper.sh, but that appears to be a wrapper around a specific piece of Java code. I'll investigate that as well. >> Modified: >> tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/OpenSSLC ipherConfigurationParser.java >> >> URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/ne t/openssl/ciphers/OpenSSLCipherConfigurationParser.java?rev=1811614&r1=1 811613&r2=1811614&view=diff >> ===================================================================== ========= >> >> - --- tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/OpenSSLCiph erConfigurationParser.java (original) >> +++ >> tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/OpenSSLC ipherConfigurationParser.java >> Mon Oct 9 21:55:29 2017 @@ -824,4 +824,77 @@ public class >> OpenSSLCipherConfigurationP } return >> builder.toString().substring(0, builder.length() - 1); } + + >> public static void usage() { + System.out.println("Usage: >> java " + OpenSSLCipherConfigurationParser.class.getName() + " >> [options] cipherspec"); + System.out.println(); + >> System.out.println("Displays the TLS cipher suites matching the >> cipherspec."); + System.out.println(); + >> System.out.println(" --help,"); + System.out.println(" -h >> Print this help message"); + System.out.println(" >> --openssl Show OpenSSL cipher suite names instead of IANA >> cipher suite names."); + System.out.println(" >> --verbose,"); + System.out.println(" -v Provide >> detailed cipher listing"); > > Maybe clarify in the text above that Java accepts the IANA names? +1 I'll make that change as well. Thanks, - -chris -----BEGIN PGP SIGNATURE----- Comment: GPGTools - http://gpgtools.org Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQJRBAEBCAA7FiEEMmKgYcQvxMe7tcJcHPApP6U8pFgFAlnfoHkdHGNocmlzQGNo cmlzdG9waGVyc2NodWx0ei5uZXQACgkQHPApP6U8pFgXHg//ZZ+NTOmTb1qZmQMq p20YAqtew2jceZkny4VBpSjaPeGrzCqrmBsaMlBSd+TeygYjmczkrjEMnGyuRb9k gTF5g1euAf/WJHJEhiuU+7nGC71v8F3Klp6NnLin0Wp4EzLrPzbwJzVV/LkTbXhy jGgTM0xK1fWN5GxEg3eY7JrRu96nx7EVaBBVepis+lktMnHT5r27A/FtVysWEQ0d QL4hx6lAXiHpp1TiTID1qFuMU6VUMoAi8ywB4YAGsO7gr9EjAJljdCRrR1QUshfC +mP3afV6LcWnYaP+jm1iIIfxlimh9BO3pnVXmNLtj7p8ZH3K6z4fjBRVQWjvXJ1b VtzMGqF9lIUOwb/II7Y+KskbCX94r8DqQ3+XG89spbk6/LrGMS5g3vWmBQs3TrfR LBu9LGR76jmvZPweeE7QaHvipmwvPLaMfj9o2IIqfvd6ELf1YFpGEFfqR2OW2m+9 lpr0o2agpMX7u4QCOMXfKINiR3l2SN2y8+IwhE9OsFc+r/K3BHWuDeqjPE8EpcuM HAtk3ncA0UFoL85eRQumoZQjGVkcoEfvUFl3YbKY6vhF9lGD/I9kqpH7wUUs2Wpr t6TqXWIiPB1yU+rnWFtsnJoB9K7OBRQucecdBi35pqBpB5GwR+AKu18DUOWds/4P tUqpY2NkL/XpfgXQvkDvoCSYAmg= =J68X -----END PGP SIGNATURE----- --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
