You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2015/10/24 11:13:25 UTC
svn commit: r1710316 - in /tomcat/trunk: java/org/apache/tomcat/util/net/
java/org/apache/tomcat/util/net/jsse/
java/org/apache/tomcat/util/net/jsse/openssl/
java/org/apache/tomcat/util/net/openssl/
java/org/apache/tomcat/util/net/openssl/ciphers/ test...
Author: markt
Date: Sat Oct 24 09:13:24 2015
New Revision: 1710316
URL: http://svn.apache.org/viewvc?rev=1710316&view=rev
Log:
Bring OpenSSL integration code together under a common package
Added:
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/Authentication.java
- copied, changed from r1710315, tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Authentication.java
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/Cipher.java
- copied, changed from r1710311, tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/Encryption.java
- copied, changed from r1710311, tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Encryption.java
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/EncryptionLevel.java
- copied, changed from r1710311, tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/EncryptionLevel.java
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/KeyExchange.java
- copied, changed from r1710311, tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/KeyExchange.java
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/MessageDigest.java
- copied, changed from r1710311, tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/MessageDigest.java
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/OpenSSLCipherConfigurationParser.java
- copied, changed from r1710311, tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/OpenSSLCipherConfigurationParser.java
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/Protocol.java
- copied, changed from r1710311, tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Protocol.java
tomcat/trunk/test/org/apache/tomcat/util/net/openssl/
tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/
tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestCipher.java
- copied, changed from r1710315, tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestOpenSSLCipherConfigurationParser.java
- copied, changed from r1710315, tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestOpenSSLCipherConfigurationParser.java
tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestOpenSSLCipherConfigurationParserOnly.java
- copied, changed from r1710315, tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestOpenSSLCipherConfigurationParserOnly.java
tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java
- copied, changed from r1710315, tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TesterOpenSSL.java
Removed:
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/
tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java
tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java
tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java
tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java
tomcat/trunk/java/org/apache/tomcat/util/net/TLSClientHelloExtractor.java
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESupport.java
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java
tomcat/trunk/test/org/apache/tomcat/util/net/TestSSLHostConfig.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java?rev=1710316&r1=1710315&r2=1710316&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java Sat Oct 24 09:13:24 2015
@@ -27,8 +27,8 @@ import javax.net.ssl.SSLParameters;
import javax.net.ssl.SSLSessionContext;
import org.apache.tomcat.util.net.SSLHostConfig.Type;
-import org.apache.tomcat.util.net.jsse.openssl.Cipher;
import org.apache.tomcat.util.net.openssl.OpenSSLImplementation;
+import org.apache.tomcat.util.net.openssl.ciphers.Cipher;
public abstract class AbstractJsseEndpoint<S> extends AbstractEndpoint<S> {
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java?rev=1710316&r1=1710315&r2=1710316&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java Sat Oct 24 09:13:24 2015
@@ -29,8 +29,8 @@ import javax.net.ssl.TrustManagerFactory
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
-import org.apache.tomcat.util.net.jsse.openssl.Cipher;
-import org.apache.tomcat.util.net.jsse.openssl.OpenSSLCipherConfigurationParser;
+import org.apache.tomcat.util.net.openssl.ciphers.Cipher;
+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/SSLHostConfigCertificate.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java?rev=1710316&r1=1710315&r2=1710316&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java Sat Oct 24 09:13:24 2015
@@ -20,7 +20,7 @@ import java.util.HashSet;
import java.util.Set;
import org.apache.tomcat.util.net.AbstractJsseEndpoint.SSLContextWrapper;
-import org.apache.tomcat.util.net.jsse.openssl.Authentication;
+import org.apache.tomcat.util.net.openssl.ciphers.Authentication;
public class SSLHostConfigCertificate {
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java?rev=1710316&r1=1710315&r2=1710316&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java Sat Oct 24 09:13:24 2015
@@ -39,7 +39,7 @@ import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.buf.ByteBufferUtils;
import org.apache.tomcat.util.net.TLSClientHelloExtractor.ExtractorResult;
-import org.apache.tomcat.util.net.jsse.openssl.Cipher;
+import org.apache.tomcat.util.net.openssl.ciphers.Cipher;
import org.apache.tomcat.util.res.StringManager;
/**
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java?rev=1710316&r1=1710315&r2=1710316&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java Sat Oct 24 09:13:24 2015
@@ -36,7 +36,7 @@ import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.buf.ByteBufferUtils;
import org.apache.tomcat.util.net.TLSClientHelloExtractor.ExtractorResult;
-import org.apache.tomcat.util.net.jsse.openssl.Cipher;
+import org.apache.tomcat.util.net.openssl.ciphers.Cipher;
import org.apache.tomcat.util.res.StringManager;
/**
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/TLSClientHelloExtractor.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/TLSClientHelloExtractor.java?rev=1710316&r1=1710315&r2=1710316&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/TLSClientHelloExtractor.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/TLSClientHelloExtractor.java Sat Oct 24 09:13:24 2015
@@ -23,7 +23,7 @@ import java.util.List;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
-import org.apache.tomcat.util.net.jsse.openssl.Cipher;
+import org.apache.tomcat.util.net.openssl.ciphers.Cipher;
import org.apache.tomcat.util.res.StringManager;
/**
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESupport.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESupport.java?rev=1710316&r1=1710315&r2=1710316&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESupport.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESupport.java Sat Oct 24 09:13:24 2015
@@ -30,7 +30,7 @@ import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.net.SSLSessionManager;
import org.apache.tomcat.util.net.SSLSupport;
-import org.apache.tomcat.util.net.jsse.openssl.Cipher;
+import org.apache.tomcat.util.net.openssl.ciphers.Cipher;
import org.apache.tomcat.util.res.StringManager;
/** JSSESupport
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=1710316&r1=1710315&r2=1710316&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 Sat Oct 24 09:13:24 2015
@@ -56,7 +56,7 @@ import org.apache.tomcat.util.net.Abstra
import org.apache.tomcat.util.net.Constants;
import org.apache.tomcat.util.net.SSLHostConfig;
import org.apache.tomcat.util.net.SSLHostConfigCertificate;
-import org.apache.tomcat.util.net.jsse.openssl.OpenSSLCipherConfigurationParser;
+import org.apache.tomcat.util.net.openssl.ciphers.OpenSSLCipherConfigurationParser;
import org.apache.tomcat.util.res.StringManager;
public class OpenSSLContext implements org.apache.tomcat.util.net.SSLContext {
Copied: tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/Authentication.java (from r1710315, tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Authentication.java)
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/Authentication.java?p2=tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/Authentication.java&p1=tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Authentication.java&r1=1710315&r2=1710316&rev=1710316&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Authentication.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/Authentication.java Sat Oct 24 09:13:24 2015
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.tomcat.util.net.jsse.openssl;
+package org.apache.tomcat.util.net.openssl.ciphers;
public enum Authentication {
RSA /* RSA auth */,
Copied: tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/Cipher.java (from r1710311, 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/openssl/ciphers/Cipher.java?p2=tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/Cipher.java&p1=tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java&r1=1710311&r2=1710316&rev=1710316&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/Cipher.java Sat Oct 24 09:13:24 2015
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.tomcat.util.net.jsse.openssl;
+package org.apache.tomcat.util.net.openssl.ciphers;
import java.util.Arrays;
import java.util.Collections;
Copied: tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/Encryption.java (from r1710311, tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Encryption.java)
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/Encryption.java?p2=tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/Encryption.java&p1=tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Encryption.java&r1=1710311&r2=1710316&rev=1710316&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Encryption.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/Encryption.java Sat Oct 24 09:13:24 2015
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.tomcat.util.net.jsse.openssl;
+package org.apache.tomcat.util.net.openssl.ciphers;
enum Encryption {
AES128,
Copied: tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/EncryptionLevel.java (from r1710311, tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/EncryptionLevel.java)
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/EncryptionLevel.java?p2=tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/EncryptionLevel.java&p1=tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/EncryptionLevel.java&r1=1710311&r2=1710316&rev=1710316&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/EncryptionLevel.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/EncryptionLevel.java Sat Oct 24 09:13:24 2015
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.tomcat.util.net.jsse.openssl;
+package org.apache.tomcat.util.net.openssl.ciphers;
enum EncryptionLevel {
STRONG_NONE,
Copied: tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/KeyExchange.java (from r1710311, tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/KeyExchange.java)
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/KeyExchange.java?p2=tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/KeyExchange.java&p1=tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/KeyExchange.java&r1=1710311&r2=1710316&rev=1710316&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/KeyExchange.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/KeyExchange.java Sat Oct 24 09:13:24 2015
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.tomcat.util.net.jsse.openssl;
+package org.apache.tomcat.util.net.openssl.ciphers;
enum KeyExchange {
EECDH /* SSL_kECDHE - ephemeral ECDH */,
Copied: tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/MessageDigest.java (from r1710311, tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/MessageDigest.java)
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/MessageDigest.java?p2=tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/MessageDigest.java&p1=tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/MessageDigest.java&r1=1710311&r2=1710316&rev=1710316&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/MessageDigest.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/MessageDigest.java Sat Oct 24 09:13:24 2015
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.tomcat.util.net.jsse.openssl;
+package org.apache.tomcat.util.net.openssl.ciphers;
enum MessageDigest {
MD5,
Copied: tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/OpenSSLCipherConfigurationParser.java (from r1710311, 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/openssl/ciphers/OpenSSLCipherConfigurationParser.java?p2=tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/OpenSSLCipherConfigurationParser.java&p1=tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/OpenSSLCipherConfigurationParser.java&r1=1710311&r2=1710316&rev=1710316&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/OpenSSLCipherConfigurationParser.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/OpenSSLCipherConfigurationParser.java Sat Oct 24 09:13:24 2015
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.tomcat.util.net.jsse.openssl;
+package org.apache.tomcat.util.net.openssl.ciphers;
import java.util.ArrayList;
import java.util.Arrays;
Copied: tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/Protocol.java (from r1710311, 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/openssl/ciphers/Protocol.java?p2=tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/Protocol.java&p1=tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Protocol.java&r1=1710311&r2=1710316&rev=1710316&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Protocol.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/Protocol.java Sat Oct 24 09:13:24 2015
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.tomcat.util.net.jsse.openssl;
+package org.apache.tomcat.util.net.openssl.ciphers;
import org.apache.tomcat.util.net.Constants;
Modified: tomcat/trunk/test/org/apache/tomcat/util/net/TestSSLHostConfig.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/net/TestSSLHostConfig.java?rev=1710316&r1=1710315&r2=1710316&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/tomcat/util/net/TestSSLHostConfig.java (original)
+++ tomcat/trunk/test/org/apache/tomcat/util/net/TestSSLHostConfig.java Sat Oct 24 09:13:24 2015
@@ -19,7 +19,7 @@ package org.apache.tomcat.util.net;
import org.junit.Assert;
import org.junit.Test;
-import org.apache.tomcat.util.net.jsse.openssl.Cipher;
+import org.apache.tomcat.util.net.openssl.ciphers.Cipher;
public class TestSSLHostConfig {
Copied: tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestCipher.java (from r1710315, tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java)
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestCipher.java?p2=tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestCipher.java&p1=tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java&r1=1710315&r2=1710316&rev=1710316&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java (original)
+++ tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestCipher.java Sat Oct 24 09:13:24 2015
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.tomcat.util.net.jsse.openssl;
+package org.apache.tomcat.util.net.openssl.ciphers;
import java.util.Arrays;
import java.util.Collections;
Copied: tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestOpenSSLCipherConfigurationParser.java (from r1710315, tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestOpenSSLCipherConfigurationParser.java)
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestOpenSSLCipherConfigurationParser.java?p2=tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestOpenSSLCipherConfigurationParser.java&p1=tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestOpenSSLCipherConfigurationParser.java&r1=1710315&r2=1710316&rev=1710316&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestOpenSSLCipherConfigurationParser.java (original)
+++ tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestOpenSSLCipherConfigurationParser.java Sat Oct 24 09:13:24 2015
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.tomcat.util.net.jsse.openssl;
+package org.apache.tomcat.util.net.openssl.ciphers;
import java.util.List;
Copied: tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestOpenSSLCipherConfigurationParserOnly.java (from r1710315, tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestOpenSSLCipherConfigurationParserOnly.java)
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestOpenSSLCipherConfigurationParserOnly.java?p2=tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestOpenSSLCipherConfigurationParserOnly.java&p1=tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestOpenSSLCipherConfigurationParserOnly.java&r1=1710315&r2=1710316&rev=1710316&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestOpenSSLCipherConfigurationParserOnly.java (original)
+++ tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestOpenSSLCipherConfigurationParserOnly.java Sat Oct 24 09:13:24 2015
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.tomcat.util.net.jsse.openssl;
+package org.apache.tomcat.util.net.openssl.ciphers;
import java.util.LinkedHashSet;
Copied: tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java (from r1710315, tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TesterOpenSSL.java)
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java?p2=tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java&p1=tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TesterOpenSSL.java&r1=1710315&r2=1710316&rev=1710316&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TesterOpenSSL.java (original)
+++ tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java Sat Oct 24 09:13:24 2015
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.tomcat.util.net.jsse.openssl;
+package org.apache.tomcat.util.net.openssl.ciphers;
import java.io.IOException;
import java.io.InputStream;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org