Merge mskrb-integ onto trunk

The mskrb-integ branch includes support for the following projects:
Projects/Aliases
* Projects/PAC and principal APIs
* Projects/AEAD encryption API
* Projects/GSSAPI DCE
* Projects/RFC 3244

In addition, it includes support for enctype negotiation, and a variety of GSS-API extensions.
In the KDC it includes support for protocol transition, constrained delegation
and a new authorization data interface.
The old authorization data interface is also supported.

This commit merges the mskrb-integ branch on to the trunk.
Additional review and testing is required.

Merge commit 'mskrb-integ' into trunk

ticket: new
status: open

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@21690 dc483132-0cff-0310-8789-dd5450dbe970

1 files changed, 236 insertions, 0 deletions

diff --git a/src/include/kdb.h b/src/include/kdb.h
index cc5951d464..a3142c1d77 100644
--- a/src/include/kdb.h
+++ b/src/include/kdb.h
@@ -85,6 +85,8 @@
 #define KRB5_KDB_CREATE_BTREE		0x00000001
 #define KRB5_KDB_CREATE_HASH		0x00000002
 
+#if !defined(_WIN32)
+
 /*
  * Note --- these structures cannot be modified without changing the
  * database version number in libkdb.a, but should be expandable by
@@ -194,6 +196,7 @@ extern char *krb5_mkey_pwd_prompt2;
  *
  * Data encoding is little-endian.
  */
+#ifdef _KRB5_INT_H
 #include "k5-platform.h"
 #define	krb5_kdb_decode_int16(cp, i16)	\
 	*((krb5_int16 *) &(i16)) = load_16_le(cp)
@@ -201,6 +204,7 @@ extern char *krb5_mkey_pwd_prompt2;
 	*((krb5_int32 *) &(i32)) = load_32_le(cp)
 #define krb5_kdb_encode_int16(i16, cp)	store_16_le(i16, cp)
 #define	krb5_kdb_encode_int32(i32, cp)	store_32_le(i32, cp)
+#endif /* _KRB5_INT_H */
 
 #define KRB5_KDB_OPEN_RW                0
 #define KRB5_KDB_OPEN_RO                1
