[tomcat] 02/03: Back-port clean-up

[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

commit 1364b1dad7342a2d229989af8164d02f352d6f53
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Jun 26 17:05:34 2019 +0100

    Back-port clean-up
---
 java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java        | 4 ++--
 java/org/apache/tomcat/util/net/openssl/ciphers/Encryption.java      | 2 +-
 java/org/apache/tomcat/util/net/openssl/ciphers/EncryptionLevel.java | 2 +-
 java/org/apache/tomcat/util/net/openssl/ciphers/MessageDigest.java   | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java 
b/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java
index e0b0e9c..5f10707 100644
--- a/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java
+++ b/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java
@@ -268,7 +268,7 @@ public class SSLHostConfigCertificate implements 
Serializable {
 
     // Nested types
 
-    public static enum Type {
+    public enum Type {
 
         UNDEFINED,
         RSA(Authentication.RSA),
@@ -291,7 +291,7 @@ public class SSLHostConfigCertificate implements 
Serializable {
         }
     }
 
-    static enum StoreType {
+    enum StoreType {
         KEYSTORE,
         PEM
     }
diff --git a/java/org/apache/tomcat/util/net/openssl/ciphers/Encryption.java 
b/java/org/apache/tomcat/util/net/openssl/ciphers/Encryption.java
index 691db86..09aa32f 100644
--- a/java/org/apache/tomcat/util/net/openssl/ciphers/Encryption.java
+++ b/java/org/apache/tomcat/util/net/openssl/ciphers/Encryption.java
@@ -39,5 +39,5 @@ enum Encryption {
     FZA,
     RC4,
     RC2,
-    eNULL;
+    eNULL
 }
diff --git 
a/java/org/apache/tomcat/util/net/openssl/ciphers/EncryptionLevel.java 
b/java/org/apache/tomcat/util/net/openssl/ciphers/EncryptionLevel.java
index f779df2..466828a 100644
--- a/java/org/apache/tomcat/util/net/openssl/ciphers/EncryptionLevel.java
+++ b/java/org/apache/tomcat/util/net/openssl/ciphers/EncryptionLevel.java
@@ -24,5 +24,5 @@ enum EncryptionLevel {
     LOW,
     MEDIUM,
     HIGH,
-    FIPS;
+    FIPS
 }
diff --git a/java/org/apache/tomcat/util/net/openssl/ciphers/MessageDigest.java 
b/java/org/apache/tomcat/util/net/openssl/ciphers/MessageDigest.java
index 718a002..967930a 100644
--- a/java/org/apache/tomcat/util/net/openssl/ciphers/MessageDigest.java
+++ b/java/org/apache/tomcat/util/net/openssl/ciphers/MessageDigest.java
@@ -24,5 +24,5 @@ enum MessageDigest {
     GOST89MAC,
     SHA256,
     SHA384,
-    AEAD;
+    AEAD
 }


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