diff options
| author | Chris Provenzano <proven@mit.edu> | 1995-08-16 07:28:49 +0000 |
|---|---|---|
| committer | Chris Provenzano <proven@mit.edu> | 1995-08-16 07:28:49 +0000 |
| commit | 3e17b149fb771009bb52d089c2381de7422b23cc (patch) | |
| tree | 5599b159be4b41685ad8ad94fd3e312fa24164a5 /src/lib/kdb/encrypt_key.c | |
| parent | 5b1cbaf8813bd92d638d5f5d3358200e61f82b51 (diff) | |
| download | krb5-3e17b149fb771009bb52d089c2381de7422b23cc.tar.gz krb5-3e17b149fb771009bb52d089c2381de7422b23cc.tar.xz krb5-3e17b149fb771009bb52d089c2381de7422b23cc.zip | |
decrypt_key.c, encrypt_key.c: Only save the salt data if salt type != 0.
kdb_dbm.c: Rewritten to NOT open/close the db for every transaction.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@6537 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib/kdb/encrypt_key.c')
| -rw-r--r-- | src/lib/kdb/encrypt_key.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/lib/kdb/encrypt_key.c b/src/lib/kdb/encrypt_key.c index d22d73d22e..6e3f9b7591 100644 --- a/src/lib/kdb/encrypt_key.c +++ b/src/lib/kdb/encrypt_key.c @@ -93,19 +93,17 @@ krb5_dbekd_encrypt_key_data(context, eblock, keyblock, keysalt, keyver,key_data) /* After key comes the salt in necessary */ if (keysalt) { - key_data->key_data_type[1] = keysalt->type; - if (key_data->key_data_type[1] >= 0) { + if (keysalt->type > 0) { key_data->key_data_ver++; - key_data->key_data_length[1] = keysalt->data.length; - if (keysalt && keysalt->data.length) { + key_data->key_data_type[1] = keysalt->type; + if (key_data->key_data_length[1] = keysalt->data.length) { key_data->key_data_contents[1] = (krb5_octet *)malloc(keysalt->data.length); if (key_data->key_data_contents[1] == NULL) { krb5_xfree(key_data->key_data_contents[0]); return ENOMEM; } - memcpy(key_data->key_data_contents[1], - keysalt->data.data, + memcpy(key_data->key_data_contents[1], keysalt->data.data, (size_t) keysalt->data.length); } } |