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: Fixed building issues found on Linux platform caused by renaming in only letter case
Date Mon, 28 Dec 2015 00:54:10 GMT
Repository: directory-kerby
Updated Branches:
  refs/heads/master 8e2febd1a -> 46f63edc8


Fixed building issues found on Linux platform caused by renaming in only letter case


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

Branch: refs/heads/master
Commit: 46f63edc8f8864a2507d69160bc98d5c3552d539
Parents: 8e2febd
Author: Drankye <drankye@gmail.com>
Authored: Tue Dec 29 08:54:00 2015 +0800
Committer: Drankye <drankye@gmail.com>
Committed: Tue Dec 29 08:54:00 2015 +0800

----------------------------------------------------------------------
 .../kerb/preauth/pkinit/CMSMessageType.java     | 59 -------------
 .../kerb/preauth/pkinit/CmsMessageType.java     | 59 +++++++++++++
 .../kerberos/kerb/type/pa/pkinit/DHNonce.java   | 28 -------
 .../kerberos/kerb/type/pa/pkinit/DHRepInfo.java | 87 --------------------
 .../kerberos/kerb/type/pa/pkinit/DhNonce.java   | 28 +++++++
 .../kerberos/kerb/type/pa/pkinit/DhRepInfo.java | 87 ++++++++++++++++++++
 .../kerb/type/pa/pkinit/KDFAlgorithmId.java     | 64 --------------
 .../kerb/type/pa/pkinit/KdcDHKeyInfo.java       | 87 --------------------
 .../kerb/type/pa/pkinit/KdcDhKeyInfo.java       | 87 ++++++++++++++++++++
 .../kerb/type/pa/pkinit/KdfAlgorithmId.java     | 64 ++++++++++++++
 .../kerb/type/pa/pkinit/SupportedKDFs.java      | 25 ------
 .../kerb/type/pa/pkinit/SupportedKdfs.java      | 25 ++++++
 .../org/apache/kerby/x509/type/DHParameter.java | 65 ---------------
 .../org/apache/kerby/x509/type/DhParameter.java | 65 +++++++++++++++
 14 files changed, 415 insertions(+), 415 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/46f63edc/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/preauth/pkinit/CMSMessageType.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/preauth/pkinit/CMSMessageType.java
