summaryrefslogtreecommitdiffstats
path: root/src/include
diff options
context:
space:
mode:
authorTheodore Tso <tytso@mit.edu>1994-11-03 21:47:47 +0000
committerTheodore Tso <tytso@mit.edu>1994-11-03 21:47:47 +0000
commit657477c14d16f5ac89fcb725631e9a2f39074ab4 (patch)
tree4e51145b21f67c76d8dd5958537abb31857e8c50 /src/include
parent5a8d2ab206d9c24b2b94210532bfe618827c5d01 (diff)
downloadkrb5-657477c14d16f5ac89fcb725631e9a2f39074ab4.tar.gz
krb5-657477c14d16f5ac89fcb725631e9a2f39074ab4.tar.xz
krb5-657477c14d16f5ac89fcb725631e9a2f39074ab4.zip
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
Diffstat (limited to 'src/include')
-rw-r--r--src/include/krb5/ChangeLog4
-rw-r--r--src/include/krb5/encryption.h3
2 files changed, 7 insertions, 0 deletions
diff --git a/src/include/krb5/ChangeLog b/src/include/krb5/ChangeLog
index 2a8b175cd..2caf1c82a 100644
--- 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 8df3b171e..3f4d70174 100644
--- 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