diff options
| author | Theodore Tso <tytso@mit.edu> | 1990-12-13 16:30:18 +0000 |
|---|---|---|
| committer | Theodore Tso <tytso@mit.edu> | 1990-12-13 16:30:18 +0000 |
| commit | 2b3697977a1ab3ac3900eaa950a9e379cdbc1924 (patch) | |
| tree | adc81b898349c252b620a393edd7fb27869e2ec6 /src/kdc | |
| parent | 7270a539a6103799bda3c16801a4c5fc9fd0faaa (diff) | |
| download | krb5-2b3697977a1ab3ac3900eaa950a9e379cdbc1924.tar.gz krb5-2b3697977a1ab3ac3900eaa950a9e379cdbc1924.tar.xz krb5-2b3697977a1ab3ac3900eaa950a9e379cdbc1924.zip | |
Changed encrypted keyblocks to use krb5_encrypted_keyblock instead
of krb5_keyblock
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@1549 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/kdc')
| -rw-r--r-- | src/kdc/do_as_req.c | 6 | ||||
| -rw-r--r-- | src/kdc/do_tgs_req.c | 3 | ||||
| -rw-r--r-- | src/kdc/kdc_util.c | 16 |
3 files changed, 4 insertions, 21 deletions
diff --git a/src/kdc/do_as_req.c b/src/kdc/do_as_req.c index 5a65823e1..a6a376da1 100644 --- a/src/kdc/do_as_req.c +++ b/src/kdc/do_as_req.c @@ -234,8 +234,7 @@ krb5_data **response; /* filled in with a response packet */ /* convert server.key into a real key (it may be encrypted in the database) */ - if (retval = kdc_convert_key(&server.key, &encrypting_key, - CONVERT_OUTOF_DB)) { + if (retval = KDB_CONVERT_KEY_OUTOF_DB(&server.key, &encrypting_key)) { cleanup(); return retval; } @@ -288,8 +287,7 @@ krb5_data **response; /* filled in with a response packet */ /* convert client.key into a real key (it may be encrypted in the database) */ - if (retval = kdc_convert_key(&client.key, &encrypting_key, - CONVERT_OUTOF_DB)) { + if (retval = KDB_CONVERT_KEY_OUTOF_DB(&client.key, &encrypting_key)) { cleanup(); return retval; } diff --git a/src/kdc/do_tgs_req.c b/src/kdc/do_tgs_req.c index bd791c3ed..06e9a74da 100644 --- a/src/kdc/do_tgs_req.c +++ b/src/kdc/do_tgs_req.c @@ -398,8 +398,7 @@ krb5_data **response; /* filled in with a response packet */ } else { /* convert server.key into a real key (it may be encrypted in the database) */ - if (retval = kdc_convert_key(&server.key, &encrypting_key, - CONVERT_OUTOF_DB)) { + if (retval = KDB_CONVERT_KEY_OUTOF_DB(&server.key, &encrypting_key)) { cleanup(); return retval; } diff --git a/src/kdc/kdc_util.c b/src/kdc/kdc_util.c index b70b0efa4..39f06145b 100644 --- a/src/kdc/kdc_util.c +++ b/src/kdc/kdc_util.c @@ -183,8 +183,7 @@ krb5_ticket **ticket; } /* convert server.key into a real key (it may be encrypted in the database) */ - if (retval = kdc_convert_key(&server.key, &encrypting_key, - CONVERT_OUTOF_DB)) { + if (retval = KDB_CONVERT_KEY_OUTOF_DB(&server.key, &encrypting_key)) { krb5_db_free_principal(&server, nprincs); cleanup_apreq(); return retval; @@ -271,19 +270,6 @@ krb5_ticket **ticket; return 0; } -krb5_error_code -kdc_convert_key(in, out, direction) -krb5_keyblock *in, *out; -int direction; -{ - if (direction == CONVERT_INTO_DB) { - return krb5_kdb_encrypt_key(&master_encblock, in, out); - } else if (direction == CONVERT_OUTOF_DB) { - return krb5_kdb_decrypt_key(&master_encblock, in, out); - } else - return KRB5_KDB_ILLDIRECTION; -} - /* This probably wants to be updated if you support last_req stuff */ static krb5_last_req_entry *nolrarray[] = { 0 }; |