@@ -473,6 +477,36 @@ krb5_dbe_def_cpw( krb5_context	  context,
 krb5_error_code
 krb5_def_promote_db(krb5_context, char *, char **);
 
+krb5_error_code
+krb5_dbekd_def_decrypt_key_data( krb5_context		  context,
+				 const krb5_keyblock	* mkey,
+				 const krb5_key_data	* key_data,
+				 krb5_keyblock		* dbkey,
+				 krb5_keysalt		* keysalt);
+
+krb5_error_code
+krb5_dbekd_def_encrypt_key_data( krb5_context		  context,
+				 const krb5_keyblock	* mkey,
+				 const krb5_keyblock	* dbkey,
+				 const krb5_keysalt	* keysalt,
+				 int			  keyver,
+				 krb5_key_data		* key_data);
+
+krb5_error_code
+krb5_dbekd_def_decrypt_key_data( krb5_context 	  context,
+				 const krb5_keyblock	* mkey,
+				 const krb5_key_data	* key_data,
+				 krb5_keyblock 	* dbkey,
+				 krb5_keysalt 	* keysalt);
+
+krb5_error_code
+krb5_dbekd_def_encrypt_key_data( krb5_context 		  context,
+				 const krb5_keyblock	* mkey,
+				 const krb5_keyblock 	* dbkey,
+				 const krb5_keysalt	* keysalt,
+				 int			  keyver,
+				 krb5_key_data	        * key_data);
+
 krb5_error_code 
 krb5_db_create_policy( krb5_context kcontext, 
 		       osa_policy_ent_t policy);
@@ -501,6 +535,208 @@ void
 krb5_db_free_policy( krb5_context kcontext, 
 		     osa_policy_ent_t policy);
 
+
+
+krb5_error_code
+krb5_db_set_context
+	(krb5_context, void *db_context);
+
+krb5_error_code
+krb5_db_get_context
+	(krb5_context, void **db_context);
+
 #define KRB5_KDB_DEF_FLAGS	0
 
+#define KDB_MAX_DB_NAME			128
+#define KDB_REALM_SECTION		"realms"
+#define KDB_MODULE_POINTER		"database_module"
+#define KDB_MODULE_DEF_SECTION		"dbdefaults"
+#define KDB_MODULE_SECTION		"dbmodules"
+#define KDB_LIB_POINTER			"db_library"
+#define KDB_DATABASE_CONF_FILE		DEFAULT_SECURE_PROFILE_PATH
+#define KDB_DATABASE_ENV_PROF		KDC_PROFILE_ENV
+
+#define KRB5_KDB_OPEN_RW		0
+#define KRB5_KDB_OPEN_RO		1
+
+#define KRB5_KDB_OPT_SET_DB_NAME	0
+#define KRB5_KDB_OPT_SET_LOCK_MODE	1
+
+typedef struct _kdb_vftabl {
+    short int maj_ver;
+    short int min_ver;
+
+    krb5_error_code (*init_library)();
+    krb5_error_code (*fini_library)();
+    krb5_error_code (*init_module) ( krb5_context kcontext,
+				     char * conf_section,
+				     char ** db_args,
+				     int mode );
+
+    krb5_error_code (*fini_module) ( krb5_context kcontext );
+
+    krb5_error_code (*db_create) ( krb5_context kcontext,
+				   char * conf_section,
+				   char ** db_args );
+
+    krb5_error_code (*db_destroy) ( krb5_context kcontext,
+				    char *conf_section,
+				    char ** db_args );
+
+    krb5_error_code (*db_get_age) ( krb5_context kcontext, 
+				    char *db_name, 
+				    time_t *age );
+
+    krb5_error_code (*db_set_option) ( krb5_context kcontext,
+				       int option,
+				       void *value );
+
+    krb5_error_code (*db_lock) ( krb5_context kcontext,
+				 int mode );
+
+    krb5_error_code (*db_unlock) ( krb5_context kcontext);
+
+    krb5_error_code (*db_get_principal) ( krb5_context kcontext,
+					  krb5_const_principal search_for,
+					  unsigned int flags,
+					  krb5_db_entry *entries,
+					  int *nentries,
+					  krb5_boolean *more );
+
+    krb5_error_code (*db_free_principal) ( krb5_context kcontext,
+					   krb5_db_entry *entry,
+					   int count );
+
+    krb5_error_code (*db_put_principal) ( krb5_context kcontext,
+					  krb5_db_entry *entries,
+					  int *nentries,
+					  char **db_args);
+
+    krb5_error_code (*db_delete_principal) ( krb5_context kcontext,
+					     krb5_const_principal search_for,
+					     int *nentries );
+
+    krb5_error_code (*db_iterate) ( krb5_context kcontext,
+				    char *match_entry,
+				    int (*func) (krb5_pointer, krb5_db_entry *),
+				    krb5_pointer func_arg );
+
+    krb5_error_code (*db_create_policy) ( krb5_context kcontext,
+					  osa_policy_ent_t policy );
+
+    krb5_error_code (*db_get_policy) ( krb5_context kcontext,
+				       char *name,
+				       osa_policy_ent_t *policy,
+				       int *cnt);
+
+    krb5_error_code (*db_put_policy) ( krb5_context kcontext,
+				       osa_policy_ent_t policy );
+
+    krb5_error_code (*db_iter_policy) ( krb5_context kcontext,
+					char *match_entry,
+					osa_adb_iter_policy_func func,
+					void *data );
+
+
+    krb5_error_code (*db_delete_policy) ( krb5_context kcontext,
+					  char *policy );
+
+    void (*db_free_policy) ( krb5_context kcontext,
+			     osa_policy_ent_t val );
+
+    krb5_error_code (*db_supported_realms) ( krb5_context kcontext,
+					    char **realms );
+
+    krb5_error_code (*db_free_supported_realms) ( krb5_context kcontext,
+						  char **realms );
+
+
+    const char * (*errcode_2_string) ( krb5_context kcontext,
+				       long err_code );
+
+    void (*release_errcode_string) (krb5_context kcontext, const char *msg);
+
+    void * (*db_alloc) (krb5_context kcontext, void *ptr, size_t size);
+    void   (*db_free)  (krb5_context kcontext, void *ptr);
+
+
+
+    /* optional functions */
+    krb5_error_code (*set_master_key)    ( krb5_context kcontext, 
+					   char *pwd, 
+					   krb5_keyblock *key);
+
+    krb5_error_code (*get_master_key)    ( krb5_context kcontext,
+					   krb5_keyblock **key);
+
+
+    krb5_error_code (*setup_master_key_name) ( krb5_context kcontext,
+					       char *keyname,
+					       char *realm, 
+					       char **fullname, 
+					       krb5_principal  *principal);
+
+    krb5_error_code (*store_master_key)  ( krb5_context kcontext, 
+					   char *db_arg, 
+					   krb5_principal mname,
+					   krb5_kvno kvno,
+					   krb5_keyblock *key,
+					   char *master_pwd);
+
+    krb5_error_code (*fetch_master_key)  ( krb5_context kcontext,
+					   krb5_principal mname,
+					   krb5_keyblock *key,
+					   krb5_kvno *kvno,
+					   char *db_args);
+
+    krb5_error_code (*verify_master_key) ( krb5_context kcontext,
+					   krb5_principal mprinc,
+					   krb5_kvno kvno,
+					   krb5_keyblock *mkey );
+
+    krb5_error_code (*dbe_search_enctype) ( krb5_context kcontext, 
+					    krb5_db_entry *dbentp, 
+					    krb5_int32 *start, 
+					    krb5_int32 ktype, 
+					    krb5_int32 stype, 
+					    krb5_int32 kvno, 
+					    krb5_key_data **kdatap);
+    
+
+    krb5_error_code
+    (*db_change_pwd) ( krb5_context	  context,
+		       krb5_keyblock       * master_key,
+		       krb5_key_salt_tuple	* ks_tuple,
+		       int			  ks_tuple_count,
+		       char 		* passwd,
+		       int			  new_kvno,
+		       krb5_boolean	  keepold,
+		       krb5_db_entry	* db_entry);
+
+    /* Promote a temporary database to be the live one.  */
+    krb5_error_code (*promote_db) (krb5_context context,
+				   char *conf_section,
+				   char **db_args);
+
+    krb5_error_code (*dbekd_decrypt_key_data) ( krb5_context kcontext,
+					        const krb5_keyblock *mkey,
+						const krb5_key_data *key_data,
+						krb5_keyblock *dbkey,
+						krb5_keysalt *keysalt );
+
+    krb5_error_code (*dbekd_encrypt_key_data) ( krb5_context kcontext,
+						const krb5_keyblock *mkey,
+						const krb5_keyblock *dbkey,
+						const krb5_keysalt *keyselt,
+						int keyver,
+						krb5_key_data *key_data );
+
+    krb5_error_code
+    (*db_invoke) ( krb5_context context,
+		   unsigned int method,
+		   const krb5_data *req,
+		   krb5_data *rep );
+} kdb_vftabl;
+#endif /* !defined(_WIN32) */
+
 #endif /* KRB5_KDB5__ */