Author: markt
Date: Tue Jan 5 14:16:20 2016
New Revision: 1723079
URL: http://svn.apache.org/viewvc?rev=1723079&view=rev
Log:
Fix Javadoc
Address logging TODOs
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/CipherSuiteConverter.java
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/LocalStrings.properties
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/CipherSuiteConverter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/openssl/CipherSuiteConverter.java?rev=1723079&r1=1723078&r2=1723079&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/CipherSuiteConverter.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/CipherSuiteConverter.java
Tue Jan 5 14:16:20 2016
@@ -125,7 +125,11 @@ public final class CipherSuiteConverter
}
/**
- * Converts the specified Java cipher suites to the colon-separated
OpenSSL cipher suite specification.
+ * Converts the specified Java cipher suites to the OpenSSL specification.
+ *
+ * @param javaCipherSuites The JSSE cipher suite names to convert
+ *
+ * @return A list of colon-separated OpenSSL cipher suite names
*/
public static String toOpenSsl(Iterable<String> javaCipherSuites) {
final StringBuilder buf = new StringBuilder();
@@ -154,6 +158,8 @@ public final class CipherSuiteConverter
/**
* Converts the specified Java cipher suite to its corresponding OpenSSL
cipher suite name.
*
+ * @param javaCipherSuite The JSSE cipher suite name to convert
+ *
* @return {@code null} if the conversion has failed
*/
public static String toOpenSsl(String javaCipherSuite) {
@@ -182,11 +188,9 @@ public final class CipherSuiteConverter
p2j.put("TLS", "TLS_" + javaCipherSuiteSuffix);
o2j.put(openSslCipherSuite, p2j);
- /* TODO the log looks broken...
if (logger.isDebugEnabled()) {
logger.debug(sm.getString("converter.mapping", javaCipherSuite,
openSslCipherSuite));
}
- */
return openSslCipherSuite;
}
@@ -315,12 +319,10 @@ public final class CipherSuiteConverter
j2o.putIfAbsent(javaCipherSuiteTls, openSslCipherSuite);
j2o.putIfAbsent(javaCipherSuiteSsl, openSslCipherSuite);
- /* TODO the log looks broken...
if (logger.isDebugEnabled()) {
- logger.debug(sm.getString("converter.mapping", javaCipherSuiteTls,
openSslCipherSuite));
- logger.debug(sm.getString("converter.mapping", javaCipherSuiteSsl,
openSslCipherSuite));
+ logger.debug(sm.getString("converter.mapping", openSslCipherSuite,
javaCipherSuiteTls));
+ logger.debug(sm.getString("converter.mapping", openSslCipherSuite,
javaCipherSuiteSsl));
}
- */
return p2j;
}
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/openssl/LocalStrings.properties?rev=1723079&r1=1723078&r2=1723079&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/LocalStrings.properties
(original)
+++
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/LocalStrings.properties
Tue Jan 5 14:16:20 2016
@@ -42,7 +42,7 @@ engine.nullName=Null value name
engine.nullValue=Null value
engine.handshakeFailure=Failed handshake: {0}
-converter.mapping=Cipher suite mapping: {} => {} {0} {1}
+converter.mapping=Cipher suite mapping: [{0}] => [{1}]
keyManager.nullCertificateChain=Null certificate chain
keyManager.nullPrivateKey=Null private key
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
