Author: markt
Date: Tue Jan 5 14:58:33 2016
New Revision: 1723088
URL: http://svn.apache.org/viewvc?rev=1723088&view=rev
Log:
Move CipherSuiteConverter to ciphers package
Added:
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/CipherSuiteConverter.java
- copied, changed from r1723079,
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/CipherSuiteConverter.java
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/LocalStrings.properties
(with props)
Removed:
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/CipherSuiteConverter.java
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/LocalStrings.properties
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java
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=1723088&r1=1723087&r2=1723088&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:58:33 2016
@@ -42,8 +42,6 @@ engine.nullName=Null value name
engine.nullValue=Null value
engine.handshakeFailure=Failed handshake: {0}
-converter.mapping=Cipher suite mapping: [{0}] => [{1}]
-
keyManager.nullCertificateChain=Null certificate chain
keyManager.nullPrivateKey=Null private key
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java?rev=1723088&r1=1723087&r2=1723088&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java
Tue Jan 5 14:58:33 2016
@@ -49,6 +49,7 @@ import org.apache.tomcat.util.net.Consta
import org.apache.tomcat.util.net.SSLHostConfig;
import org.apache.tomcat.util.net.SSLHostConfigCertificate;
import org.apache.tomcat.util.net.jsse.JSSEKeyManager;
+import org.apache.tomcat.util.net.openssl.ciphers.CipherSuiteConverter;
import
org.apache.tomcat.util.net.openssl.ciphers.OpenSSLCipherConfigurationParser;
import org.apache.tomcat.util.res.StringManager;
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java?rev=1723088&r1=1723087&r2=1723088&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java Tue
Jan 5 14:58:33 2016
@@ -51,6 +51,7 @@ import org.apache.tomcat.jni.SSLContext;
import org.apache.tomcat.util.buf.ByteBufferUtils;
import org.apache.tomcat.util.net.Constants;
import org.apache.tomcat.util.net.SSLUtil;
+import org.apache.tomcat.util.net.openssl.ciphers.CipherSuiteConverter;
import org.apache.tomcat.util.res.StringManager;
/**
Copied:
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/CipherSuiteConverter.java
(from r1723079,
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/ciphers/CipherSuiteConverter.java?p2=tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/CipherSuiteConverter.java&p1=tomcat/trunk/java/org/apache/tomcat/util/net/openssl/CipherSuiteConverter.java&r1=1723079&r2=1723088&rev=1723088&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/CipherSuiteConverter.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/CipherSuiteConverter.java
Tue Jan 5 14:58:33 2016
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.tomcat.util.net.openssl;
+package org.apache.tomcat.util.net.openssl.ciphers;
import java.util.HashMap;
import java.util.Map;
Added:
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/LocalStrings.properties?rev=1723088&view=auto
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/LocalStrings.properties
(added)
+++
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/LocalStrings.properties
Tue Jan 5 14:58:33 2016
@@ -0,0 +1,16 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+converter.mapping=Cipher suite mapping: [{0}] => [{1}]
Propchange:
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/LocalStrings.properties
------------------------------------------------------------------------------
svn:eol-style = native
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
