diff options
author | Greg Hudson <ghudson@mit.edu> | 2010-07-02 17:13:40 +0000 |
---|---|---|
committer | Greg Hudson <ghudson@mit.edu> | 2010-07-02 17:13:40 +0000 |
commit | 3dd263c9e18f52a115ab16213c37ee4132d56961 (patch) | |
tree | d2606d63e2c0cb4a87d33e9bab7eb75ce0ae8dc5 /src/plugins/kdb/db2 | |
parent | cd332f86e3559fa13eaad7b33485fd1047fcd16c (diff) | |
download | krb5-3dd263c9e18f52a115ab16213c37ee4132d56961.zip krb5-3dd263c9e18f52a115ab16213c37ee4132d56961.tar.gz krb5-3dd263c9e18f52a115ab16213c37ee4132d56961.tar.bz2 |
Remove the set_master_key and get_master_key DAL interfaces and their
corresponding libkdb5 APIs, as they were not productively used. In
kdb5_ldap_util, stop using the realm data's mkey field as a container
to communicate the master key to static helper functions, since the
field no longer exists.
ticket: 6749
status: open
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@24162 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/plugins/kdb/db2')
-rw-r--r-- | src/plugins/kdb/db2/db2_exp.c | 9 | ||||
-rw-r--r-- | src/plugins/kdb/db2/kdb_db2.c | 37 | ||||
-rw-r--r-- | src/plugins/kdb/db2/kdb_db2.h | 11 |
3 files changed, 0 insertions, 57 deletions
diff --git a/src/plugins/kdb/db2/db2_exp.c b/src/plugins/kdb/db2/db2_exp.c index 174c60a..74963cd 100644 --- a/src/plugins/kdb/db2/db2_exp.c +++ b/src/plugins/kdb/db2/db2_exp.c @@ -174,13 +174,6 @@ WRAP_VOID (krb5_db2_free_policy, ( krb5_context kcontext, osa_policy_ent_t entry ), (kcontext, entry)); -WRAP_K (krb5_db2_set_master_key_ext, - ( krb5_context kcontext, char *pwd, krb5_keyblock *key), - (kcontext, pwd, key)); -WRAP_K (krb5_db2_db_get_mkey, - ( krb5_context context, krb5_keyblock **key), - (context, key)); - WRAP_K (krb5_db2_db_set_mkey_list, ( krb5_context kcontext, krb5_keylist_node *keylist), (kcontext, keylist)); @@ -251,8 +244,6 @@ kdb_vftabl PLUGIN_SYMBOL_NAME(krb5_db2, kdb_function_table) = { /* db_free_policy */ wrap_krb5_db2_free_policy, /* db_alloc */ krb5_db2_alloc, /* db_free */ krb5_db2_free, - /* set_master_key */ wrap_krb5_db2_set_master_key_ext, - /* get_master_key */ wrap_krb5_db2_db_get_mkey, /* set_master_key_list */ wrap_krb5_db2_db_set_mkey_list, /* get_master_key_list */ wrap_krb5_db2_db_get_mkey_list, /* blah blah blah */ 0,0,0,0,0,0,0,0, diff --git a/src/plugins/kdb/db2/kdb_db2.c b/src/plugins/kdb/db2/kdb_db2.c index 9c73c12..684fcd9 100644 --- a/src/plugins/kdb/db2/kdb_db2.c +++ b/src/plugins/kdb/db2/kdb_db2.c @@ -438,36 +438,6 @@ krb5_db2_db_fini(krb5_context context) return retval; } -/* - * Set/Get the master key associated with the database - */ -krb5_error_code -krb5_db2_db_set_mkey(krb5_context context, krb5_keyblock *key) -{ - krb5_db2_context *db_ctx; - - if (!k5db2_inited(context)) - return (KRB5_KDB_DBNOTINITED); - - db_ctx = context->dal_handle->db_context; - db_ctx->db_master_key = key; - return 0; -} - -krb5_error_code -krb5_db2_db_get_mkey(krb5_context context, krb5_keyblock **key) -{ - krb5_db2_context *db_ctx; - - if (!k5db2_inited(context)) - return (KRB5_KDB_DBNOTINITED); - - db_ctx = context->dal_handle->db_context; - *key = db_ctx->db_master_key; - - return 0; -} - krb5_error_code krb5_db2_db_set_mkey_list(krb5_context context, krb5_keylist_node *key_list) { @@ -1333,13 +1303,6 @@ krb5_db2_destroy(krb5_context context, char *conf_section, char **db_args) return destroy_db(context, db_ctx->db_name); } -krb5_error_code -krb5_db2_set_master_key_ext(krb5_context context, - char *pwd, krb5_keyblock * key) -{ - return krb5_db2_db_set_mkey(context, key); -} - void * krb5_db2_alloc(krb5_context context, void *ptr, size_t size) { diff --git a/src/plugins/kdb/db2/kdb_db2.h b/src/plugins/kdb/db2/kdb_db2.h index 7b4fcf4..2c95448 100644 --- a/src/plugins/kdb/db2/kdb_db2.h +++ b/src/plugins/kdb/db2/kdb_db2.h @@ -43,7 +43,6 @@ typedef struct _krb5_db2_context { int db_locks_held; /* Number of times locked */ int db_lock_mode; /* Last lock mode, e.g. greatest*/ krb5_boolean db_nb_locks; /* [Non]Blocking lock modes */ - krb5_keyblock *db_master_key; /* Master key of database */ krb5_keylist_node *db_master_key_list; /* Master key list of database */ osa_adb_policy_t policy_db; krb5_boolean tempdb; @@ -81,16 +80,6 @@ krb5_error_code krb5_db2_db_open_database(krb5_context); krb5_error_code krb5_db2_db_close_database(krb5_context); krb5_error_code -krb5_db2_set_master_key_ext(krb5_context kcontext, char *pwd, - krb5_keyblock *key); - -krb5_error_code -krb5_db2_db_set_mkey(krb5_context context, krb5_keyblock *key); - -krb5_error_code -krb5_db2_db_get_mkey(krb5_context context, krb5_keyblock **key); - -krb5_error_code krb5_db2_db_set_mkey_list(krb5_context context, krb5_keylist_node *keylist); krb5_error_code |