This commit was generated by cvs2svn to compensate for changes in r72445,

which included commits to RCS files with non-trunk default branches.

1 files changed, 46 insertions, 7 deletions

diff --git a/crypto/heimdal/lib/hdb/hdb-protos.h b/crypto/heimdal/lib/hdb/hdb-protos.h
index e0f15b1..dbb00a5 100644
--- a/crypto/heimdal/lib/hdb/hdb-protos.h
+++ b/crypto/heimdal/lib/hdb/hdb-protos.h
@@ -14,6 +14,12 @@
 #endif
 
 krb5_error_code
+hdb_add_master_key __P((
+	krb5_context context,
+	krb5_keyblock *key,
+	hdb_master_key *inout));
+
+krb5_error_code
 hdb_check_db_format __P((
 	krb5_context context,
 	HDB *db));
@@ -70,6 +76,11 @@ hdb_free_entry __P((
 void
 hdb_free_key __P((Key *key));
 
+void
+hdb_free_master_key __P((
+	krb5_context context,
+	hdb_master_key mkey));
+
 krb5_error_code
 hdb_init_db __P((
 	krb5_context context,
@@ -82,6 +93,12 @@ hdb_key2principal __P((
 	krb5_principal p));
 
 krb5_error_code
+hdb_ldap_create __P((
+	krb5_context context,
+	HDB ** db,
+	const char *filename));
+
+krb5_error_code
 hdb_lock __P((
 	int fd,
 	int operation));
@@ -95,7 +112,7 @@ hdb_ndbm_create __P((
 krb5_error_code
 hdb_next_enctype2key __P((
 	krb5_context context,
-	hdb_entry *e,
+	const hdb_entry *e,
 	krb5_enctype enctype,
 	Key **key));
 
@@ -115,25 +132,34 @@ hdb_print_entry __P((
 krb5_error_code
 hdb_process_master_key __P((
 	krb5_context context,
-	EncryptionKey key,
-	krb5_data *schedule));
+	int kvno,
+	krb5_keyblock *key,
+	krb5_enctype etype,
+	hdb_master_key *mkey));
 
 krb5_error_code
 hdb_read_master_key __P((
 	krb5_context context,
 	const char *filename,
-	EncryptionKey *key));
+	hdb_master_key *mkey));
 
-void
+krb5_error_code
 hdb_seal_keys __P((
+	krb5_context context,
 	HDB *db,
 	hdb_entry *ent));
 
 krb5_error_code
+hdb_seal_keys_mkey __P((
+	krb5_context context,
+	hdb_entry *ent,
+	hdb_master_key mkey));
+
+krb5_error_code
 hdb_set_master_key __P((
 	krb5_context context,
 	HDB *db,
-	EncryptionKey key));
+	krb5_keyblock *key));
 
 krb5_error_code
 hdb_set_master_keyfile __P((
@@ -144,15 +170,28 @@ hdb_set_master_keyfile __P((
 krb5_error_code
 hdb_unlock __P((int fd));
 
-void
+krb5_error_code
 hdb_unseal_keys __P((
+	krb5_context context,
 	HDB *db,
 	hdb_entry *ent));
 
+krb5_error_code
+hdb_unseal_keys_mkey __P((
+	krb5_context context,
+	hdb_entry *ent,
+	hdb_master_key mkey));
+
 int
 hdb_value2entry __P((
 	krb5_context context,
 	krb5_data *value,
 	hdb_entry *ent));
 
+krb5_error_code
+hdb_write_master_key __P((
+	krb5_context context,
+	const char *filename,
+	hdb_master_key mkey));
+
 #endif /* __hdb_protos_h__ */