From 79e732990deab8b5c4ede3faf3e3a1f099f97469 Mon Sep 17 00:00:00 2001 From: John Kohl Date: Wed, 29 Nov 1989 14:39:13 +0000 Subject: [PATCH] remove unnecessary #define's change to pointer to krb5_cryptosystem_entry add finish_key func git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@35 dc483132-0cff-0310-8789-dd5450dbe970 --- src/include/krb5/encryption.h | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/include/krb5/encryption.h b/src/include/krb5/encryption.h index cfed5e400..5ec9c59d0 100644 --- a/src/include/krb5/encryption.h +++ b/src/include/krb5/encryption.h @@ -30,25 +30,19 @@ typedef struct _krb5_cryptosystem_entry { int (*decrypt_func)(/* void *in, void *out, size_t length, krb5_encrypt_block *block */); int (*process_key)(/* krb5_encrypt_block *block, krb5_keyblock *key */); + int (*finish_key)(/* krb5_encrypt_block *block */); int block_length; int pad_minimum; /* needed for cksum size computation */ int keysize; } krb5_cryptosystem_entry; typedef struct _krb5_encrypt_block { - krb5_cryptosystem_entry crypto_entry; + krb5_cryptosystem_entry *crypto_entry; krb5_keyblock *key; void *priv; /* for private use, e.g. DES key schedules */ } krb5_encrypt_block; -#define efunc crypto_entry.encrypt_func -#define dfunc crypto_entry.decrypt_func -#define prkey crypto_entry.process_key -#define blength crypto_entry.block_length -#define padmin crypto_entry.pad_minimum -#define ksize crypto_entry.keysize - /* per Kerberos v5 protocol spec */ #define KEYTYPE_NULL 0x0000 #define KEYTYPE_DES 0x0001 /* Data Encryption Standard, -- 2.26.2