[tomcat] branch 8.5.x updated: Remove unused code

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/8.5.x by this push:
     new 51fa03b  Remove unused code
51fa03b is described below

commit 51fa03bb27ee6b3122f3442f1f6ec9e7a26786b5
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Jan 20 21:17:03 2020 +0000

    Remove unused code
---
 .../group/interceptors/EncryptInterceptor.java     | 29 ----------------------
 1 file changed, 29 deletions(-)

diff --git 
a/java/org/apache/catalina/tribes/group/interceptors/EncryptInterceptor.java 
b/java/org/apache/catalina/tribes/group/interceptors/EncryptInterceptor.java
index 65d9933..d98b5d8 100644
--- a/java/org/apache/catalina/tribes/group/interceptors/EncryptInterceptor.java
+++ b/java/org/apache/catalina/tribes/group/interceptors/EncryptInterceptor.java
@@ -349,9 +349,6 @@ public class EncryptInterceptor extends 
ChannelInterceptorBase implements Encryp
             return new BaseEncryptionManager(algorithm,
                     new SecretKeySpec(encryptionKey, algorithmName),
                     providerName);
-//        else if("ECB".equalsIgnoreCase(algorithmMode)) {
-            // Note: ECB is not an appropriate mode for secure communications.
-//            return new ECBEncryptionManager(algorithm, new 
SecretKeySpec(encryptionKey, algorithmName), providerName);
         else
             throw new 
IllegalArgumentException(sm.getString("encryptInterceptor.algorithm.unsupported-mode",
 algorithmMode));
     }
@@ -601,32 +598,6 @@ public class EncryptInterceptor extends 
ChannelInterceptorBase implements Encryp
         }
     }
 
-    @SuppressWarnings("unused")
-    private static class ECBEncryptionManager extends BaseEncryptionManager
-    {
-        public ECBEncryptionManager(String algorithm, SecretKeySpec secretKey, 
String providerName)
-                throws NoSuchAlgorithmException, NoSuchPaddingException, 
NoSuchProviderException {
-            super(algorithm, secretKey, providerName);
-        }
-
-        private static final byte[] EMPTY_IV = new byte[0];
-
-        @Override
-        protected int getIVSize() {
-            return 0;
-        }
-
-        @Override
-        protected byte[] generateIVBytes() {
-            return EMPTY_IV;
-        }
-
-        @Override
-        protected AlgorithmParameterSpec generateIV(byte[] bytes, int offset, 
int length) {
-            return null;
-        }
-    }
-
     static class ChannelConfigException
         extends ChannelException
     {


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org