k5-int.h: Added new field values for ap_req_sumtype and safe_sumtype.

	Added new convenience function for verifying magic numbers:
	KRB5_VERIFY_MAGIC.

krb5.hin (krb5_auth_con_set_req_cksumtype, rb5_auth_con_set_safe_cksumtype):
	Added prototypes of new functions, to replace old
	krb5_auth_con_setcksumtype.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@8016 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/include/ChangeLog b/src/include/ChangeLog
index 3bf0ecf67bf30c117d1f459820272c9ae5be448b..a8401cfda8e06db95cfa79c6e5acf17f88525f0e 100644 (file)
--- a/src/include/ChangeLog
+++ b/src/include/ChangeLog
@@ -1,3 +1,13 @@
+Thu May  9 19:28:48 1996  Theodore Y. Ts'o  <tytso@mit.edu>
+
+       * k5-int.h: Added new field values for ap_req_sumtype and
+               safe_sumtype.  Added new convenience function for
+               verifying magic numbers: KRB5_VERIFY_MAGIC.
+
+       * krb5.hin (krb5_auth_con_set_req_cksumtype,
+               krb5_auth_con_set_safe_cksumtype): Added prototypes of
+               new functions, to replace old krb5_auth_con_setcksumtype.
+
 Fri May 10 01:26:24 1996  Richard Basch  <basch@lehman.com>
 
        * k5-int.h krb5.hin: Replaced 3des-md5 with 3des-sha.

diff --git a/src/include/k5-int.h b/src/include/k5-int.h
index 7c2b11c08674058d22b295110d5d64042786f4a7..2c31a8a95d2c2db5975a8823a6b2ec79bc1916aa 100644 (file)
--- a/src/include/k5-int.h
+++ b/src/include/k5-int.h
@@ -993,6 +993,8 @@ struct _krb5_context {
        void            FAR *ser_ctx;
        krb5_deltat     clockskew; /* allowable clock skew */
        krb5_cksumtype  kdc_req_sumtype;
+       krb5_cksumtype  default_ap_req_sumtype;
+       krb5_cksumtype  default_safe_sumtype;
        krb5_flags      kdc_default_options;
        krb5_flags      library_options;
        krb5_boolean    profile_secure;
@@ -1424,4 +1426,10 @@ krb5_error_code krb5_ser_unpack_bytes KRB5_PROTOTYPE((krb5_octet *,
                                                      size_t,
                                                      krb5_octet **,
                                                      size_t *));
+/*
+ * Convenience function for structure magic number
+ */
+#define KRB5_VERIFY_MAGIC(structure,magic_number) \
+    if ((structure)->magic != (magic_number)) return (magic_number);
+    
 #endif /* _KRB5_INT_H */

diff --git a/src/include/krb5.hin b/src/include/krb5.hin
index 64c7c352a4cd7392adfd6ab5e913a4f1ebde3fd7..7f65ef7e3ebec4323614002fca081f9d10e36fb8 100644 (file)
--- a/src/include/krb5.hin
+++ b/src/include/krb5.hin
@@ -1914,7 +1914,12 @@ krb5_error_code krb5_auth_con_getlocalsubkey
                   krb5_auth_context,
                   krb5_keyblock **));
 
-krb5_error_code krb5_auth_con_setcksumtype
+krb5_error_code krb5_auth_con_set_req_cksumtype
+       KRB5_PROTOTYPE((krb5_context,
+                  krb5_auth_context,
+                  krb5_cksumtype));
+
+krb5_error_code krb5_auth_con_set_safe_cksumtype
        KRB5_PROTOTYPE((krb5_context,
                   krb5_auth_context,
                   krb5_cksumtype));