diff options
| author | Marc Horowitz <marc@mit.edu> | 1998-10-30 02:56:35 +0000 |
|---|---|---|
| committer | Marc Horowitz <marc@mit.edu> | 1998-10-30 02:56:35 +0000 |
| commit | 1440ab035ba04550ddbbfbff1ee9b5571e3d95db (patch) | |
| tree | 9d5e8d2e151a930e044c7d0f7c64053d244577a0 /src/tests/verify/kdb5_verify.c | |
| parent | 61ddbf948ba6ee70c1bc049268c3dfa73bc9983e (diff) | |
| download | krb5-1440ab035ba04550ddbbfbff1ee9b5571e3d95db.tar.gz krb5-1440ab035ba04550ddbbfbff1ee9b5571e3d95db.tar.xz krb5-1440ab035ba04550ddbbfbff1ee9b5571e3d95db.zip | |
pull up 3des implementation from the marc-3des branch
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@11001 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/tests/verify/kdb5_verify.c')
| -rw-r--r-- | src/tests/verify/kdb5_verify.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/tests/verify/kdb5_verify.c b/src/tests/verify/kdb5_verify.c index 8a95d7125..558ef2533 100644 --- a/src/tests/verify/kdb5_verify.c +++ b/src/tests/verify/kdb5_verify.c @@ -272,7 +272,7 @@ check_princ(context, str_princ) goto errout; } - if ((retval = krb5_dbekd_decrypt_key_data(context, &master_encblock, + if ((retval = krb5_dbekd_decrypt_key_data(context, &master_keyblock, kdbe.key_data, &db_key, NULL))) { com_err(progname, retval, "while decrypting key for '%s'", princ_name); goto errout; @@ -386,7 +386,8 @@ set_dbname_help(context, pname, dbname) } free(scratch.data); } else { - if ((retval = krb5_db_fetch_mkey(context, master_princ, &master_encblock, + if ((retval = krb5_db_fetch_mkey(context, master_princ, + master_keyblock.enctype, manual_mkey, FALSE, (char *) NULL, 0, &master_keyblock))) { com_err(pname, retval, "while reading master key"); @@ -398,8 +399,7 @@ set_dbname_help(context, pname, dbname) return(1); } if ((retval = krb5_db_verify_master_key(context, master_princ, - &master_keyblock, - &master_encblock))) { + &master_keyblock))) { com_err(pname, retval, "while verifying master key"); (void) krb5_db_fini(context); return(1); |