Author: markt
Date: Tue Jul 29 13:48:33 2014
New Revision: 1614351
URL: http://svn.apache.org/r1614351
Log:
Simplify construction
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java?rev=1614351&r1=1614350&r2=1614351&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java Tue
Jul 29 13:48:33 2014
@@ -2447,14 +2447,16 @@ enum Cipher {
*/
private final int alg_bits;
- Cipher(String openSSLAlias, Set<String> jsseAltNames, KeyExchange kx,
Authentication au,
+ Cipher(String openSSLAlias, String[] jsseAltNames, KeyExchange kx,
Authentication au,
Encryption enc, MessageDigest mac, Protocol protocol, boolean
export,
EncryptionLevel level, boolean fipsCompatible, int strength_bits,
int alg_bits) {
this.openSSLAlias = openSSLAlias;
Set<String> names = new HashSet<>();
if (jsseAltNames != null) {
- names.addAll(jsseAltNames);
+ for (String jsseAltName : jsseAltNames) {
+ names.add(jsseAltName);
+ }
}
names.add(name());
this.jsseNames = Collections.unmodifiableSet(names);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
