summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTheodore Tso <tytso@mit.edu>1994-07-15 20:58:16 +0000
committerTheodore Tso <tytso@mit.edu>1994-07-15 20:58:16 +0000
commitf4076d4508fce258cdc4461a195e5204853b2bb0 (patch)
tree77000d13c490ad4cbf010fc09f62039c2277ab1c
parent16ae82ee95aaca56a5f83f8c44200968ea599429 (diff)
downloadkrb5-f4076d4508fce258cdc4461a195e5204853b2bb0.tar.gz
krb5-f4076d4508fce258cdc4461a195e5204853b2bb0.tar.xz
krb5-f4076d4508fce258cdc4461a195e5204853b2bb0.zip
Updated protocol constants in line with latest official assigned numbers
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@3981 dc483132-0cff-0310-8789-dd5450dbe970
-rw-r--r--src/include/krb5/encryption.h2
-rw-r--r--src/include/krb5/errors.h6
-rw-r--r--src/include/krb5/proto.h4
3 files changed, 8 insertions, 4 deletions
diff --git a/src/include/krb5/encryption.h b/src/include/krb5/encryption.h
index 4a1b1b4d8c..5bac63797d 100644
--- a/src/include/krb5/encryption.h
+++ b/src/include/krb5/encryption.h
@@ -127,8 +127,8 @@ typedef struct _krb5_checksum_entry {
#define CKSUMTYPE_RSA_MD4 0x0002
#define CKSUMTYPE_RSA_MD4_DES 0x0003
#define CKSUMTYPE_DESCBC 0x0004
-/* des-mac */
/* des-mac-k */
+/* rsa-md4-des-k */
#define CKSUMTYPE_RSA_MD5 0x0007
#define CKSUMTYPE_RSA_MD5_DES 0x0008
diff --git a/src/include/krb5/errors.h b/src/include/krb5/errors.h
index 9ea34e77b4..04c531b226 100644
--- a/src/include/krb5/errors.h
+++ b/src/include/krb5/errors.h
@@ -60,8 +60,10 @@
#define KDC_ERR_CLIENT_NOTYET 21 /* C not yet valid */
#define KDC_ERR_SERVICE_NOTYET 22 /* S not yet valid */
#define KDC_ERR_KEY_EXP 23 /* Password has expired */
-#define KDC_PREAUTH_FAILED 24 /* Preauthentication failed */
-#define KDC_SERVER_NOMATCH 25 /* Requested server and */
+#define KDC_ERR_PREAUTH_FAILED 24 /* Preauthentication failed */
+#define KDC_ERR_PREAUTH_REQUIRED 25 /* Additional preauthentication */
+ /* required */
+#define KDC_ERR_SERVER_NOMATCH 26 /* Requested server and */
/* ticket don't match*/
/* Application errors */
#define KRB_AP_ERR_BAD_INTEGRITY 31 /* Decrypt integrity check failed */
diff --git a/src/include/krb5/proto.h b/src/include/krb5/proto.h
index 30f96cd4ea..2a55660a80 100644
--- a/src/include/krb5/proto.h
+++ b/src/include/krb5/proto.h
@@ -71,7 +71,8 @@
#define KRB5_PADATA_ENC_TIMESTAMP 5 /* timestamp encrypted in key */
#define KRB5_PADATA_ENC_SECURID 6 /* SecurId passcode */
#define KRB5_PADATA_SESAME 7 /* Sesame project */
-
+#define KRB5_PADATA_OSF_DCE 8 /* OSF DCE */
+
/* Reserved for SPX pre-authentication. */
#define KRB5_PADATA_DASS 16
@@ -83,5 +84,6 @@
/* authorization data types */
#define KRB5_AUTHDATA_OSF_DCE 64
+#define KRB5_AUTHDATA_SESAME 65
#endif /* KRB5_PROTO__ */