Added a field to hold an encryption type in the keyblock field --- so

routines have a hint of which encryption type they should use.

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

diff --git a/src/include/krb5/ChangeLog b/src/include/krb5/ChangeLog
index 2a8b175cd22cf40b3064dbf956fa97a505f83b3f..2caf1c82a0b636ae2908a15ac1f4af2bae1f72b5 100644 (file)
--- a/src/include/krb5/ChangeLog
+++ b/src/include/krb5/ChangeLog
@@ -1,5 +1,9 @@
 Thu Nov  3 16:38:44 1994  Theodore Y. Ts'o  (tytso@dcl)
 
+       * encryption.h (krb5_keyblock): Added a field to hold an
+               encryption type in the keyblock field --- so routines have
+               a hint of which encryption type they should use.
+
        * error_def.h: Add support for the kv5m error table.  (For magic
                numbers.) 
 

diff --git a/src/include/krb5/encryption.h b/src/include/krb5/encryption.h
index 8df3b171efa37aa4ee974d12d0b2bca37e756e00..3f4d70174f1a336c9ced18a9b30f73cb0e687b26 100644 (file)
--- a/src/include/krb5/encryption.h
+++ b/src/include/krb5/encryption.h
@@ -31,6 +31,7 @@
 typedef struct _krb5_keyblock {
     krb5_magic magic;
     krb5_keytype keytype;
+    krb5_enctype enctype;      /* hint of what encryption type to use */
     int length;
     krb5_octet *contents;
 } krb5_keyblock;
@@ -128,6 +129,8 @@ typedef struct _krb5_checksum_entry {
 #define        ETYPE_DES_CBC_MD5       0x0003  /* DES cbc mode with RSA-MD5 */
 #define        ETYPE_RAW_DES_CBC       0x0004  /* Raw DES cbc mode */
 
+#define ETYPE_UNKNOWN          0x1FF   /* Reserved local value */
+
 #define        CKSUMTYPE_CRC32         0x0001
 #define        CKSUMTYPE_RSA_MD4       0x0002
 #define        CKSUMTYPE_RSA_MD4_DES   0x0003