diff options
| author | John Kohl <jtkohl@mit.edu> | 1990-09-20 15:46:58 +0000 |
|---|---|---|
| committer | John Kohl <jtkohl@mit.edu> | 1990-09-20 15:46:58 +0000 |
| commit | 286fc42b828e4dbdd579696c2a2da6c571697d4a (patch) | |
| tree | a55ab43bbf74a4593f64e47198830023bb98571a /src/admin | |
| parent | d625e6d8ccf42193c6522d1ae36f12662cc8a085 (diff) | |
| download | krb5-286fc42b828e4dbdd579696c2a2da6c571697d4a.tar.gz krb5-286fc42b828e4dbdd579696c2a2da6c571697d4a.tar.xz krb5-286fc42b828e4dbdd579696c2a2da6c571697d4a.zip | |
use macros to hide abstraction
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@1139 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/admin')
| -rw-r--r-- | src/admin/create/kdb5_create.c | 3 | ||||
| -rw-r--r-- | src/admin/edit/kdb5_edit.c | 12 |
2 files changed, 6 insertions, 9 deletions
diff --git a/src/admin/create/kdb5_create.c b/src/admin/create/kdb5_create.c index f0a2c5ebd..46cdff6cd 100644 --- a/src/admin/create/kdb5_create.c +++ b/src/admin/create/kdb5_create.c @@ -289,8 +289,7 @@ struct realm_info *pblock; return retval; break; case RANDOM_KEY: - if (retval = (*pblock->eblock->crypto_entry->random_key)(pblock->rseed, - &rkey)) + if (retval = krb5_random_key(pblock->eblock, pblock->rseed, &rkey)) return retval; retval = krb5_kdb_encrypt_key(pblock->eblock, rkey, &ekey); krb5_free_keyblock(rkey); diff --git a/src/admin/edit/kdb5_edit.c b/src/admin/edit/kdb5_edit.c index 5d2c5e688..e862508c2 100644 --- a/src/admin/edit/kdb5_edit.c +++ b/src/admin/edit/kdb5_edit.c @@ -697,8 +697,7 @@ OLDDECLARG(krb5_kvno, vno) krb5_error_code retval; krb5_keyblock *tempkey; - if (retval = (*master_encblock.crypto_entry->random_key)(master_random, - &tempkey)) { + if (retval = krb5_random_key(&master_encblock, master_random, &tempkey)) { com_err(argv[0], retval, "while generating random key"); return; } @@ -789,11 +788,10 @@ OLDDECLARG(krb5_kvno, vno) pwd.data = password; pwd.length = pwsize; - retval = (*master_encblock.crypto_entry-> - string_to_key)(master_keyblock.keytype, - &tempkey, - &pwd, - string_princ); + retval = krb5_string_to_key(&master_encblock, master_keyblock.keytype, + &tempkey, + &pwd, + string_princ); bzero(password, sizeof(password)); /* erase it */ if (retval) { com_err(argv[0], retval, "while converting password to key for '%s'", argv[1]); |