move krb5_encrypted_keyblock to kdb.h

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

diff --git a/src/include/krb5/encryption.h b/src/include/krb5/encryption.h
index 0bdaa5ff66f32f09dd35f6a09eeb08ed49f112ca..b3dc1437cb19aa8f7a4ad397a70d23e124ad83b4 100644 (file)
--- a/src/include/krb5/encryption.h
+++ b/src/include/krb5/encryption.h
@@ -22,12 +22,6 @@ typedef struct _krb5_keyblock {
     krb5_octet *contents;
 } krb5_keyblock;
 
-typedef struct _krb5_encrypted_keyblock {
-    krb5_keytype keytype;
-    int length;
-    krb5_octet *contents;
-} krb5_encrypted_keyblock;
-
 typedef struct _krb5_checksum {
     krb5_cksumtype checksum_type;      /* checksum type */
     int length;

diff --git a/src/include/krb5/kdb.h b/src/include/krb5/kdb.h
index c42d8d585fd57ac6165aa2e518e93e6c4e58e304..2f04677d0d643a60dec6a9165c5eafe41adc0d14 100644 (file)
--- a/src/include/krb5/kdb.h
+++ b/src/include/krb5/kdb.h
@@ -37,6 +37,16 @@ typedef struct _krb5_db_entry {
 #define        KRB5_KDB_DISALLOW_DUP_SKEY      0x00000020
 #define        KRB5_KDB_DISALLOW_ALL_TIX       0x00000040
 
+/* this is the same structure as krb5_keyblock, but with a different name to
+   enable compile-time catching of programmer confusion between encrypted &
+   decrypted keys in the database */
+
+typedef struct _krb5_encrypted_keyblock {
+    krb5_keytype keytype;
+    int length;
+    krb5_octet *contents;
+} krb5_encrypted_keyblock;
+
 /* XXX depends on knowledge of krb5_parse_name() formats */
 #define KRB5_KDB_M_NAME                "K/M"   /* Kerberos/Master */