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, 40 insertions, 2 deletions

diff --git a/src/lib/gssapi/generic/gssapiP_generic.h b/src/lib/gssapi/generic/gssapiP_generic.h
index 03f4a1305f..894899b95c 100644
--- a/src/lib/gssapi/generic/gssapiP_generic.h
+++ b/src/lib/gssapi/generic/gssapiP_generic.h
@@ -40,7 +40,7 @@
 #include "k5-thread.h"
 
 #include "gssapi_generic.h"
-
+#include "gssapi_ext.h"
 #include "gssapi_err_generic.h"
 #include <errno.h>
 
@@ -174,11 +174,15 @@ unsigned int g_token_size (const gss_OID_desc * mech, unsigned int body_size);
 void g_make_token_header (const gss_OID_desc * mech, unsigned int body_size,
                           unsigned char **buf, int tok_type);
 
+/* flags for g_verify_token_header() */
+#define	G_VFY_TOKEN_HDR_WRAPPER_REQUIRED	0x01
+#define G_VFY_TOKEN_HDR_IGNORE_SEQ_SIZE		0x02
+
 gss_int32 g_verify_token_header (const gss_OID_desc * mech,
                                  unsigned int *body_size,
                                  unsigned char **buf, int tok_type,
                                  unsigned int toksize_in,
-                                 int wrapper_required);
+                                 int flags);
 
 OM_uint32 g_display_major_status (OM_uint32 *minor_status,
                                   OM_uint32 status_value,
@@ -257,6 +261,22 @@ generic_gss_str_to_oid(
     gss_buffer_t,       /* oid_str */
     gss_OID *);         /* oid */
 
+OM_uint32
+generic_gss_oid_compose(
+    OM_uint32 *,	/* minor_status */
+    const char *,	/* prefix */
+    size_t,		/* prefix_len */
+    int,		/* suffix */
+    gss_OID_desc *);	/* oid */
+
+OM_uint32
+generic_gss_oid_decompose(
+    OM_uint32 *,	/* minor_status */
+    const char *,	/*prefix */
+    size_t,		/* prefix_len */
+    gss_OID_desc *,	/* oid */
+    int *);		/* suffix */
+
 int gssint_mecherrmap_init(void);
 void gssint_mecherrmap_destroy(void);
 OM_uint32 gssint_mecherrmap_map(OM_uint32 minor, const gss_OID_desc *oid);
@@ -264,4 +284,22 @@ int gssint_mecherrmap_get(OM_uint32 minor, gss_OID mech_oid,
                           OM_uint32 *mech_minor);
 OM_uint32 gssint_mecherrmap_map_errcode(OM_uint32 errcode);
 
+OM_uint32 generic_gss_create_empty_buffer_set
+(OM_uint32 * /*minor_status*/,
+            gss_buffer_set_t * /*buffer_set*/);
+
+OM_uint32 generic_gss_add_buffer_set_member
+(OM_uint32 * /*minor_status*/,
+            const gss_buffer_t /*member_buffer*/,
+            gss_buffer_set_t * /*buffer_set*/);
+
+OM_uint32 generic_gss_release_buffer_set
+(OM_uint32 * /*minor_status*/,
+            gss_buffer_set_t * /*buffer_set*/);
+
+OM_uint32 generic_gss_copy_oid_set
+(OM_uint32 *, /* minor_status */
+	    const gss_OID_set_desc *, /* const oidset*/
+	    gss_OID_set * /*new_oidset*/);
+
 #endif /* _GSSAPIP_GENERIC_H_ */