From 3dd263c9e18f52a115ab16213c37ee4132d56961 Mon Sep 17 00:00:00 2001 From: Greg Hudson Date: Fri, 2 Jul 2010 17:13:40 +0000 Subject: 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 --- src/plugins/kdb/db2/kdb_db2.c | 37 ------------------------------------- 1 file changed, 37 deletions(-) (limited to 'src/plugins/kdb/db2/kdb_db2.c') 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) { -- cgit v1.1