From 0ba6a207e6d2499c1db2d76945c6a9ea88f3342d Mon Sep 17 00:00:00 2001 From: John Kohl Date: Fri, 14 Dec 1990 23:57:30 +0000 Subject: [PATCH] move krb5_encrypted_keyblock to kdb.h git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@1555 dc483132-0cff-0310-8789-dd5450dbe970 --- src/include/krb5/encryption.h | 6 ------ src/include/krb5/kdb.h | 10 ++++++++++ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/include/krb5/encryption.h b/src/include/krb5/encryption.h index 0bdaa5ff6..b3dc1437c 100644 --- 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 c42d8d585..2f04677d0 100644 --- 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 */ -- 2.26.2