directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dran...@apache.org
Subject directory-kerby git commit: Renamed Asn1EnumType.
Date Thu, 03 Dec 2015 02:21:10 GMT
Repository: directory-kerby
Updated Branches:
  refs/heads/master e3197ce25 -> 597995d42


Renamed Asn1EnumType.


Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/597995d4
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/597995d4
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/597995d4

Branch: refs/heads/master
Commit: 597995d427163401710361fe1e1a79e6a06b572b
Parents: e3197ce
Author: Kai Zheng <kai.zheng@intel.com>
Authored: Thu Dec 3 10:20:47 2015 +0800
Committer: Kai Zheng <kai.zheng@intel.com>
Committed: Thu Dec 3 10:20:47 2015 +0800

----------------------------------------------------------------------
 .../java/org/apache/kerby/asn1/EnumType.java    | 27 ++++++++++++++++++++
 .../apache/kerby/asn1/type/Asn1EnumType.java    | 27 --------------------
 .../apache/kerby/asn1/type/Asn1Enumerated.java  |  9 ++++---
 .../org/apache/kerby/asn1/type/Asn1Flags.java   | 10 +++++---
 .../org/apache/kerby/asn1/TestAsn1Flags.java    |  3 +--
 .../kerby/kerberos/kerb/preauth/PaFlag.java     |  6 ++---
 .../kerby/kerberos/kerb/KrbErrorCode.java       |  6 ++---
 .../kerberos/kerb/type/KrbAppSequenceType.java  |  4 +--
 .../kerberos/kerb/type/KrbSequenceType.java     |  4 +--
 .../kerb/type/ad/AuthorizationType.java         |  6 ++---
 .../kerby/kerberos/kerb/type/ap/ApOption.java   |  6 ++---
 .../kerberos/kerb/type/base/CheckSumType.java   |  6 ++---
 .../kerberos/kerb/type/base/EncryptionType.java |  6 ++---
 .../kerberos/kerb/type/base/HostAddrType.java   |  6 ++---
 .../kerby/kerberos/kerb/type/base/KeyUsage.java |  6 ++---
 .../kerberos/kerb/type/base/KrbMessageType.java |  6 ++---
 .../kerberos/kerb/type/base/LastReqType.java    |  6 ++---
 .../kerby/kerberos/kerb/type/base/NameType.java |  6 ++---
 .../kerby/kerberos/kerb/type/base/SamType.java  |  4 +--
 .../kerberos/kerb/type/base/TokenFormat.java    |  6 ++---
 .../kerb/type/base/TransitedEncodingType.java   |  6 ++---
 .../kerberos/kerb/type/fast/ArmorType.java      |  6 ++---
 .../kerberos/kerb/type/fast/FastOption.java     |  6 ++---
 .../kerby/kerberos/kerb/type/kdc/KdcOption.java |  6 ++---
 .../kerby/kerberos/kerb/type/pa/PaDataType.java |  6 ++---
 .../kerberos/kerb/type/pa/token/TokenFlag.java  |  6 ++---
 .../kerberos/kerb/type/ticket/TicketFlag.java   |  6 ++---
 .../org/apache/kerby/cms/type/CmsVersion.java   |  4 +--
 .../org/apache/kerby/x509/type/CRLReason.java   |  6 ++---
 .../kerby/x509/type/DigestedObjectType.java     |  6 ++---
 .../org/apache/kerby/x509/type/KeyUsage.java    |  4 +--
 .../org/apache/kerby/x509/type/ReasonFlags.java |  4 +--
 32 files changed, 114 insertions(+), 112 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/597995d4/kerby-asn1/src/main/java/org/apache/kerby/asn1/EnumType.java
----------------------------------------------------------------------
diff --git a/kerby-asn1/src/main/java/org/apache/kerby/asn1/EnumType.java b/kerby-asn1/src/main/java/org/apache/kerby/asn1/EnumType.java
new file mode 100644
index 0000000..ff9cd23
--- /dev/null
+++ b/kerby-asn1/src/main/java/org/apache/kerby/asn1/EnumType.java
@@ -0,0 +1,27 @@
+/**
+ *  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.
+ *
+ */
+package org.apache.kerby.asn1;
+
+/**
+ * A helper interface used by Asn1Enumerated.
+ */
+public interface EnumType {
+    int getValue();
+}

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/597995d4/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/Asn1EnumType.java
----------------------------------------------------------------------
diff --git a/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/Asn1EnumType.java b/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/Asn1EnumType.java
deleted file mode 100644
index 7210aee..0000000
--- a/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/Asn1EnumType.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- *  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.
- *
- */
-package org.apache.kerby.asn1.type;
-
-/**
- * A helper interface used by Asn1Enumerated.
- */
-public interface Asn1EnumType {
-    int getValue();
-}

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/597995d4/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/Asn1Enumerated.java
----------------------------------------------------------------------
diff --git a/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/Asn1Enumerated.java b/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/Asn1Enumerated.java
index 8dc4b4a..223fc97 100644
--- a/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/Asn1Enumerated.java
+++ b/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/Asn1Enumerated.java
@@ -19,6 +19,7 @@
  */
 package org.apache.kerby.asn1.type;
 
