summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Hudson <ghudson@mit.edu>2013-10-09 13:37:17 -0400
committerGreg Hudson <ghudson@mit.edu>2013-10-14 23:44:25 -0400
commit2938851a5ec77ab68bcd1f5cfd07991c7ccabea6 (patch)
treecb921ec8fac373184ebfd842deefc369f9da0f08
parent48dd01f29b893a958a64dcf6eb0b734e8463425b (diff)
downloadkrb5-2938851a5ec77ab68bcd1f5cfd07991c7ccabea6.tar.gz
krb5-2938851a5ec77ab68bcd1f5cfd07991c7ccabea6.tar.xz
krb5-2938851a5ec77ab68bcd1f5cfd07991c7ccabea6.zip
Change KRB5KDC_ERR_NO_ACCEPTABLE_KDF to 100
draft-ietf-krb-wg-pkinit-alg-agility-07 specifies KDC_ERR_NO_ACCEPTABLE_KDF as 82, but this value conflicts with KRB_AP_ERR_PRINCIPAL_UNKNOWN from RFC 6111. The former value has been reassigned to 100 to fix the conflict. Use the correct value. We believe that this error won't crop up in practice for a long time (when SHA-2 has been superceded by other hash algorithms and people are desupporting it), by which time implementations will mostly have been upgraded to use the new value. ticket: 7715 (new) target_version: 1.12
-rw-r--r--src/lib/krb5/error_tables/krb5_err.et4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/krb5/error_tables/krb5_err.et b/src/lib/krb5/error_tables/krb5_err.et
index eda7dc307..5c6f10b23 100644
--- a/src/lib/krb5/error_tables/krb5_err.et
+++ b/src/lib/krb5/error_tables/krb5_err.et
@@ -123,7 +123,7 @@ error_code KRB5KDC_ERR_DIGEST_IN_CERT_NOT_ACCEPTED, "Digest in certificate not a
error_code KRB5KDC_ERR_PA_CHECKSUM_MUST_BE_INCLUDED, "Checksum must be included"
error_code KRB5KDC_ERR_DIGEST_IN_SIGNED_DATA_NOT_ACCEPTED, "Digest in signed-data not accepted"
error_code KRB5KDC_ERR_PUBLIC_KEY_ENCRYPTION_NOT_SUPPORTED, "Public key encryption not supported"
-error_code KRB5KDC_ERR_NO_ACCEPTABLE_KDF, "No acceptable KDF offered"
+error_code KRB5PLACEHOLD_82, "KRB5 error code 82"
error_code KRB5PLACEHOLD_83, "KRB5 error code 83"
error_code KRB5PLACEHOLD_84, "KRB5 error code 84"
error_code KRB5KRB_AP_ERR_IAKERB_KDC_NOT_FOUND, "The IAKERB proxy could not find a KDC"
@@ -141,7 +141,7 @@ error_code KRB5PLACEHOLD_96, "KRB5 error code 96"
error_code KRB5PLACEHOLD_97, "KRB5 error code 97"
error_code KRB5PLACEHOLD_98, "KRB5 error code 98"
error_code KRB5PLACEHOLD_99, "KRB5 error code 99"
-error_code KRB5PLACEHOLD_100, "KRB5 error code 100"
+error_code KRB5KDC_ERR_NO_ACCEPTABLE_KDF, "No acceptable KDF offered"
error_code KRB5PLACEHOLD_101, "KRB5 error code 101"
error_code KRB5PLACEHOLD_102, "KRB5 error code 102"
error_code KRB5PLACEHOLD_103, "KRB5 error code 103"