You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by rj...@apache.org on 2015/02/24 16:39:16 UTC
svn commit: r1661990 -
/tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/OpenSSLCipherConfigurationParser.java
Author: rjung
Date: Tue Feb 24 15:39:15 2015
New Revision: 1661990
URL: http://svn.apache.org/r1661990
Log:
Add SRP aliases.
This silences warn output in unit tests.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/OpenSSLCipherConfigurationParser.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/OpenSSLCipherConfigurationParser.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/OpenSSLCipherConfigurationParser.java?rev=1661990&r1=1661989&r2=1661990&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/OpenSSLCipherConfigurationParser.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/OpenSSLCipherConfigurationParser.java Tue Feb 24 15:39:15 2015
@@ -351,6 +351,18 @@ public class OpenSSLCipherConfigurationP
*/
private static final String GOST89MAC = "GOST89MAC";
/**
+ * Cipher suites using SRP authentication, specified in the RFC 5054.
+ */
+ private static final String aSRP = "aSRP";
+ /**
+ * Cipher suites using SRP key exchange, specified in the RFC 5054.
+ */
+ private static final String kSRP = "kSRP";
+ /**
+ * Same as kSRP
+ */
+ private static final String SRP = "SRP";
+ /**
* Cipher suites using pre-shared keys (PSK).
*/
private static final String PSK = "PSK";
@@ -463,6 +475,9 @@ public class OpenSSLCipherConfigurationP
addListAlias(GOST89MAC, filterByMessageDigest(allCiphers, Collections.singleton(MessageDigest.GOST89MAC)));
addListAlias(PSK, filter(allCiphers, null, Collections.singleton(KeyExchange.PSK), Collections.singleton(Authentication.PSK), null, null, null));
addListAlias(KRB5, filter(allCiphers, null, Collections.singleton(KeyExchange.KRB5), Collections.singleton(Authentication.KRB5), null, null, null));
+ addListAlias(aSRP, filterByAuthentication(allCiphers, Collections.singleton(Authentication.SRP)));
+ addListAlias(kSRP, filterByKeyExchange(allCiphers, Collections.singleton(KeyExchange.SRP)));
+ addListAlias(SRP, filterByKeyExchange(allCiphers, Collections.singleton(KeyExchange.SRP)));
initialized = true;
// Despite what the OpenSSL docs say, DEFAULT also excludes SSLv2
addListAlias(DEFAULT, parse("ALL:!eNULL:!aNULL:!SSLv2"));
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org