+import org.apache.kerby.asn1.EnumType;
 import org.apache.kerby.asn1.UniversalTag;
 
 import java.io.IOException;
@@ -27,7 +28,7 @@ import java.math.BigInteger;
 /**
  * The ASN1 enumerated type
  */
-public abstract class Asn1Enumerated<T extends Asn1EnumType> extends Asn1Simple<T>
{
+public abstract class Asn1Enumerated<T extends EnumType> extends Asn1Simple<T>
{
 
     /**
      * Default constructor, generally for decoding as a container
@@ -52,13 +53,13 @@ public abstract class Asn1Enumerated<T extends Asn1EnumType> extends
Asn1Simple<
     protected void toValue() throws IOException {
         BigInteger biVal = new BigInteger(getBytes());
         int iVal = biVal.intValue();
-        Asn1EnumType[] allValues = getAllEnumValues();
-        for (Asn1EnumType val : allValues) {
+        EnumType[] allValues = getAllEnumValues();
+        for (EnumType val : allValues) {
             if (val.getValue() == iVal) {
                 setValue((T) val);
             }
         }
     }
 
-    protected abstract Asn1EnumType[] getAllEnumValues();
+    protected abstract EnumType[] getAllEnumValues();
 }

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/597995d4/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/Asn1Flags.java
----------------------------------------------------------------------
diff --git a/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/Asn1Flags.java b/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/Asn1Flags.java
index 9c219df..f11d6df 100644
--- a/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/Asn1Flags.java
+++ b/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/Asn1Flags.java
@@ -19,6 +19,8 @@
  */
 package org.apache.kerby.asn1.type;
 
+import org.apache.kerby.asn1.EnumType;
+
 import java.io.IOException;
 
 /**
@@ -81,15 +83,15 @@ public class Asn1Flags extends Asn1BitString {
         setFlags(0);
     }
 
-    public boolean isFlagSet(Asn1EnumType flag) {
+    public boolean isFlagSet(EnumType flag) {
         return isFlagSet(flag.getValue());
     }
 
-    public void setFlag(Asn1EnumType flag) {
+    public void setFlag(EnumType flag) {
         setFlag(flag.getValue());
     }
 
-    public void setFlag(Asn1EnumType flag, boolean isSet)  {
+    public void setFlag(EnumType flag, boolean isSet)  {
         if (isSet) {
             setFlag(flag.getValue());
         } else {
@@ -97,7 +99,7 @@ public class Asn1Flags extends Asn1BitString {
         }
     }
 
-    public void clearFlag(Asn1EnumType flag) {
+    public void clearFlag(EnumType flag) {
         clearFlag(flag.getValue());
     }
 

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/597995d4/kerby-asn1/src/test/java/org/apache/kerby/asn1/TestAsn1Flags.java
----------------------------------------------------------------------
diff --git a/kerby-asn1/src/test/java/org/apache/kerby/asn1/TestAsn1Flags.java b/kerby-asn1/src/test/java/org/apache/kerby/asn1/TestAsn1Flags.java
index ef70a69..1c3ce80 100644
--- a/kerby-asn1/src/test/java/org/apache/kerby/asn1/TestAsn1Flags.java
+++ b/kerby-asn1/src/test/java/org/apache/kerby/asn1/TestAsn1Flags.java
@@ -19,7 +19,6 @@
  */
 package org.apache.kerby.asn1;
 
-import org.apache.kerby.asn1.type.Asn1EnumType;
 import org.apache.kerby.asn1.type.Asn1Flags;
 import org.junit.Before;
 import org.junit.Rule;
@@ -41,7 +40,7 @@ public class TestAsn1Flags {
   public static final int FLAG_4 = 16;
   public static final int FLAG_5 = 32;
   
-  public enum TestEnum implements Asn1EnumType {
+  public enum TestEnum implements EnumType {
     FLAG_0(0x00000001),
     FLAG_1(0x00000002),
     FLAG_2(0x00000004),

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/597995d4/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/preauth/PaFlag.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/preauth/PaFlag.java
b/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/preauth/PaFlag.java
index f67ab90..4d75546 100644
--- a/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/preauth/PaFlag.java
+++ b/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/preauth/PaFlag.java
@@ -19,9 +19,9 @@
  */
 package org.apache.kerby.kerberos.kerb.preauth;
 
-import org.apache.kerby.asn1.type.Asn1EnumType;
+import org.apache.kerby.asn1.EnumType;
 
-public enum PaFlag implements Asn1EnumType {
+public enum PaFlag implements EnumType {
     NONE(-1),
     PA_REAL(0x01),
     PA_INFO(0x02);
@@ -38,7 +38,7 @@ public enum PaFlag implements Asn1EnumType {
     }
 
     public static PaFlag fromValue(int value) {
-        for (Asn1EnumType e : values()) {
+        for (EnumType e : values()) {
             if (e.getValue() == value) {
                 return (PaFlag) e;
             }

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/597995d4/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/KrbErrorCode.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/KrbErrorCode.java
b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/KrbErrorCode.java
index 33b0689..3ab9871 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/KrbErrorCode.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/KrbErrorCode.java
@@ -19,9 +19,9 @@
  */
 package org.apache.kerby.kerberos.kerb;
 
-import org.apache.kerby.asn1.type.Asn1EnumType;
+import org.apache.kerby.asn1.EnumType;
 
-public enum KrbErrorCode implements Asn1EnumType {
+public enum KrbErrorCode implements EnumType {
     KDC_ERR_NONE(0, "No error"),
     KDC_ERR_NAME_EXP(1, "Client's entry in database has expired"),
     KDC_ERR_SERVICE_EXP(2, "Server's entry in database has expired"),
@@ -108,7 +108,7 @@ public enum KrbErrorCode implements Asn1EnumType {
 
     public static KrbErrorCode fromValue(Integer value) {
         if (value != null) {
-            for (Asn1EnumType e : values()) {
+            for (EnumType e : values()) {
                 if (e.getValue() == value.intValue()) {
                     return (KrbErrorCode) e;
                 }

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/597995d4/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/KrbAppSequenceType.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/KrbAppSequenceType.java
b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/KrbAppSequenceType.java
index 8de28e0..a4178a3 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/KrbAppSequenceType.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/KrbAppSequenceType.java
@@ -19,7 +19,7 @@
  */
 package org.apache.kerby.kerberos.kerb.type;
 
-import org.apache.kerby.asn1.type.Asn1EnumType;
+import org.apache.kerby.asn1.EnumType;
 import org.apache.kerby.asn1.Asn1FieldInfo;
 import org.apache.kerby.asn1.type.TaggingSequence;
 
@@ -51,7 +51,7 @@ public abstract class KrbAppSequenceType extends TaggingSequence {
         setFieldAs(index, new KerberosTime(value));
     }
 
-    protected void setField(int index, Asn1EnumType krbEnum) {
+    protected void setField(int index, EnumType krbEnum) {
         setFieldAsInt(index, krbEnum.getValue());
     }
 }

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/597995d4/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/KrbSequenceType.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/KrbSequenceType.java
b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/KrbSequenceType.java
index 3ff278d..bf655b2 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/KrbSequenceType.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/KrbSequenceType.java
@@ -19,7 +19,7 @@
  */
 package org.apache.kerby.kerberos.kerb.type;
 
-import org.apache.kerby.asn1.type.Asn1EnumType;
+import org.apache.kerby.asn1.EnumType;
 import org.apache.kerby.asn1.Asn1FieldInfo;
 import org.apache.kerby.asn1.type.Asn1SequenceType;
 
@@ -49,7 +49,7 @@ public abstract class KrbSequenceType extends Asn1SequenceType {
         setFieldAs(index, new KerberosTime(value));
     }
 
-    protected void setField(int index, Asn1EnumType value) {
+    protected void setField(int index, EnumType value) {
         setFieldAsInt(index, value.getValue());
     }
 }

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/597995d4/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/ad/AuthorizationType.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/ad/AuthorizationType.java
b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/ad/AuthorizationType.java
index 979fc13..895535f 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/ad/AuthorizationType.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/ad/AuthorizationType.java
@@ -19,9 +19,9 @@
  */
 package org.apache.kerby.kerberos.kerb.type.ad;
 
-import org.apache.kerby.asn1.type.Asn1EnumType;
+import org.apache.kerby.asn1.EnumType;
 
-public enum AuthorizationType implements Asn1EnumType {
+public enum AuthorizationType implements EnumType {
     /**
      * Constant for the "null" authorization type.
      */
@@ -131,7 +131,7 @@ public enum AuthorizationType implements Asn1EnumType {
 
     public static AuthorizationType fromValue(Integer value) {
         if (value != null) {
-            for (Asn1EnumType e : values()) {
+            for (EnumType e : values()) {
                 if (e.getValue() == value.intValue()) {
                     return (AuthorizationType) e;
                 }

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/597995d4/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/ap/ApOption.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/ap/ApOption.java
b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/ap/ApOption.java
index 9676c2f..8dd61a5 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/ap/ApOption.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/ap/ApOption.java
@@ -19,7 +19,7 @@
  */
 package org.apache.kerby.kerberos.kerb.type.ap;
 
-import org.apache.kerby.asn1.type.Asn1EnumType;
+import org.apache.kerby.asn1.EnumType;
 
 /**
  APOptions       ::= KrbFlags
@@ -27,7 +27,7 @@ import org.apache.kerby.asn1.type.Asn1EnumType;
  -- use-session-key(1),
  -- mutual-required(2)
  */
-public enum ApOption implements Asn1EnumType {
+public enum ApOption implements EnumType {
     NONE(-1),
     RESERVED(0x80000000),
     USE_SESSION_KEY(0x40000000),
@@ -47,7 +47,7 @@ public enum ApOption implements Asn1EnumType {
     }
 
     public static ApOption fromValue(int value) {
-        for (Asn1EnumType e : values()) {
+        for (EnumType e : values()) {
             if (e.getValue() == value) {
                 return (ApOption) e;
             }

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/597995d4/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/base/CheckSumType.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/base/CheckSumType.java
b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/base/CheckSumType.java
index d52093e..1758f1a 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/base/CheckSumType.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/base/CheckSumType.java
@@ -19,9 +19,9 @@
  */
 package org.apache.kerby.kerberos.kerb.type.base;
 
-import org.apache.kerby.asn1.type.Asn1EnumType;
+import org.apache.kerby.asn1.EnumType;
 
-public enum CheckSumType implements Asn1EnumType {
+public enum CheckSumType implements EnumType {
     NONE(0, "none", "None checksum type"),
 
     CRC32(0x0001, "crc32", "CRC-32"),
@@ -80,7 +80,7 @@ public enum CheckSumType implements Asn1EnumType {
 
     public static CheckSumType fromValue(Integer value) {
         if (value != null) {
-            for (Asn1EnumType e : values()) {
+            for (EnumType e : values()) {
                 if (e.getValue() == value) {
                     return (CheckSumType) e;
                 }

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/597995d4/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/base/EncryptionType.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/base/EncryptionType.java
b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/base/EncryptionType.java
index 0154d55..29c4c23 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/base/EncryptionType.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/base/EncryptionType.java
@@ -19,12 +19,12 @@
  */
 package org.apache.kerby.kerberos.kerb.type.base;
 
-import org.apache.kerby.asn1.type.Asn1EnumType;
+import org.apache.kerby.asn1.EnumType;
 
 /**
  * According to krb5.hin
  */
-public enum EncryptionType implements Asn1EnumType {
+public enum EncryptionType implements EnumType {
 
     NONE(0, "none", "None encryption type"),
 
@@ -118,7 +118,7 @@ public enum EncryptionType implements Asn1EnumType {
 
     public static EncryptionType fromValue(Integer value) {
         if (value != null) {
-            for (Asn1EnumType e : values()) {
+            for (EnumType e : values()) {
                 if (e.getValue() == value) {
                     return (EncryptionType) e;
                 }

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/597995d4/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/base/HostAddrType.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/base/HostAddrType.java
b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/base/HostAddrType.java
index b148bf6..37eb44f 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/base/HostAddrType.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/base/HostAddrType.java
@@ -19,9 +19,9 @@
  */
 package org.apache.kerby.kerberos.kerb.type.base;
 
-import org.apache.kerby.asn1.type.Asn1EnumType;
+import org.apache.kerby.asn1.EnumType;
 
-public enum HostAddrType implements Asn1EnumType {
+public enum HostAddrType implements EnumType {
     /**
      * Constant for the "null" host address type.
      */
@@ -88,7 +88,7 @@ public enum HostAddrType implements Asn1EnumType {
 
     public static HostAddrType fromValue(Integer value) {
         if (value != null) {
-            for (Asn1EnumType e : values()) {
+            for (EnumType e : values()) {
                 if (e.getValue() == value.intValue()) {
                     return (HostAddrType) e;
                 }

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/597995d4/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/base/KeyUsage.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/base/KeyUsage.java
b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/base/KeyUsage.java
index 055977c..22ea613 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/base/KeyUsage.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/base/KeyUsage.java
@@ -19,12 +19,12 @@
  */
 package org.apache.kerby.kerberos.kerb.type.base;
 
-import org.apache.kerby.asn1.type.Asn1EnumType;
+import org.apache.kerby.asn1.EnumType;
 
 /**
  * From krb5.hin
  */
-public enum KeyUsage implements Asn1EnumType {
+public enum KeyUsage implements EnumType {
     UNKNOWN(-1),
     NONE(0),
     //AS-REQ PA-ENC-TIMESTAMP padata timestamp, encrypted with the client key
@@ -114,7 +114,7 @@ public enum KeyUsage implements Asn1EnumType {
 
     public static KeyUsage fromValue(Integer value) {
         if (value != null) {
-            for (Asn1EnumType e : values()) {
+            for (EnumType e : values()) {
                 if (e.getValue() == value) {
                     return (KeyUsage) e;
                 }

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/597995d4/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/base/KrbMessageType.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/base/KrbMessageType.java
b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/base/KrbMessageType.java
index d483838..cf3d130 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/base/KrbMessageType.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/base/KrbMessageType.java
@@ -19,9 +19,9 @@
  */
 package org.apache.kerby.kerberos.kerb.type.base;
 
-import org.apache.kerby.asn1.type.Asn1EnumType;
+import org.apache.kerby.asn1.EnumType;
 
-public enum KrbMessageType implements Asn1EnumType {
+public enum KrbMessageType implements EnumType {
     NONE(-1),
     AS_REQ(10),
     AS_REP(11),
@@ -47,7 +47,7 @@ public enum KrbMessageType implements Asn1EnumType {
 
     public static KrbMessageType fromValue(Integer value) {
         if (value != null) {
-            for (Asn1EnumType e : values()) {
+            for (EnumType e : values()) {
                 if (e.getValue() == value.intValue()) {
                     return (KrbMessageType) e;
                 }

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/597995d4/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/base/LastReqType.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/base/LastReqType.java
b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/base/LastReqType.java
index 0353750..c766d27 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/base/LastReqType.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/base/LastReqType.java
@@ -19,9 +19,9 @@
  */
 package org.apache.kerby.kerberos.kerb.type.base;
 
-import org.apache.kerby.asn1.type.Asn1EnumType;
+import org.apache.kerby.asn1.EnumType;
 
-public enum LastReqType implements Asn1EnumType {
+public enum LastReqType implements EnumType {
     NONE(0),
     ALL_LAST_TGT(1),
     THE_LAST_TGT(-1),
@@ -51,7 +51,7 @@ public enum LastReqType implements Asn1EnumType {
 
     public static LastReqType fromValue(Integer value) {
         if (value != null) {
-            for (Asn1EnumType e : values()) {
+            for (EnumType e : values()) {
                 if (e.getValue() == value) {
                     return (LastReqType) e;
                 }

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/597995d4/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/base/NameType.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/base/NameType.java
b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/base/NameType.java
index d85b786..3cbddfe 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/base/NameType.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/base/NameType.java
@@ -19,9 +19,9 @@
  */
 package org.apache.kerby.kerberos.kerb.type.base;
 
-import org.apache.kerby.asn1.type.Asn1EnumType;
+import org.apache.kerby.asn1.EnumType;
 
-public enum NameType implements Asn1EnumType {
+public enum NameType implements EnumType {
     NT_UNKNOWN(0),
     NT_PRINCIPAL(1),
     NT_SRV_INST(2),
@@ -42,7 +42,7 @@ public enum NameType implements Asn1EnumType {
 
     public static NameType fromValue(Integer value) {
         if (value != null) {
-            for (Asn1EnumType e : values()) {
+            for (EnumType e : values()) {
                 if (e.getValue() == value.intValue()) {
                     return (NameType) e;
                 }

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/597995d4/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/base/SamType.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/base/SamType.java
b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/base/SamType.java
index faa6e18..9f55e6d 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/base/SamType.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/base/SamType.java
@@ -19,9 +19,9 @@
  */
 package org.apache.kerby.kerberos.kerb.type.base;
 
-import org.apache.kerby.asn1.type.Asn1EnumType;
+import org.apache.kerby.asn1.EnumType;
 
-public enum SamType implements Asn1EnumType {
+public enum SamType implements EnumType {
     SAM_NONE(0),
     /** safe SAM type enum for Enigma Logic */
     SAM_TYPE_ENIGMA(1), // Enigma Logic"

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/597995d4/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/base/TokenFormat.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/base/TokenFormat.java
b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/base/TokenFormat.java
index 15781b7..b2b6e26 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/base/TokenFormat.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/base/TokenFormat.java
@@ -19,9 +19,9 @@
  */
 package org.apache.kerby.kerberos.kerb.type.base;
 
-import org.apache.kerby.asn1.type.Asn1EnumType;
+import org.apache.kerby.asn1.EnumType;
 
-public enum TokenFormat implements Asn1EnumType {
+public enum TokenFormat implements EnumType {
     NONE                (0),
     JWT                 (1);
 
@@ -38,7 +38,7 @@ public enum TokenFormat implements Asn1EnumType {
 
     public static TokenFormat fromValue(Integer value) {
         if (value != null) {
-            for (Asn1EnumType e : values()) {
+            for (EnumType e : values()) {
                 if (e.getValue() == value.intValue()) {
                     return (TokenFormat) e;
                 }

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/597995d4/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/base/TransitedEncodingType.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/base/TransitedEncodingType.java
b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/base/TransitedEncodingType.java
index 744b643..262ac8c 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/base/TransitedEncodingType.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/base/TransitedEncodingType.java
@@ -19,9 +19,9 @@
  */
 package org.apache.kerby.kerberos.kerb.type.base;
 
-import org.apache.kerby.asn1.type.Asn1EnumType;
+import org.apache.kerby.asn1.EnumType;
 
-public enum TransitedEncodingType implements Asn1EnumType {
+public enum TransitedEncodingType implements EnumType {
     UNKNOWN(-1),
     NULL(0),
     DOMAIN_X500_COMPRESS(1);
@@ -39,7 +39,7 @@ public enum TransitedEncodingType implements Asn1EnumType {
 
     public static TransitedEncodingType fromValue(Integer value) {
         if (value != null) {
-            for (Asn1EnumType e : values()) {
+            for (EnumType e : values()) {
                 if (e.getValue() == value.intValue()) {
                     return (TransitedEncodingType) e;
                 }

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/597995d4/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/fast/ArmorType.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/fast/ArmorType.java
b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/fast/ArmorType.java
index 3331088..b6dd972 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/fast/ArmorType.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/fast/ArmorType.java
@@ -19,9 +19,9 @@
  */
 package org.apache.kerby.kerberos.kerb.type.fast;
 
-import org.apache.kerby.asn1.type.Asn1EnumType;
+import org.apache.kerby.asn1.EnumType;
 
-public enum ArmorType implements Asn1EnumType {
+public enum ArmorType implements EnumType {
     NONE                (0),
     ARMOR_AP_REQUEST              (1);
 
@@ -38,7 +38,7 @@ public enum ArmorType implements Asn1EnumType {
 
     public static ArmorType fromValue(Integer value) {
         if (value != null) {
-            for (Asn1EnumType e : values()) {
+            for (EnumType e : values()) {
                 if (e.getValue() == value.intValue()) {
                     return (ArmorType) e;
                 }

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/597995d4/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/fast/FastOption.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/fast/FastOption.java
b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/fast/FastOption.java
index dc46d83..f97f0ae 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/fast/FastOption.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/fast/FastOption.java
@@ -19,9 +19,9 @@
  */
 package org.apache.kerby.kerberos.kerb.type.fast;
 
-import org.apache.kerby.asn1.type.Asn1EnumType;
+import org.apache.kerby.asn1.EnumType;
 
-public enum FastOption implements Asn1EnumType {
+public enum FastOption implements EnumType {
     NONE(-1),
     RESERVED(0),
     HIDE_CLIENT_NAMES(1),
@@ -40,7 +40,7 @@ public enum FastOption implements Asn1EnumType {
     }
 
     public static FastOption fromValue(int value) {
-        for (Asn1EnumType e : values()) {
+        for (EnumType e : values()) {
             if (e.getValue() == value) {
                 return (FastOption) e;
             }

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/597995d4/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/kdc/KdcOption.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/kdc/KdcOption.java
b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/kdc/KdcOption.java
index ef6261d..3a5edc6 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/kdc/KdcOption.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/kdc/KdcOption.java
@@ -19,9 +19,9 @@
  */
 package org.apache.kerby.kerberos.kerb.type.kdc;
 
-import org.apache.kerby.asn1.type.Asn1EnumType;
+import org.apache.kerby.asn1.EnumType;
 
-public enum KdcOption implements Asn1EnumType {
+public enum KdcOption implements EnumType {
     NONE(-1),
     //RESERVED(0x80000000),
     FORWARDABLE(0x40000000),
@@ -68,7 +68,7 @@ public enum KdcOption implements Asn1EnumType {
     }
 
     public static KdcOption fromValue(int value) {
-        for (Asn1EnumType e : values()) {
+        for (EnumType e : values()) {
             if (e.getValue() == value) {
                 return (KdcOption) e;
             }

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/597995d4/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/pa/PaDataType.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/pa/PaDataType.java
b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/pa/PaDataType.java
index da3807e..44cb2c5 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/pa/PaDataType.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/pa/PaDataType.java
@@ -19,12 +19,12 @@
  */
 package org.apache.kerby.kerberos.kerb.type.pa;
 
-import org.apache.kerby.asn1.type.Asn1EnumType;
+import org.apache.kerby.asn1.EnumType;
 
 /**
  * From krb5.h
  */
-public enum PaDataType implements Asn1EnumType {
+public enum PaDataType implements EnumType {
     NONE                (0),
     TGS_REQ              (1),
     AP_REQ              (1),
@@ -80,7 +80,7 @@ public enum PaDataType implements Asn1EnumType {
 
     public static PaDataType fromValue(Integer value) {
         if (value != null) {
-            for (Asn1EnumType e : values()) {
+            for (EnumType e : values()) {
                 if (e.getValue() == value.intValue()) {
                     return (PaDataType) e;
                 }

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/597995d4/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/pa/token/TokenFlag.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/pa/token/TokenFlag.java
b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/pa/token/TokenFlag.java
index 037d7eb..12d8ea6 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/pa/token/TokenFlag.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/pa/token/TokenFlag.java
@@ -19,9 +19,9 @@
  */
 package org.apache.kerby.kerberos.kerb.type.pa.token;
 
-import org.apache.kerby.asn1.type.Asn1EnumType;
+import org.apache.kerby.asn1.EnumType;
 
-public enum TokenFlag implements Asn1EnumType {
+public enum TokenFlag implements EnumType {
     NONE(-1),
     ID_TOKEN_REQUIRED(0x40000000),
     AC_TOKEN_REQUIRED(0x20000000),
@@ -40,7 +40,7 @@ public enum TokenFlag implements Asn1EnumType {
     }
 
     public static TokenFlag fromValue(int value) {
-        for (Asn1EnumType e : values()) {
+        for (EnumType e : values()) {
             if (e.getValue() == value) {
                 return (TokenFlag) e;
             }

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/597995d4/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/ticket/TicketFlag.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/ticket/TicketFlag.java
b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/ticket/TicketFlag.java
index e2e99a8..48dd355 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/ticket/TicketFlag.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/ticket/TicketFlag.java
@@ -19,9 +19,9 @@
  */
 package org.apache.kerby.kerberos.kerb.type.ticket;
 
-import org.apache.kerby.asn1.type.Asn1EnumType;
+import org.apache.kerby.asn1.EnumType;
 
-public enum TicketFlag implements Asn1EnumType {
+public enum TicketFlag implements EnumType {
     NONE(-1),
     FORWARDABLE(0x40000000),
     FORWARDED(0x20000000),
@@ -51,7 +51,7 @@ public enum TicketFlag implements Asn1EnumType {
     }
 
     public static TicketFlag fromValue(int value) {
-        for (Asn1EnumType e : values()) {
+        for (EnumType e : values()) {
             if (e.getValue() == value) {
                 return (TicketFlag) e;
             }

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/597995d4/kerby-pkix/src/main/java/org/apache/kerby/cms/type/CmsVersion.java
----------------------------------------------------------------------
diff --git a/kerby-pkix/src/main/java/org/apache/kerby/cms/type/CmsVersion.java b/kerby-pkix/src/main/java/org/apache/kerby/cms/type/CmsVersion.java
index bde3992..9f120ad 100644
--- a/kerby-pkix/src/main/java/org/apache/kerby/cms/type/CmsVersion.java
+++ b/kerby-pkix/src/main/java/org/apache/kerby/cms/type/CmsVersion.java
@@ -19,7 +19,7 @@
  */
 package org.apache.kerby.cms.type;
 
-import org.apache.kerby.asn1.type.Asn1EnumType;
+import org.apache.kerby.asn1.EnumType;
 import org.apache.kerby.asn1.type.Asn1Integer;
 
 /**
@@ -27,7 +27,7 @@ import org.apache.kerby.asn1.type.Asn1Integer;
  * { v0(0), v1(1), v2(2), v3(3), v4(4), v5(5) }
  */
 
-enum CmsVersionEnum implements Asn1EnumType {
+enum CmsVersionEnum implements EnumType {
     V0,
     V1,
     V2,

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/597995d4/kerby-pkix/src/main/java/org/apache/kerby/x509/type/CRLReason.java
----------------------------------------------------------------------
diff --git a/kerby-pkix/src/main/java/org/apache/kerby/x509/type/CRLReason.java b/kerby-pkix/src/main/java/org/apache/kerby/x509/type/CRLReason.java
index 1596b8a..02558cb 100644
--- a/kerby-pkix/src/main/java/org/apache/kerby/x509/type/CRLReason.java
+++ b/kerby-pkix/src/main/java/org/apache/kerby/x509/type/CRLReason.java
@@ -19,7 +19,7 @@
  */
 package org.apache.kerby.x509.type;
 
-import org.apache.kerby.asn1.type.Asn1EnumType;
+import org.apache.kerby.asn1.EnumType;
 import org.apache.kerby.asn1.type.Asn1Enumerated;
 
 /**
@@ -40,7 +40,7 @@ import org.apache.kerby.asn1.type.Asn1Enumerated;
  * </pre>
  */
 
-enum CRLReasonEnum implements Asn1EnumType {
+enum CRLReasonEnum implements EnumType {
     UNSPECIFIED,
     KEY_COMPROMISE,
     CA_COMPROMISE,
@@ -60,7 +60,7 @@ enum CRLReasonEnum implements Asn1EnumType {
 
 public class CRLReason extends Asn1Enumerated<CRLReasonEnum> {
     @Override
-    public Asn1EnumType[] getAllEnumValues() {
+    public EnumType[] getAllEnumValues() {
         return CRLReasonEnum.values();
     }
 }

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/597995d4/kerby-pkix/src/main/java/org/apache/kerby/x509/type/DigestedObjectType.java
----------------------------------------------------------------------
diff --git a/kerby-pkix/src/main/java/org/apache/kerby/x509/type/DigestedObjectType.java b/kerby-pkix/src/main/java/org/apache/kerby/x509/type/DigestedObjectType.java
index e67c503..c233133 100644
--- a/kerby-pkix/src/main/java/org/apache/kerby/x509/type/DigestedObjectType.java
+++ b/kerby-pkix/src/main/java/org/apache/kerby/x509/type/DigestedObjectType.java
@@ -19,7 +19,7 @@
  */
 package org.apache.kerby.x509.type;
 
-import org.apache.kerby.asn1.type.Asn1EnumType;
+import org.apache.kerby.asn1.EnumType;
 import org.apache.kerby.asn1.type.Asn1Enumerated;
 
 /**
@@ -34,7 +34,7 @@ import org.apache.kerby.asn1.type.Asn1Enumerated;
  * </pre>
  * 
  */
-enum DigestedObjectEnum implements Asn1EnumType {
+enum DigestedObjectEnum implements EnumType {
     PUBLIC_KEY,
     PUBLIC_KEY_CERT,
     OTHER_OBJECT_TYPES;
@@ -47,7 +47,7 @@ enum DigestedObjectEnum implements Asn1EnumType {
 
 public class DigestedObjectType extends Asn1Enumerated<DigestedObjectEnum> {
     @Override
-    public Asn1EnumType[] getAllEnumValues() {
+    public EnumType[] getAllEnumValues() {
         return DigestedObjectEnum.values();
     }
 }

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/597995d4/kerby-pkix/src/main/java/org/apache/kerby/x509/type/KeyUsage.java
----------------------------------------------------------------------
diff --git a/kerby-pkix/src/main/java/org/apache/kerby/x509/type/KeyUsage.java b/kerby-pkix/src/main/java/org/apache/kerby/x509/type/KeyUsage.java
index bbded47..e7dbb06 100644
--- a/kerby-pkix/src/main/java/org/apache/kerby/x509/type/KeyUsage.java
+++ b/kerby-pkix/src/main/java/org/apache/kerby/x509/type/KeyUsage.java
@@ -19,7 +19,7 @@
  */
 package org.apache.kerby.x509.type;
 
-import org.apache.kerby.asn1.type.Asn1EnumType;
+import org.apache.kerby.asn1.EnumType;
 import org.apache.kerby.asn1.type.Asn1Flags;
 
 /**
@@ -40,7 +40,7 @@ import org.apache.kerby.asn1.type.Asn1Flags;
  * </pre>
  */
 
-enum KeyUsageEnum implements Asn1EnumType {
+enum KeyUsageEnum implements EnumType {
     DIGITAL_SIGNATURE,
     NON_REPUDIATION,
     KEY_ENCIPHERMENT,

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/597995d4/kerby-pkix/src/main/java/org/apache/kerby/x509/type/ReasonFlags.java
----------------------------------------------------------------------
diff --git a/kerby-pkix/src/main/java/org/apache/kerby/x509/type/ReasonFlags.java b/kerby-pkix/src/main/java/org/apache/kerby/x509/type/ReasonFlags.java
index c397f08..d81798f 100644
--- a/kerby-pkix/src/main/java/org/apache/kerby/x509/type/ReasonFlags.java
+++ b/kerby-pkix/src/main/java/org/apache/kerby/x509/type/ReasonFlags.java
@@ -19,7 +19,7 @@
  */
 package org.apache.kerby.x509.type;
 
-import org.apache.kerby.asn1.type.Asn1EnumType;
+import org.apache.kerby.asn1.EnumType;
 import org.apache.kerby.asn1.type.Asn1Flags;
 
 /**
@@ -39,7 +39,7 @@ import org.apache.kerby.asn1.type.Asn1Flags;
  * </pre>
  */
 
-enum ReasonFlagsEnum implements Asn1EnumType {
+enum ReasonFlagsEnum implements EnumType {
     UNUSED,
     KEY_COMPROMISE,
     CA_COMPROMISE,


Mime
View raw message