b/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/preauth/pkinit/CMSMessageType.java
deleted file mode 100644
index 7aa2b9f..0000000
--- a/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/preauth/pkinit/CMSMessageType.java
+++ /dev/null
@@ -1,59 +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.kerberos.kerb.preauth.pkinit;
-
-public enum CmsMessageType {
-    UNKNOWN                  (-1),
-    CMS_SIGN_CLIENT          (0x01),
-    CMS_SIGN_SERVER          (0x03),
-    CMS_ENVEL_SERVER         (0x04);
-
-
-    /** The type value */
-    private int value;
-
-    /**
-     * Create an instance of this class
-     */
-    private CmsMessageType(int value) {
-        this.value = value;
-    }
-
-    /**
-     * @return The associated type value
-     */
-    public int getValue() {
-        return value;
-    }
-
-    /**
-     * Retrieve the UniversalTag associated with a given value
-     * @param value The integer value
-     * @return The associated UniversalTag
-     */
-    public static CmsMessageType fromValue(int value) {
-        switch (value) {
-            case 0x01 : return CMS_SIGN_CLIENT;
-            case 0x03 : return CMS_SIGN_SERVER;
-            case 0x04 : return CMS_ENVEL_SERVER;
-            default : return UNKNOWN;
-        }
-    }
-}

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/46f63edc/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/preauth/pkinit/CmsMessageType.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/preauth/pkinit/CmsMessageType.java
b/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/preauth/pkinit/CmsMessageType.java
new file mode 100644
index 0000000..7aa2b9f
--- /dev/null
+++ b/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/preauth/pkinit/CmsMessageType.java
@@ -0,0 +1,59 @@
+/**
+ *  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.kerberos.kerb.preauth.pkinit;
+
+public enum CmsMessageType {
+    UNKNOWN                  (-1),
+    CMS_SIGN_CLIENT          (0x01),
+    CMS_SIGN_SERVER          (0x03),
+    CMS_ENVEL_SERVER         (0x04);
+
+
+    /** The type value */
+    private int value;
+
+    /**
+     * Create an instance of this class
+     */
+    private CmsMessageType(int value) {
+        this.value = value;
+    }
+
+    /**
+     * @return The associated type value
+     */
+    public int getValue() {
+        return value;
+    }
+
+    /**
+     * Retrieve the UniversalTag associated with a given value
+     * @param value The integer value
+     * @return The associated UniversalTag
+     */
+    public static CmsMessageType fromValue(int value) {
+        switch (value) {
+            case 0x01 : return CMS_SIGN_CLIENT;
+            case 0x03 : return CMS_SIGN_SERVER;
+            case 0x04 : return CMS_ENVEL_SERVER;
+            default : return UNKNOWN;
+        }
+    }
+}

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/46f63edc/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/pa/pkinit/DHNonce.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/pa/pkinit/DHNonce.java
b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/pa/pkinit/DHNonce.java
deleted file mode 100644
index 9fc86c1..0000000
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/pa/pkinit/DHNonce.java
+++ /dev/null
@@ -1,28 +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.kerberos.kerb.type.pa.pkinit;
-
-import org.apache.kerby.asn1.type.Asn1OctetString;
-
-/**
- * DHNonce ::= OCTET STRING
- */
-public class DhNonce extends Asn1OctetString {
-}

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/46f63edc/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/pa/pkinit/DHRepInfo.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/pa/pkinit/DHRepInfo.java
b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/pa/pkinit/DHRepInfo.java
deleted file mode 100644
index 05855a6..0000000
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/pa/pkinit/DHRepInfo.java
+++ /dev/null
@@ -1,87 +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.kerberos.kerb.type.pa.pkinit;
-
-import org.apache.kerby.asn1.Asn1FieldInfo;
-import org.apache.kerby.asn1.EnumType;
-import org.apache.kerby.asn1.ExplicitField;
-import org.apache.kerby.asn1.ImplicitField;
-import org.apache.kerby.asn1.type.Asn1OctetString;
-import org.apache.kerby.kerberos.kerb.type.KrbSequenceType;
-
-/**
- DhRepInfo ::= SEQUENCE {
-    dhSignedData            [0] IMPLICIT OCTET STRING,
-    serverDHNonce           [1] DHNonce OPTIONAL
-    kdf                     [2] KDFAlgorithmId OPTIONAL,
-                                -- The KDF picked by the KDC.
- }
- */
-public class DhRepInfo extends KrbSequenceType {
-    protected enum DhRepInfoField implements EnumType {
-        DH_SIGNED_DATA,
-        SERVER_DH_NONCE,
-        KDF_ID;
-
-        @Override
-        public int getValue() {
-            return ordinal();
-        }
-
-        @Override
-        public String getName() {
-            return name();
-        }
-    }
-
-    static Asn1FieldInfo[] fieldInfos = new Asn1FieldInfo[] {
-            new ImplicitField(DhRepInfoField.DH_SIGNED_DATA, Asn1OctetString.class),
-            new ExplicitField(DhRepInfoField.SERVER_DH_NONCE, DhNonce.class),
-            new ExplicitField(DhRepInfoField.KDF_ID, KdfAlgorithmId.class)
-    };
-
-    public DhRepInfo() {
-        super(fieldInfos);
-    }
-
-    public byte[] getDHSignedData() {
-        return getFieldAsOctets(DhRepInfoField.DH_SIGNED_DATA);
-    }
-
-    public void setDHSignedData(byte[] dhSignedData) {
-        setFieldAsOctets(DhRepInfoField.DH_SIGNED_DATA, dhSignedData);
-    }
-
-    public DhNonce getServerDhNonce() {
-        return getFieldAs(DhRepInfoField.SERVER_DH_NONCE, DhNonce.class);
-    }
-
-    public void setServerDhNonce(DhNonce dhNonce) {
-        setFieldAs(DhRepInfoField.SERVER_DH_NONCE, dhNonce);
-    }
-
-    public KdfAlgorithmId getKdfId() {
-        return getFieldAs(DhRepInfoField.KDF_ID, KdfAlgorithmId.class);
-    }
-
-    public void setKdfId(KdfAlgorithmId kdfId) {
-        setFieldAs(DhRepInfoField.KDF_ID, kdfId);
-    }
-}

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/46f63edc/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/pa/pkinit/DhNonce.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/pa/pkinit/DhNonce.java
b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/pa/pkinit/DhNonce.java
new file mode 100644
index 0000000..9fc86c1
--- /dev/null
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/pa/pkinit/DhNonce.java
@@ -0,0 +1,28 @@
+/**
+ *  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.kerberos.kerb.type.pa.pkinit;
+
+import org.apache.kerby.asn1.type.Asn1OctetString;
+
+/**
+ * DHNonce ::= OCTET STRING
+ */
+public class DhNonce extends Asn1OctetString {
+}

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/46f63edc/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/pa/pkinit/DhRepInfo.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/pa/pkinit/DhRepInfo.java
b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/pa/pkinit/DhRepInfo.java
new file mode 100644
index 0000000..05855a6
--- /dev/null
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/pa/pkinit/DhRepInfo.java
@@ -0,0 +1,87 @@
+/**
+ *  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.kerberos.kerb.type.pa.pkinit;
+
+import org.apache.kerby.asn1.Asn1FieldInfo;
+import org.apache.kerby.asn1.EnumType;
+import org.apache.kerby.asn1.ExplicitField;
+import org.apache.kerby.asn1.ImplicitField;
+import org.apache.kerby.asn1.type.Asn1OctetString;
+import org.apache.kerby.kerberos.kerb.type.KrbSequenceType;
+
+/**
+ DhRepInfo ::= SEQUENCE {
+    dhSignedData            [0] IMPLICIT OCTET STRING,
+    serverDHNonce           [1] DHNonce OPTIONAL
+    kdf                     [2] KDFAlgorithmId OPTIONAL,
+                                -- The KDF picked by the KDC.
+ }
+ */
+public class DhRepInfo extends KrbSequenceType {
+    protected enum DhRepInfoField implements EnumType {
+        DH_SIGNED_DATA,
+        SERVER_DH_NONCE,
+        KDF_ID;
+
+        @Override
+        public int getValue() {
+            return ordinal();
+        }
+
+        @Override
+        public String getName() {
+            return name();
+        }
+    }
+
+    static Asn1FieldInfo[] fieldInfos = new Asn1FieldInfo[] {
+            new ImplicitField(DhRepInfoField.DH_SIGNED_DATA, Asn1OctetString.class),
+            new ExplicitField(DhRepInfoField.SERVER_DH_NONCE, DhNonce.class),
+            new ExplicitField(DhRepInfoField.KDF_ID, KdfAlgorithmId.class)
+    };
+
+    public DhRepInfo() {
+        super(fieldInfos);
+    }
+
+    public byte[] getDHSignedData() {
+        return getFieldAsOctets(DhRepInfoField.DH_SIGNED_DATA);
+    }
+
+    public void setDHSignedData(byte[] dhSignedData) {
+        setFieldAsOctets(DhRepInfoField.DH_SIGNED_DATA, dhSignedData);
+    }
+
+    public DhNonce getServerDhNonce() {
+        return getFieldAs(DhRepInfoField.SERVER_DH_NONCE, DhNonce.class);
+    }
+
+    public void setServerDhNonce(DhNonce dhNonce) {
+        setFieldAs(DhRepInfoField.SERVER_DH_NONCE, dhNonce);
+    }
+
+    public KdfAlgorithmId getKdfId() {
+        return getFieldAs(DhRepInfoField.KDF_ID, KdfAlgorithmId.class);
+    }
+
+    public void setKdfId(KdfAlgorithmId kdfId) {
+        setFieldAs(DhRepInfoField.KDF_ID, kdfId);
+    }
+}

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/46f63edc/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/pa/pkinit/KDFAlgorithmId.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/pa/pkinit/KDFAlgorithmId.java
b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/pa/pkinit/KDFAlgorithmId.java
deleted file mode 100644
index 4dd44ee..0000000
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/pa/pkinit/KDFAlgorithmId.java
+++ /dev/null
@@ -1,64 +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.kerberos.kerb.type.pa.pkinit;
-
-import org.apache.kerby.asn1.Asn1FieldInfo;
-import org.apache.kerby.asn1.EnumType;
-import org.apache.kerby.asn1.ExplicitField;
-import org.apache.kerby.asn1.type.Asn1ObjectIdentifier;
-import org.apache.kerby.kerberos.kerb.type.KrbSequenceType;
-
-/*
- KDFAlgorithmId ::= SEQUENCE {
-     kdf-id            [0] OBJECT IDENTIFIER,
-                       -- The object identifier of the KDF
- }
- */
-public class KdfAlgorithmId extends KrbSequenceType {
-    protected enum KdfAlgorithmIdField implements EnumType {
-        KDF_ID;
-
-        @Override
-        public int getValue() {
-            return ordinal();
-        }
-
-        @Override
-        public String getName() {
-            return name();
-        }
-    }
-
-    static Asn1FieldInfo[] fieldInfos = new Asn1FieldInfo[] {
-            new ExplicitField(KdfAlgorithmIdField.KDF_ID, Asn1ObjectIdentifier.class)
-    };
-
-    public KdfAlgorithmId() {
-        super(fieldInfos);
-    }
-
-    public String getKdfId() {
-        return getFieldAsObjId(KdfAlgorithmIdField.KDF_ID);
-    }
-
-    public void setKdfId(String kdfId) {
-        setFieldAsObjId(KdfAlgorithmIdField.KDF_ID, kdfId);
-    }
-}

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/46f63edc/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/pa/pkinit/KdcDHKeyInfo.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/pa/pkinit/KdcDHKeyInfo.java
b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/pa/pkinit/KdcDHKeyInfo.java
deleted file mode 100644
index 4ecbbcc..0000000
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/pa/pkinit/KdcDHKeyInfo.java
+++ /dev/null
@@ -1,87 +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.kerberos.kerb.type.pa.pkinit;
-
-import org.apache.kerby.asn1.Asn1FieldInfo;
-import org.apache.kerby.asn1.EnumType;
-import org.apache.kerby.asn1.ExplicitField;
-import org.apache.kerby.asn1.type.Asn1BitString;
-import org.apache.kerby.asn1.type.Asn1Integer;
-import org.apache.kerby.kerberos.kerb.type.KerberosTime;
-import org.apache.kerby.kerberos.kerb.type.KrbSequenceType;
-
-/**
- KDCDHKeyInfo ::= SEQUENCE {
-    subjectPublicKey        [0] BIT STRING,
-    nonce                   [1] INTEGER (0..4294967295),
-    dhKeyExpiration         [2] KerberosTime OPTIONAL,
- }
- */
-public class KdcDhKeyInfo extends KrbSequenceType {
-    protected enum KdcDhKeyInfoField implements EnumType {
-        SUBJECT_PUBLIC_KEY,
-        NONCE,
-        DH_KEY_EXPIRATION;
-
-        @Override
-        public int getValue() {
-            return ordinal();
-        }
-
-        @Override
-        public String getName() {
-            return name();
-        }
-    }
-
-    static Asn1FieldInfo[] fieldInfos = new Asn1FieldInfo[] {
-            new ExplicitField(KdcDhKeyInfoField.SUBJECT_PUBLIC_KEY, Asn1BitString.class),
-            new ExplicitField(KdcDhKeyInfoField.NONCE, Asn1Integer.class),
-            new ExplicitField(KdcDhKeyInfoField.DH_KEY_EXPIRATION, KerberosTime.class)
-    };
-
-    public KdcDhKeyInfo() {
-        super(fieldInfos);
-    }
-
-    public Asn1BitString getSubjectPublicKey() {
-        return getFieldAs(KdcDhKeyInfoField.SUBJECT_PUBLIC_KEY, Asn1BitString.class);
-    }
-
-    public void setSubjectPublicKey(byte[] subjectPubKey) {
-        setFieldAs(KdcDhKeyInfoField.SUBJECT_PUBLIC_KEY, new Asn1BitString(subjectPubKey));
-    }
-
-    public int getNonce() {
-        return getFieldAsInt(KdcDhKeyInfoField.NONCE);
-    }
-
-    public void setNonce(int nonce) {
-        setFieldAsInt(KdcDhKeyInfoField.NONCE, nonce);
-    }
-
-    public KerberosTime getDHKeyExpiration() {
-        return getFieldAsTime(KdcDhKeyInfoField.DH_KEY_EXPIRATION);
-    }
-
-    public void setDHKeyExpiration(KerberosTime time) {
-        setFieldAs(KdcDhKeyInfoField.DH_KEY_EXPIRATION, time);
-    }
-}

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/46f63edc/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/pa/pkinit/KdcDhKeyInfo.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/pa/pkinit/KdcDhKeyInfo.java
b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/pa/pkinit/KdcDhKeyInfo.java
new file mode 100644
index 0000000..4ecbbcc
--- /dev/null
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/pa/pkinit/KdcDhKeyInfo.java
@@ -0,0 +1,87 @@
+/**
+ *  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.kerberos.kerb.type.pa.pkinit;
+
+import org.apache.kerby.asn1.Asn1FieldInfo;
+import org.apache.kerby.asn1.EnumType;
+import org.apache.kerby.asn1.ExplicitField;
+import org.apache.kerby.asn1.type.Asn1BitString;
+import org.apache.kerby.asn1.type.Asn1Integer;
+import org.apache.kerby.kerberos.kerb.type.KerberosTime;
+import org.apache.kerby.kerberos.kerb.type.KrbSequenceType;
+
+/**
+ KDCDHKeyInfo ::= SEQUENCE {
+    subjectPublicKey        [0] BIT STRING,
+    nonce                   [1] INTEGER (0..4294967295),
+    dhKeyExpiration         [2] KerberosTime OPTIONAL,
+ }
+ */
+public class KdcDhKeyInfo extends KrbSequenceType {
+    protected enum KdcDhKeyInfoField implements EnumType {
+        SUBJECT_PUBLIC_KEY,
+        NONCE,
+        DH_KEY_EXPIRATION;
+
+        @Override
+        public int getValue() {
+            return ordinal();
+        }
+
+        @Override
+        public String getName() {
+            return name();
+        }
+    }
+
+    static Asn1FieldInfo[] fieldInfos = new Asn1FieldInfo[] {
+            new ExplicitField(KdcDhKeyInfoField.SUBJECT_PUBLIC_KEY, Asn1BitString.class),
+            new ExplicitField(KdcDhKeyInfoField.NONCE, Asn1Integer.class),
+            new ExplicitField(KdcDhKeyInfoField.DH_KEY_EXPIRATION, KerberosTime.class)
+    };
+
+    public KdcDhKeyInfo() {
+        super(fieldInfos);
+    }
+
+    public Asn1BitString getSubjectPublicKey() {
+        return getFieldAs(KdcDhKeyInfoField.SUBJECT_PUBLIC_KEY, Asn1BitString.class);
+    }
+
+    public void setSubjectPublicKey(byte[] subjectPubKey) {
+        setFieldAs(KdcDhKeyInfoField.SUBJECT_PUBLIC_KEY, new Asn1BitString(subjectPubKey));
+    }
+
+    public int getNonce() {
+        return getFieldAsInt(KdcDhKeyInfoField.NONCE);
+    }
+
+    public void setNonce(int nonce) {
+        setFieldAsInt(KdcDhKeyInfoField.NONCE, nonce);
+    }
+
+    public KerberosTime getDHKeyExpiration() {
+        return getFieldAsTime(KdcDhKeyInfoField.DH_KEY_EXPIRATION);
+    }
+
+    public void setDHKeyExpiration(KerberosTime time) {
+        setFieldAs(KdcDhKeyInfoField.DH_KEY_EXPIRATION, time);
+    }
+}

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/46f63edc/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/pa/pkinit/KdfAlgorithmId.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/pa/pkinit/KdfAlgorithmId.java
b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/pa/pkinit/KdfAlgorithmId.java
new file mode 100644
index 0000000..4dd44ee
--- /dev/null
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/pa/pkinit/KdfAlgorithmId.java
@@ -0,0 +1,64 @@
+/**
+ *  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.kerberos.kerb.type.pa.pkinit;
+
+import org.apache.kerby.asn1.Asn1FieldInfo;
+import org.apache.kerby.asn1.EnumType;
+import org.apache.kerby.asn1.ExplicitField;
+import org.apache.kerby.asn1.type.Asn1ObjectIdentifier;
+import org.apache.kerby.kerberos.kerb.type.KrbSequenceType;
+
+/*
+ KDFAlgorithmId ::= SEQUENCE {
+     kdf-id            [0] OBJECT IDENTIFIER,
+                       -- The object identifier of the KDF
+ }
+ */
+public class KdfAlgorithmId extends KrbSequenceType {
+    protected enum KdfAlgorithmIdField implements EnumType {
+        KDF_ID;
+
+        @Override
+        public int getValue() {
+            return ordinal();
+        }
+
+        @Override
+        public String getName() {
+            return name();
+        }
+    }
+
+    static Asn1FieldInfo[] fieldInfos = new Asn1FieldInfo[] {
+            new ExplicitField(KdfAlgorithmIdField.KDF_ID, Asn1ObjectIdentifier.class)
+    };
+
+    public KdfAlgorithmId() {
+        super(fieldInfos);
+    }
+
+    public String getKdfId() {
+        return getFieldAsObjId(KdfAlgorithmIdField.KDF_ID);
+    }
+
+    public void setKdfId(String kdfId) {
+        setFieldAsObjId(KdfAlgorithmIdField.KDF_ID, kdfId);
+    }
+}

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/46f63edc/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/pa/pkinit/SupportedKDFs.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/pa/pkinit/SupportedKDFs.java
b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/pa/pkinit/SupportedKDFs.java
deleted file mode 100644
index e436018..0000000
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/pa/pkinit/SupportedKDFs.java
+++ /dev/null
@@ -1,25 +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.kerberos.kerb.type.pa.pkinit;
-
-import org.apache.kerby.kerberos.kerb.type.KrbSequenceOfType;
-
-public class SupportedKdfs extends KrbSequenceOfType<KdfAlgorithmId> {
-}

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/46f63edc/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/pa/pkinit/SupportedKdfs.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/pa/pkinit/SupportedKdfs.java
b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/pa/pkinit/SupportedKdfs.java
new file mode 100644
index 0000000..e436018
--- /dev/null
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/pa/pkinit/SupportedKdfs.java
@@ -0,0 +1,25 @@
+/**
+ *  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.kerberos.kerb.type.pa.pkinit;
+
+import org.apache.kerby.kerberos.kerb.type.KrbSequenceOfType;
+
+public class SupportedKdfs extends KrbSequenceOfType<KdfAlgorithmId> {
+}

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/46f63edc/kerby-pkix/src/main/java/org/apache/kerby/x509/type/DHParameter.java
----------------------------------------------------------------------
diff --git a/kerby-pkix/src/main/java/org/apache/kerby/x509/type/DHParameter.java b/kerby-pkix/src/main/java/org/apache/kerby/x509/type/DHParameter.java
deleted file mode 100644
index af319ce..0000000
--- a/kerby-pkix/src/main/java/org/apache/kerby/x509/type/DHParameter.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package org.apache.kerby.x509.type;
-
-import org.apache.kerby.asn1.Asn1FieldInfo;
-import org.apache.kerby.asn1.EnumType;
-import org.apache.kerby.asn1.type.Asn1Integer;
-import org.apache.kerby.asn1.type.Asn1SequenceType;
-
-import java.math.BigInteger;
-
-import static org.apache.kerby.x509.type.DhParameter.MyEnum.*;
-
-public class DhParameter extends Asn1SequenceType {
-    protected enum MyEnum implements EnumType {
-        P,
-        G,
-        Q;
-
-        @Override
-        public int getValue() {
-            return ordinal();
-        }
-
-        @Override
-        public String getName() {
-            return name();
-        }
-    }
-
-    static Asn1FieldInfo[] fieldInfos = new Asn1FieldInfo[] {
-            new Asn1FieldInfo(P, Asn1Integer.class),
-            new Asn1FieldInfo(G, Asn1Integer.class),
-            new Asn1FieldInfo(Q, Asn1Integer.class),
-    };
-
-    public DhParameter() {
-        super(fieldInfos);
-    }
-
-    public void setP(BigInteger p) {
-        setFieldAsInt(P, p);
-    }
-
-    public BigInteger getP() {
-        Asn1Integer p = getFieldAs(P, Asn1Integer.class);
-        return p.getValue();
-    }
-
-    public void setG(BigInteger g) {
-        setFieldAsInt(G, g);
-    }
-
-    public BigInteger getG() {
-        Asn1Integer g = getFieldAs(G, Asn1Integer.class);
-        return g.getValue();
-    }
-
-    public void setQ(BigInteger q) {
-        setFieldAsInt(Q, q);
-    }
-
-    public BigInteger getQ() {
-        Asn1Integer q = getFieldAs(Q, Asn1Integer.class);
-        return q.getValue();
-    }
-}

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/46f63edc/kerby-pkix/src/main/java/org/apache/kerby/x509/type/DhParameter.java
----------------------------------------------------------------------
diff --git a/kerby-pkix/src/main/java/org/apache/kerby/x509/type/DhParameter.java b/kerby-pkix/src/main/java/org/apache/kerby/x509/type/DhParameter.java
new file mode 100644
index 0000000..af319ce
--- /dev/null
+++ b/kerby-pkix/src/main/java/org/apache/kerby/x509/type/DhParameter.java
@@ -0,0 +1,65 @@
+package org.apache.kerby.x509.type;
+
+import org.apache.kerby.asn1.Asn1FieldInfo;
+import org.apache.kerby.asn1.EnumType;
+import org.apache.kerby.asn1.type.Asn1Integer;
+import org.apache.kerby.asn1.type.Asn1SequenceType;
+
+import java.math.BigInteger;
+
+import static org.apache.kerby.x509.type.DhParameter.MyEnum.*;
+
+public class DhParameter extends Asn1SequenceType {
+    protected enum MyEnum implements EnumType {
+        P,
+        G,
+        Q;
+
+        @Override
+        public int getValue() {
+            return ordinal();
+        }
+
+        @Override
+        public String getName() {
+            return name();
+        }
+    }
+
+    static Asn1FieldInfo[] fieldInfos = new Asn1FieldInfo[] {
+            new Asn1FieldInfo(P, Asn1Integer.class),
+            new Asn1FieldInfo(G, Asn1Integer.class),
+            new Asn1FieldInfo(Q, Asn1Integer.class),
+    };
+
+    public DhParameter() {
+        super(fieldInfos);
+    }
+
+    public void setP(BigInteger p) {
+        setFieldAsInt(P, p);
+    }
+
+    public BigInteger getP() {
+        Asn1Integer p = getFieldAs(P, Asn1Integer.class);
+        return p.getValue();
+    }
+
+    public void setG(BigInteger g) {
+        setFieldAsInt(G, g);
+    }
+
+    public BigInteger getG() {
+        Asn1Integer g = getFieldAs(G, Asn1Integer.class);
+        return g.getValue();
+    }
+
+    public void setQ(BigInteger q) {
+        setFieldAsInt(Q, q);
+    }
+
+    public BigInteger getQ() {
+        Asn1Integer q = getFieldAs(Q, Asn1Integer.class);
+        return q.getValue();
+    }
+}


Mime
View raw message