Author: markt
Date: Tue Aug 12 18:26:55 2014
New Revision: 1617553

URL: http://svn.apache.org/r1617553
Log:
Map protocol names to the name used by OpenSSL with ciphers -v

Modified:
    tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Protocol.java

Modified: 
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Protocol.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Protocol.java?rev=1617553&r1=1617552&r2=1617553&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Protocol.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Protocol.java Tue 
Aug 12 18:26:55 2014
@@ -18,5 +18,24 @@
 package org.apache.tomcat.util.net.jsse.openssl;
 
 enum Protocol {
-    SSLv3, SSLv2, TLSv1, TLSv1_2;
+
+    SSLv3("SSLv3"),
+    SSLv2("SSLv2"),
+    TLSv1("SSLv3"),
+    TLSv1_2("TLSv1.2");
+
+    private final String openSSLName;
+
+    private Protocol(String openSSLName) {
+        this.openSSLName = openSSLName;
+    }
+
+    /**
+     * The name returned by OpenSSL in the protocol column when using
+     * <code>openssl ciphers -v</code>. This is currently only used by the unit
+     * tests hence it is package private.
+     */
+    String getOpenSSLName() {
+        return openSSLName;
+    }
 }



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

Reply via email to