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 2018/03/21 02:49:56 UTC

directory-kerby git commit: DIRKRB-704 Refresh constants related to standards. Contributed by Gerard Gagliano.

Repository: directory-kerby
Updated Branches:
  refs/heads/trunk 728c9bf6c -> adeba9422


DIRKRB-704 Refresh constants related to standards. Contributed by Gerard Gagliano.


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

Branch: refs/heads/trunk
Commit: adeba94228287467d48dbf2a517c32f3ded194ff
Parents: 728c9bf
Author: plusplusjiajia <ji...@intel.com>
Authored: Wed Mar 21 10:47:06 2018 +0800
Committer: plusplusjiajia <ji...@intel.com>
Committed: Wed Mar 21 10:47:06 2018 +0800

----------------------------------------------------------------------
 .../kerby/kerberos/kerb/KrbErrorCode.java       |  3 ++-
 .../kerb/type/ad/ADAuthenticationIndicator.java |  2 +-
 .../kerb/type/ad/AuthorizationType.java         | 25 ++++++++++----------
 3 files changed, 16 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/adeba942/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 30ddc0b..24c031b 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
@@ -95,7 +95,8 @@ public enum KrbErrorCode implements EnumType {
     KDC_ERR_PA_CHECKSUM_MUST_BE_INCLUDED(79, "PA checksum must be included"),
     KDC_ERR_DIGEST_IN_SIGNED_DATA_NOT_ACCEPTED(80, "Digest in signed data not accepted"),
     KDC_ERR_PUBLIC_KEY_ENCRYPTION_NOT_SUPPORTED(81, "Public key encryption not supported"),
-    TOKEN_PREAUTH_NOT_ALLOWED(82, "Token preauth is not allowed"),
+    KRB_AP_ERR_PRINCIPAL_UNKNOWN(82, "A well-known Kerberos principal name is used but not supported"),
+    TOKEN_PREAUTH_NOT_ALLOWED(83, "Token preauth is not allowed"),
 
     KRB_TIMEOUT(5000, "Network timeout"),
     UNKNOWN_ERR(5001, "Unknown error");

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/adeba942/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/ad/ADAuthenticationIndicator.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/ad/ADAuthenticationIndicator.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/ad/ADAuthenticationIndicator.java
index 5dbcace..1fb33db 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/ad/ADAuthenticationIndicator.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/ad/ADAuthenticationIndicator.java
@@ -39,7 +39,7 @@ public class ADAuthenticationIndicator extends AuthorizationDataEntry {
     }
 
     public ADAuthenticationIndicator() {
-        super(AuthorizationType.AD_AUTHENTICAION_INDICATOR);
+        super(AuthorizationType.AD_AUTHENTICATION_INDICATOR);
         myAuthIndicator = new AuthIndicator();
         myAuthIndicator.outerEncodeable = this;
     }

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/adeba942/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 80fa207..14ed250 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
@@ -281,6 +281,16 @@ public enum AuthorizationType implements EnumType {
      * RFC 7751 for details.
      */
     AD_CAMMAC(96),
+    
+    /**
+     * Constant for the "Authentication-Indicator" authorization type.
+     *
+     * RFC 6711 An IANA Registry for Level of Assurance (LoA) Profiles provides
+     * the syntax and semantics of LoA profiles.
+     *
+     * RFC-8129 "Authentication Indicator in Kerberos Tickets" for details.
+     */
+    AD_AUTHENTICATION_INDICATOR(97),
 
     /**
      * Constant for the "Windows 2K Privilege Attribute Certificate (PAC)"
@@ -300,21 +310,12 @@ public enum AuthorizationType implements EnumType {
     AD_ETYPE_NEGOTIATION(129),
 
     /**
-     * Constant for the Authorization Data Type. Note that this is not a standard Type as of yet.
+     * Constant for the Authorization Data Type. Note that this is not a
+     * standard Type as of yet.
      *
      * See the draft spec "Token Pre-Authentication for Kerberos".
      */
-    AD_TOKEN(256),
-
-    /**
-     * Constant for the "Authentication-Indicator" authorization type.
-     *
-     * RFC 6711 An IANA Registry for Level of Assurance (LoA) Profiles provides
-     * the syntax and semantics of LoA profiles.
-     *
-     * See: Internet draft "draft-jain-kitten-krb-auth-indicator-01"
-     */
-    AD_AUTHENTICAION_INDICATOR(-1); // Not yet assigned an IANA registry number.
+    AD_TOKEN(256);
 
     /** The internal value */
     private final int value;