You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by pl...@apache.org on 2016/02/15 03:42:39 UTC
[15/36] directory-kerby git commit: Clear some pkinit codes.
Clear some pkinit codes.
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/5ccad97a
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/5ccad97a
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/5ccad97a
Branch: refs/heads/kadmin-remote
Commit: 5ccad97a348429ce425631020dff23e6188d2c96
Parents: 70116da
Author: plusplusjiajia <ji...@intel.com>
Authored: Mon Jan 25 14:07:14 2016 +0800
Committer: plusplusjiajia <ji...@intel.com>
Committed: Mon Jan 25 14:07:14 2016 +0800
----------------------------------------------------------------------
.../kerberos/kerb/client/preauth/pkinit/PkinitContext.java | 3 +++
.../kerby/kerberos/kerb/preauth/pkinit/CmsMessageType.java | 3 +++
.../apache/kerby/kerberos/kerb/preauth/pkinit/IdentityOpts.java | 4 +++-
.../apache/kerby/kerberos/kerb/preauth/pkinit/PkinitCrypto.java | 3 +++
.../kerberos/kerb/preauth/pkinit/PkinitPlgCryptoContext.java | 3 +++
.../apache/kerby/kerberos/kerb/preauth/pkinit/PluginOpts.java | 5 +++--
6 files changed, 18 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/5ccad97a/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/preauth/pkinit/PkinitContext.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/preauth/pkinit/PkinitContext.java b/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/preauth/pkinit/PkinitContext.java
index 8670b8c..43792db 100644
--- a/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/preauth/pkinit/PkinitContext.java
+++ b/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/preauth/pkinit/PkinitContext.java
@@ -23,6 +23,9 @@ import org.apache.kerby.kerberos.kerb.preauth.pkinit.IdentityOpts;
import org.apache.kerby.kerberos.kerb.preauth.pkinit.PkinitPlgCryptoContext;
import org.apache.kerby.kerberos.kerb.preauth.pkinit.PluginOpts;
+/*
+ * Ref. _pkinit_context in MIT krb5 project.
+ */
public class PkinitContext {
public PkinitPlgCryptoContext cryptoctx = new PkinitPlgCryptoContext();
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/5ccad97a/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
index 7aa2b9f..9b26c55 100644
--- 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
@@ -19,6 +19,9 @@
*/
package org.apache.kerby.kerberos.kerb.preauth.pkinit;
+/*
+ * Ref. cms_msg_types in MIT krb5 project.
+ */
public enum CmsMessageType {
UNKNOWN (-1),
CMS_SIGN_CLIENT (0x01),
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/5ccad97a/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/preauth/pkinit/IdentityOpts.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/preauth/pkinit/IdentityOpts.java b/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/preauth/pkinit/IdentityOpts.java
index bba6ebe..a4c573e 100644
--- a/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/preauth/pkinit/IdentityOpts.java
+++ b/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/preauth/pkinit/IdentityOpts.java
@@ -22,9 +22,11 @@ package org.apache.kerby.kerberos.kerb.preauth.pkinit;
import java.util.ArrayList;
import java.util.List;
+/*
+ * Ref. MIT Krb5 _pkinit_identity_opts MIT krb5 project.
+ */
public class IdentityOpts {
- // From MIT Krb5 _pkinit_identity_opts
public String identity;
public List<String> altIdentities = new ArrayList<String>(1);
public List<String> anchors = new ArrayList<String>(4);
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/5ccad97a/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/preauth/pkinit/PkinitCrypto.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/preauth/pkinit/PkinitCrypto.java b/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/preauth/pkinit/PkinitCrypto.java
index f86c469..2a1d05e 100644
--- a/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/preauth/pkinit/PkinitCrypto.java
+++ b/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/preauth/pkinit/PkinitCrypto.java
@@ -55,6 +55,9 @@ import java.security.spec.InvalidKeySpecException;
import java.util.ArrayList;
import java.util.List;
+/**
+ * Ref. pkinit_crypto_openssl.c in MIT krb5 project.
+ */
public class PkinitCrypto {
private static final Logger LOG = LoggerFactory.getLogger(PkinitCrypto.class);
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/5ccad97a/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/preauth/pkinit/PkinitPlgCryptoContext.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/preauth/pkinit/PkinitPlgCryptoContext.java b/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/preauth/pkinit/PkinitPlgCryptoContext.java
index 6732b7d..03b8f60 100644
--- a/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/preauth/pkinit/PkinitPlgCryptoContext.java
+++ b/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/preauth/pkinit/PkinitPlgCryptoContext.java
@@ -24,6 +24,9 @@ import javax.crypto.spec.DHParameterSpec;
import java.math.BigInteger;
import java.security.cert.X509Certificate;
+/*
+ * Ref. _pkinit_plg_crypto_context in
+ */
public class PkinitPlgCryptoContext {
private static final String ID_PKINIT_AUTHDATA = "1.3.6.1.5.2.3.1";
private static final String ID_PKINIT_DHKEYDATA = "1.3.6.1.5.2.3.2";
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/5ccad97a/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/preauth/pkinit/PluginOpts.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/preauth/pkinit/PluginOpts.java b/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/preauth/pkinit/PluginOpts.java
index 96bb23f..458e2c4 100644
--- a/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/preauth/pkinit/PluginOpts.java
+++ b/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/preauth/pkinit/PluginOpts.java
@@ -25,10 +25,11 @@ import org.apache.kerby.kerberos.kerb.type.pa.pkinit.AlgorithmIdentifiers;
import org.apache.kerby.kerberos.kerb.type.pa.pkinit.TrustedCertifiers;
import org.apache.kerby.x509.type.AlgorithmIdentifier;
+/*
+ *Ref. MIT Krb5 _pkinit_plg_opts
+ */
public class PluginOpts {
- // From MIT Krb5 _pkinit_plg_opts
-
// require EKU checking (default is true)
public boolean requireEku = true;
// accept secondary EKU (default is false)