From 88ee27a81f2582d35e99aa29c7cba275e978b61b Mon Sep 17 00:00:00 2001 From: John Kohl Date: Thu, 20 Sep 1990 15:21:51 +0000 Subject: [PATCH] use macros to hide abstraction git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@1137 dc483132-0cff-0310-8789-dd5450dbe970 --- src/lib/kdb/fetch_mkey.c | 5 +---- src/lib/kdb/verify_mky.c | 8 ++++---- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/src/lib/kdb/fetch_mkey.c b/src/lib/kdb/fetch_mkey.c index 313786930..0f074258f 100644 --- a/src/lib/kdb/fetch_mkey.c +++ b/src/lib/kdb/fetch_mkey.c @@ -75,10 +75,7 @@ OLDDECLARG(krb5_keyblock *,key) pwd.data = password; pwd.length = size; - retval = (*eblock->crypto_entry->string_to_key)(key->keytype, - key, - &pwd, - mname); + retval = krb5_string_to_key(eblock, key->keytype, key, &pwd, mname); bzero(password, sizeof(password)); /* erase it */ return retval; diff --git a/src/lib/kdb/verify_mky.c b/src/lib/kdb/verify_mky.c index 7652add97..5767ba10d 100644 --- a/src/lib/kdb/verify_mky.c +++ b/src/lib/kdb/verify_mky.c @@ -53,19 +53,19 @@ krb5_encrypt_block *eblock; } /* do any necessary key pre-processing */ - if (retval = (*eblock->crypto_entry->process_key)(eblock, mkey)) { + if (retval = krb5_process_key(eblock, mkey)) { return(retval); } if (retval = krb5_kdb_decrypt_key(eblock, &master_entry.key, &tempkey)) { - (void) (*eblock->crypto_entry->finish_key)(eblock); + (void) krb5_finish_key(eblock); return retval; } if (bcmp((char *)mkey->contents, (char *)tempkey.contents, mkey->length)) { retval = KRB5_KDB_BADMASTERKEY; - (void) (*eblock->crypto_entry->finish_key)(eblock); + (void) krb5_finish_key(eblock); } else - retval = (*eblock->crypto_entry->finish_key)(eblock); + retval = krb5_finish_key(eblock); return retval; } -- 2.26.2