s3-gse: add GENSEC_FEATURE_NEW_SPNEGO detection in gensec_gse_have_feature()
[metze/samba/wip.git] / source3 / librpc / crypto / gse.c
index 6e3066a9d05117f3f3b319d7ddd2041f642a48a7..f0b389e508ecf0c7187c31c5c9f813900b9209b3 100644 (file)
@@ -2,6 +2,8 @@
  *  GSSAPI Security Extensions
  *  RPC Pipe client and server routines
  *  Copyright (C) Simo Sorce 2010.
+ *  Copyright (C) Andrew Bartlett 2004-2011.
+ *  Copyright (C) Stefan Metzmacher <metze@samba.org> 2004-2005
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
 
 #include "includes.h"
 #include "gse.h"
+#include "libads/kerberos_proto.h"
+#include "auth/common_auth.h"
+#include "auth/gensec/gensec.h"
+#include "auth/credentials/credentials.h"
+#include "../librpc/gen_ndr/dcerpc.h"
 
 #if defined(HAVE_KRB5) && defined(HAVE_GSS_WRAP_IOV)
 
 #include "smb_krb5.h"
 #include "gse_krb5.h"
 
-#include <gssapi/gssapi.h>
-#include <gssapi/gssapi_krb5.h>
-#ifdef HAVE_GSSAPI_GSSAPI_EXT_H
-#include <gssapi/gssapi_ext.h>
+#ifndef GSS_C_DCE_STYLE
+#define GSS_C_DCE_STYLE 0x1000
 #endif
 
 #ifndef GSS_KRB5_INQ_SSPI_SESSION_KEY_OID
@@ -62,39 +67,47 @@ gss_OID_desc gse_authz_data_oid = {
        (void *)GSE_EXTRACT_RELEVANT_AUTHZ_DATA_OID
 };
 
-#ifndef GSS_KRB5_EXTRACT_AUTHTIME_FROM_SEC_CONTEXT_OID
-#define GSS_KRB5_EXTRACT_AUTHTIME_FROM_SEC_CONTEXT_OID_LENGTH 11
-#define GSS_KRB5_EXTRACT_AUTHTIME_FROM_SEC_CONTEXT_OID "\x2a\x86\x48\x86\xf7\x12\x01\x02\x02\x05\x0c"
-#endif
-
-gss_OID_desc gse_authtime_oid = {
-       GSS_KRB5_EXTRACT_AUTHTIME_FROM_SEC_CONTEXT_OID_LENGTH,
-       (void *)GSS_KRB5_EXTRACT_AUTHTIME_FROM_SEC_CONTEXT_OID
-};
-
 static char *gse_errstr(TALLOC_CTX *mem_ctx, OM_uint32 maj, OM_uint32 min);
 
 struct gse_context {
+       gss_ctx_id_t gssapi_context;
+       gss_name_t server_name;
+       gss_name_t client_name;
+       OM_uint32 gss_want_flags, gss_got_flags;
+
+       gss_cred_id_t delegated_cred_handle;
+
+       gss_krb5_lucid_context_v1_t *lucid;
+
+       /* gensec_gse only */
        krb5_context k5ctx;
        krb5_ccache ccache;
        krb5_keytab keytab;
 
-       gss_ctx_id_t gss_ctx;
-
        gss_OID_desc gss_mech;
-       OM_uint32 gss_c_flags;
        gss_cred_id_t creds;
-       gss_name_t server_name;
 
        gss_OID ret_mech;
-       OM_uint32 ret_flags;
-       gss_cred_id_t delegated_creds;
-       gss_name_t client_name;
-
-       bool more_processing;
-       bool authenticated;
 };
 
+#ifndef HAVE_GSS_OID_EQUAL
+
+static bool gss_oid_equal(const gss_OID o1, const gss_OID o2)
+{
+       if (o1 == o2) {
+               return true;
+       }
+       if ((o1 == NULL && o2 != NULL) || (o1 != NULL && o2 == NULL)) {
+               return false;
+       }
+       if (o1->length != o2->length) {
+               return false;
+       }
+       return memcmp(o1->elements, o2->elements, o1->length) == false;
+}
+
+#endif
+
 /* free non talloc dependent contexts */
 static int gse_context_destructor(void *ptr)
 {
@@ -114,9 +127,9 @@ static int gse_context_destructor(void *ptr)
                krb5_free_context(gse_ctx->k5ctx);
                gse_ctx->k5ctx = NULL;
        }
-       if (gse_ctx->gss_ctx != GSS_C_NO_CONTEXT) {
+       if (gse_ctx->gssapi_context != GSS_C_NO_CONTEXT) {
                gss_maj = gss_delete_sec_context(&gss_min,
-                                                &gse_ctx->gss_ctx,
+                                                &gse_ctx->gssapi_context,
                                                 GSS_C_NO_BUFFER);
        }
        if (gse_ctx->server_name) {
@@ -131,14 +144,23 @@ static int gse_context_destructor(void *ptr)
                gss_maj = gss_release_cred(&gss_min,
                                           &gse_ctx->creds);
        }
-       if (gse_ctx->delegated_creds) {
+       if (gse_ctx->delegated_cred_handle) {
                gss_maj = gss_release_cred(&gss_min,
-                                          &gse_ctx->delegated_creds);
-       }
-       if (gse_ctx->ret_mech) {
-               gss_maj = gss_release_oid(&gss_min,
-                                         &gse_ctx->ret_mech);
+                                          &gse_ctx->delegated_cred_handle);
        }
+
+       /* MIT and Heimdal differ as to if you can call
+        * gss_release_oid() on this OID, generated by
+        * gss_{accept,init}_sec_context().  However, as long as the
+        * oid is gss_mech_krb5 (which it always is at the moment),
+        * then this is a moot point, as both declare this particular
+        * OID static, and so no memory is lost.  This assert is in
+        * place to ensure that the programmer who wishes to extend
+        * this code to EAP or other GSS mechanisms determines an
+        * implementation-dependent way of releasing any dynamically
+        * allocated OID */
+       SMB_ASSERT(gss_oid_equal(&gse_ctx->gss_mech, GSS_C_NO_OID) || gss_oid_equal(&gse_ctx->gss_mech, gss_mech_krb5));
+
        return 0;
 }
 
@@ -160,19 +182,20 @@ static NTSTATUS gse_context_init(TALLOC_CTX *mem_ctx,
 
        memcpy(&gse_ctx->gss_mech, gss_mech_krb5, sizeof(gss_OID_desc));
 
-       gse_ctx->gss_c_flags = GSS_C_MUTUAL_FLAG |
+       gse_ctx->gss_want_flags = GSS_C_MUTUAL_FLAG |
                                GSS_C_DELEG_FLAG |
                                GSS_C_DELEG_POLICY_FLAG |
                                GSS_C_REPLAY_FLAG |
                                GSS_C_SEQUENCE_FLAG;
        if (do_sign) {
-               gse_ctx->gss_c_flags |= GSS_C_INTEG_FLAG;
+               gse_ctx->gss_want_flags |= GSS_C_INTEG_FLAG;
        }
        if (do_seal) {
-               gse_ctx->gss_c_flags |= GSS_C_CONF_FLAG;
+               gse_ctx->gss_want_flags |= GSS_C_INTEG_FLAG;
+               gse_ctx->gss_want_flags |= GSS_C_CONF_FLAG;
        }
 
-       gse_ctx->gss_c_flags |= add_gss_c_flags;
+       gse_ctx->gss_want_flags |= add_gss_c_flags;
 
        /* Initialize Kerberos Context */
        initialize_krb5_error_table();
@@ -209,15 +232,15 @@ err_out:
        return status;
 }
 
-NTSTATUS gse_init_client(TALLOC_CTX *mem_ctx,
-                         bool do_sign, bool do_seal,
-                         const char *ccache_name,
-                         const char *server,
-                         const char *service,
-                         const char *username,
-                         const char *password,
-                         uint32_t add_gss_c_flags,
-                         struct gse_context **_gse_ctx)
+static NTSTATUS gse_init_client(TALLOC_CTX *mem_ctx,
+                               bool do_sign, bool do_seal,
+                               const char *ccache_name,
+                               const char *server,
+                               const char *service,
+                               const char *username,
+                               const char *password,
+                               uint32_t add_gss_c_flags,
+                               struct gse_context **_gse_ctx)
 {
        struct gse_context *gse_ctx;
        OM_uint32 gss_maj, gss_min;
@@ -236,15 +259,22 @@ NTSTATUS gse_init_client(TALLOC_CTX *mem_ctx,
                return NT_STATUS_NO_MEMORY;
        }
 
-       name_buffer.value = talloc_asprintf(gse_ctx,
-                                           "%s@%s", service, server);
+       /* Guess the realm based on the supplied service, and avoid the GSS libs
+          doing DNS lookups which may fail.
+
+          TODO: Loop with the KDC on some more combinations (local
+          realm in particular), possibly falling back to
+          GSS_C_NT_HOSTBASED_SERVICE
+       */
+       name_buffer.value = kerberos_get_principal_from_service_hostname(gse_ctx,
+                                                                        service, server);
        if (!name_buffer.value) {
                status = NT_STATUS_NO_MEMORY;
                goto err_out;
        }
        name_buffer.length = strlen((char *)name_buffer.value);
        gss_maj = gss_import_name(&gss_min, &name_buffer,
-                                 GSS_C_NT_HOSTBASED_SERVICE,
+                                 GSS_C_NT_USER_NAME,
                                  &gse_ctx->server_name);
        if (gss_maj) {
                DEBUG(0, ("gss_import_name failed for %s, with [%s]\n",
@@ -285,10 +315,10 @@ err_out:
        return status;
 }
 
-NTSTATUS gse_get_client_auth_token(TALLOC_CTX *mem_ctx,
-                                  struct gse_context *gse_ctx,
-                                  DATA_BLOB *token_in,
-                                  DATA_BLOB *token_out)
+static NTSTATUS gse_get_client_auth_token(TALLOC_CTX *mem_ctx,
+                                         struct gse_context *gse_ctx,
+                                         const DATA_BLOB *token_in,
+                                         DATA_BLOB *token_out)
 {
        OM_uint32 gss_maj, gss_min;
        gss_buffer_desc in_data;
@@ -301,24 +331,21 @@ NTSTATUS gse_get_client_auth_token(TALLOC_CTX *mem_ctx,
 
        gss_maj = gss_init_sec_context(&gss_min,
                                        gse_ctx->creds,
-                                       &gse_ctx->gss_ctx,
+                                       &gse_ctx->gssapi_context,
                                        gse_ctx->server_name,
                                        &gse_ctx->gss_mech,
-                                       gse_ctx->gss_c_flags,
+                                       gse_ctx->gss_want_flags,
                                        0, GSS_C_NO_CHANNEL_BINDINGS,
                                        &in_data, NULL, &out_data,
-                                       NULL, NULL);
+                                       &gse_ctx->gss_got_flags, NULL);
        switch (gss_maj) {
        case GSS_S_COMPLETE:
                /* we are done with it */
-               gse_ctx->more_processing = false;
                status = NT_STATUS_OK;
                break;
        case GSS_S_CONTINUE_NEEDED:
                /* we will need a third leg */
-               gse_ctx->more_processing = true;
-               /* status = NT_STATUS_MORE_PROCESSING_REQUIRED; */
-               status = NT_STATUS_OK;
+               status = NT_STATUS_MORE_PROCESSING_REQUIRED;
                break;
        default:
                DEBUG(0, ("gss_init_sec_context failed with [%s]\n",
@@ -327,29 +354,29 @@ NTSTATUS gse_get_client_auth_token(TALLOC_CTX *mem_ctx,
                goto done;
        }
 
-       blob = data_blob_talloc(mem_ctx, out_data.value, out_data.length);
-       if (!blob.data) {
-               status = NT_STATUS_NO_MEMORY;
-       }
+       /* we may be told to return nothing */
+       if (out_data.length) {
+               blob = data_blob_talloc(mem_ctx, out_data.value, out_data.length);
+               if (!blob.data) {
+                       status = NT_STATUS_NO_MEMORY;
+               }
 
-       gss_maj = gss_release_buffer(&gss_min, &out_data);
+               gss_maj = gss_release_buffer(&gss_min, &out_data);
+       }
 
 done:
        *token_out = blob;
        return status;
 }
 
-NTSTATUS gse_init_server(TALLOC_CTX *mem_ctx,
-                        bool do_sign, bool do_seal,
-                        uint32_t add_gss_c_flags,
-                        const char *keytab_name,
-                        struct gse_context **_gse_ctx)
+static NTSTATUS gse_init_server(TALLOC_CTX *mem_ctx,
+                               bool do_sign, bool do_seal,
+                               uint32_t add_gss_c_flags,
+                               struct gse_context **_gse_ctx)
 {
        struct gse_context *gse_ctx;
        OM_uint32 gss_maj, gss_min;
-       gss_OID_set_desc mech_set;
        krb5_error_code ret;
-       const char *ktname;
        NTSTATUS status;
 
        status = gse_context_init(mem_ctx, do_sign, do_seal,
@@ -358,48 +385,72 @@ NTSTATUS gse_init_server(TALLOC_CTX *mem_ctx,
                return NT_STATUS_NO_MEMORY;
        }
 
-       if (!keytab_name) {
-               ret = gse_krb5_get_server_keytab(gse_ctx->k5ctx,
-                                                &gse_ctx->keytab);
+       ret = gse_krb5_get_server_keytab(gse_ctx->k5ctx,
+                                        &gse_ctx->keytab);
+       if (ret) {
+               status = NT_STATUS_INTERNAL_ERROR;
+               goto done;
+       }
+
+#ifdef HAVE_GSS_KRB5_IMPORT_CRED
+
+       /* This creates a GSSAPI cred_id_t with the keytab set */
+       gss_maj = gss_krb5_import_cred(&gss_min, NULL, NULL, gse_ctx->keytab, 
+                                      &gse_ctx->creds);
+
+       if (gss_maj != 0
+           && gss_maj != (GSS_S_CALL_BAD_STRUCTURE|GSS_S_BAD_NAME)) {
+               DEBUG(0, ("gss_krb5_import_cred failed with [%s]\n",
+                         gse_errstr(gse_ctx, gss_maj, gss_min)));
+               status = NT_STATUS_INTERNAL_ERROR;
+               goto done;
+
+               /* This is the error the MIT krb5 1.9 gives when it
+                * implements the function, but we do not specify the
+                * principal.  However, when we specify the principal
+                * as host$@REALM the GSS acceptor fails with 'wrong
+                * principal in request'.  Work around the issue by
+                * falling back to the alternate approach below. */
+       } else if (gss_maj == (GSS_S_CALL_BAD_STRUCTURE|GSS_S_BAD_NAME))
+#endif
+       /* FIXME!!!
+        * This call sets the default keytab for the whole server, not
+        * just for this context. Need to find a way that does not alter
+        * the state of the whole server ... */
+       {
+               const char *ktname;
+               gss_OID_set_desc mech_set;
+
+               ret = smb_krb5_keytab_name(gse_ctx, gse_ctx->k5ctx,
+                                  gse_ctx->keytab, &ktname);
                if (ret) {
                        status = NT_STATUS_INTERNAL_ERROR;
                        goto done;
                }
-               ret = smb_krb5_keytab_name(gse_ctx, gse_ctx->k5ctx,
-                                          gse_ctx->keytab, &ktname);
+
+               ret = gsskrb5_register_acceptor_identity(ktname);
                if (ret) {
                        status = NT_STATUS_INTERNAL_ERROR;
                        goto done;
                }
-       } else {
-               ktname = keytab_name;
-       }
-
-       /* FIXME!!!
-        * This call sets the default keytab for the whole server, not
-        * just for this context. Need to find a way that does not alter
-        * the state of the whole server ... */
-       ret = gsskrb5_register_acceptor_identity(ktname);
-       if (ret) {
-               status = NT_STATUS_INTERNAL_ERROR;
-               goto done;
-       }
 
-       mech_set.count = 1;
-       mech_set.elements = &gse_ctx->gss_mech;
+               mech_set.count = 1;
+               mech_set.elements = &gse_ctx->gss_mech;
 
-       gss_maj = gss_acquire_cred(&gss_min,
+               gss_maj = gss_acquire_cred(&gss_min,
                                   GSS_C_NO_NAME,
                                   GSS_C_INDEFINITE,
                                   &mech_set,
                                   GSS_C_ACCEPT,
                                   &gse_ctx->creds,
                                   NULL, NULL);
-       if (gss_maj) {
-               DEBUG(0, ("gss_acquire_creds failed with [%s]\n",
-                         gse_errstr(gse_ctx, gss_maj, gss_min)));
-               status = NT_STATUS_INTERNAL_ERROR;
-               goto done;
+
+               if (gss_maj) {
+                       DEBUG(0, ("gss_acquire_creds failed with [%s]\n",
+                                 gse_errstr(gse_ctx, gss_maj, gss_min)));
+                       status = NT_STATUS_INTERNAL_ERROR;
+                       goto done;
+               }
        }
 
        status = NT_STATUS_OK;
@@ -413,10 +464,10 @@ done:
        return status;
 }
 
-NTSTATUS gse_get_server_auth_token(TALLOC_CTX *mem_ctx,
-                                  struct gse_context *gse_ctx,
-                                  DATA_BLOB *token_in,
-                                  DATA_BLOB *token_out)
+static NTSTATUS gse_get_server_auth_token(TALLOC_CTX *mem_ctx,
+                                         struct gse_context *gse_ctx,
+                                         const DATA_BLOB *token_in,
+                                         DATA_BLOB *token_out)
 {
        OM_uint32 gss_maj, gss_min;
        gss_buffer_desc in_data;
@@ -428,35 +479,31 @@ NTSTATUS gse_get_server_auth_token(TALLOC_CTX *mem_ctx,
        in_data.length = token_in->length;
 
        gss_maj = gss_accept_sec_context(&gss_min,
-                                        &gse_ctx->gss_ctx,
+                                        &gse_ctx->gssapi_context,
                                         gse_ctx->creds,
                                         &in_data,
                                         GSS_C_NO_CHANNEL_BINDINGS,
                                         &gse_ctx->client_name,
                                         &gse_ctx->ret_mech,
                                         &out_data,
-                                        &gse_ctx->ret_flags, NULL,
-                                        &gse_ctx->delegated_creds);
+                                        &gse_ctx->gss_got_flags, NULL,
+                                        &gse_ctx->delegated_cred_handle);
        switch (gss_maj) {
        case GSS_S_COMPLETE:
                /* we are done with it */
-               gse_ctx->more_processing = false;
-               gse_ctx->authenticated = true;
                status = NT_STATUS_OK;
                break;
        case GSS_S_CONTINUE_NEEDED:
                /* we will need a third leg */
-               gse_ctx->more_processing = true;
-               /* status = NT_STATUS_MORE_PROCESSING_REQUIRED; */
-               status = NT_STATUS_OK;
+               status = NT_STATUS_MORE_PROCESSING_REQUIRED;
                break;
        default:
                DEBUG(0, ("gss_init_sec_context failed with [%s]\n",
                          gse_errstr(talloc_tos(), gss_maj, gss_min)));
 
-               if (gse_ctx->gss_ctx) {
+               if (gse_ctx->gssapi_context) {
                        gss_delete_sec_context(&gss_min,
-                                               &gse_ctx->gss_ctx,
+                                               &gse_ctx->gssapi_context,
                                                GSS_C_NO_BUFFER);
                }
 
@@ -479,39 +526,45 @@ done:
        return status;
 }
 
-NTSTATUS gse_verify_server_auth_flags(struct gse_context *gse_ctx)
+static NTSTATUS gse_verify_server_auth_flags(struct gse_context *gse_ctx)
 {
-       if (!gse_ctx->authenticated) {
-               return NT_STATUS_INVALID_HANDLE;
-       }
-
        if (memcmp(gse_ctx->ret_mech,
                   gss_mech_krb5, sizeof(gss_OID_desc)) != 0) {
                return NT_STATUS_ACCESS_DENIED;
        }
 
        /* GSS_C_MUTUAL_FLAG */
-       if (gse_ctx->gss_c_flags & GSS_C_MUTUAL_FLAG) {
-               if (!(gse_ctx->ret_flags & GSS_C_MUTUAL_FLAG)) {
-                       return NT_STATUS_ACCESS_DENIED;
-               }
-       }
-
        /* GSS_C_DELEG_FLAG */
        /* GSS_C_DELEG_POLICY_FLAG */
        /* GSS_C_REPLAY_FLAG */
        /* GSS_C_SEQUENCE_FLAG */
 
        /* GSS_C_INTEG_FLAG */
-       if (gse_ctx->gss_c_flags & GSS_C_INTEG_FLAG) {
-               if (!(gse_ctx->ret_flags & GSS_C_INTEG_FLAG)) {
+       if (gse_ctx->gss_want_flags & GSS_C_INTEG_FLAG) {
+               if (!(gse_ctx->gss_got_flags & GSS_C_INTEG_FLAG)) {
                        return NT_STATUS_ACCESS_DENIED;
                }
        }
 
        /* GSS_C_CONF_FLAG */
-       if (gse_ctx->gss_c_flags & GSS_C_CONF_FLAG) {
-               if (!(gse_ctx->ret_flags & GSS_C_CONF_FLAG)) {
+       if (gse_ctx->gss_want_flags & GSS_C_CONF_FLAG) {
+               if (!(gse_ctx->gss_got_flags & GSS_C_CONF_FLAG)) {
+                       return NT_STATUS_ACCESS_DENIED;
+               }
+
+               /* GSS_C_CONF_FLAG implies GSS_C_INTEG_FLAG */
+               if (!(gse_ctx->gss_got_flags & GSS_C_INTEG_FLAG)) {
+                       return NT_STATUS_ACCESS_DENIED;
+               }
+       }
+
+       /* GSS_C_DCE_STYLE */
+       if (gse_ctx->gss_want_flags & GSS_C_DCE_STYLE) {
+               if (!(gse_ctx->gss_got_flags & GSS_C_DCE_STYLE)) {
+                       return NT_STATUS_ACCESS_DENIED;
+               }
+               /* GSS_C_DCE_STYLE implies GSS_C_MUTUAL_FLAG */
+               if (!(gse_ctx->gss_got_flags & GSS_C_MUTUAL_FLAG)) {
                        return NT_STATUS_ACCESS_DENIED;
                }
        }
@@ -536,6 +589,12 @@ static char *gse_errstr(TALLOC_CTX *mem_ctx, OM_uint32 maj, OM_uint32 min)
        if (gss_maj) {
                goto done;
        }
+       errstr = talloc_strndup(mem_ctx,
+                               (char *)msg_maj.value,
+                                       msg_maj.length);
+       if (!errstr) {
+               goto done;
+       }
        gss_maj = gss_display_status(&gss_min, min, GSS_C_MECH_CODE,
                                     (gss_OID)discard_const(gss_mech_krb5),
                                     &msg_ctx, &msg_min);
@@ -543,12 +602,6 @@ static char *gse_errstr(TALLOC_CTX *mem_ctx, OM_uint32 maj, OM_uint32 min)
                goto done;
        }
 
-       errstr = talloc_strndup(mem_ctx,
-                               (char *)msg_maj.value,
-                                       msg_maj.length);
-       if (!errstr) {
-               goto done;
-       }
        errstr = talloc_strdup_append_buffer(errstr, ": ");
        if (!errstr) {
                goto done;
@@ -570,20 +623,45 @@ done:
        return errstr;
 }
 
-bool gse_require_more_processing(struct gse_context *gse_ctx)
+static NTSTATUS gse_init_lucid(struct gse_context *gse_ctx)
 {
-       return gse_ctx->more_processing;
+       OM_uint32 maj_stat, min_stat;
+       void *ptr = NULL;
+
+       if (gse_ctx->lucid) {
+               return NT_STATUS_OK;
+       }
+
+       maj_stat = gss_krb5_export_lucid_sec_context(&min_stat,
+                                                    &gse_ctx->gssapi_context,
+                                                    1, &ptr);
+       if (maj_stat != GSS_S_COMPLETE) {
+               DEBUG(0,("gse_init_lucid: %s\n",
+                       gse_errstr(talloc_tos(), maj_stat, min_stat)));
+               return NT_STATUS_INTERNAL_ERROR;
+       }
+       gse_ctx->lucid = (gss_krb5_lucid_context_v1_t *)ptr;
+
+       if (gse_ctx->lucid->version != 1) {
+               DEBUG(0,("gse_init_lucid: lucid version[%d] != 1\n",
+                       gse_ctx->lucid->version));
+               gss_krb5_free_lucid_sec_context(&min_stat, gse_ctx->lucid);
+               gse_ctx->lucid = NULL;
+               return NT_STATUS_INTERNAL_ERROR;
+       }
+
+       return NT_STATUS_OK;
 }
 
-DATA_BLOB gse_get_session_key(TALLOC_CTX *mem_ctx,
-                               struct gse_context *gse_ctx)
+static DATA_BLOB gse_get_session_key(TALLOC_CTX *mem_ctx,
+                                    struct gse_context *gse_ctx)
 {
        OM_uint32 gss_min, gss_maj;
        gss_buffer_set_t set = GSS_C_NO_BUFFER_SET;
        DATA_BLOB ret;
 
        gss_maj = gss_inquire_sec_context_by_oid(
-                               &gss_min, gse_ctx->gss_ctx,
+                               &gss_min, gse_ctx->gssapi_context,
                                &gse_sesskey_inq_oid, &set);
        if (gss_maj) {
                DEBUG(0, ("gss_inquire_sec_context_by_oid failed [%s]\n",
@@ -596,11 +674,26 @@ DATA_BLOB gse_get_session_key(TALLOC_CTX *mem_ctx,
            (memcmp(set->elements[1].value,
                    gse_sesskeytype_oid.elements,
                    gse_sesskeytype_oid.length) != 0)) {
+#ifdef HAVE_GSSKRB5_GET_SUBKEY
+               krb5_keyblock *subkey;
+               gss_maj = gsskrb5_get_subkey(&gss_min,
+                                            gse_ctx->gssapi_context,
+                                            &subkey);
+               if (gss_maj != 0) {
+                       DEBUG(1, ("NO session key for this mech\n"));
+                       return data_blob_null;
+               }
+               ret = data_blob_talloc(mem_ctx,
+                                      KRB5_KEY_DATA(subkey), KRB5_KEY_LENGTH(subkey));
+               krb5_free_keyblock(NULL /* should be krb5_context */, subkey);
+               return ret;
+#else
                DEBUG(0, ("gss_inquire_sec_context_by_oid returned unknown "
                          "OID for data in results:\n"));
                dump_data(1, (uint8_t *)set->elements[1].value,
                             set->elements[1].length);
                return data_blob_null;
+#endif
        }
 
        ret = data_blob_talloc(mem_ctx, set->elements[0].value,
@@ -610,133 +703,24 @@ DATA_BLOB gse_get_session_key(TALLOC_CTX *mem_ctx,
        return ret;
 }
 
-NTSTATUS gse_get_client_name(struct gse_context *gse_ctx,
-                            TALLOC_CTX *mem_ctx, char **cli_name)
-{
-       OM_uint32 gss_min, gss_maj;
-       gss_buffer_desc name_buffer;
-
-       if (!gse_ctx->authenticated) {
-               return NT_STATUS_ACCESS_DENIED;
-       }
-
-       if (!gse_ctx->client_name) {
-               return NT_STATUS_NOT_FOUND;
-       }
-
-       /* TODO: check OID matches KRB5 Principal Name OID ? */
-
-       gss_maj = gss_display_name(&gss_min,
-                                  gse_ctx->client_name,
-                                  &name_buffer, NULL);
-       if (gss_maj) {
-               DEBUG(0, ("gss_display_name failed [%s]\n",
-                         gse_errstr(talloc_tos(), gss_maj, gss_min)));
-               return NT_STATUS_INTERNAL_ERROR;
-       }
-
-       *cli_name = talloc_strndup(talloc_tos(),
-                                       (char *)name_buffer.value,
-                                       name_buffer.length);
-
-       gss_maj = gss_release_buffer(&gss_min, &name_buffer);
-
-       if (!*cli_name) {
-               return NT_STATUS_NO_MEMORY;
-       }
-
-       return NT_STATUS_OK;
-}
-
-NTSTATUS gse_get_authz_data(struct gse_context *gse_ctx,
-                           TALLOC_CTX *mem_ctx, DATA_BLOB *pac)
-{
-       OM_uint32 gss_min, gss_maj;
-       gss_buffer_set_t set = GSS_C_NO_BUFFER_SET;
-
-       if (!gse_ctx->authenticated) {
-               return NT_STATUS_ACCESS_DENIED;
-       }
-
-       gss_maj = gss_inquire_sec_context_by_oid(
-                               &gss_min, gse_ctx->gss_ctx,
-                               &gse_authz_data_oid, &set);
-       if (gss_maj) {
-               DEBUG(0, ("gss_inquire_sec_context_by_oid failed [%s]\n",
-                         gse_errstr(talloc_tos(), gss_maj, gss_min)));
-               return NT_STATUS_NOT_FOUND;
-       }
-
-       if (set == GSS_C_NO_BUFFER_SET) {
-               DEBUG(0, ("gss_inquire_sec_context_by_oid returned unknown "
-                         "data in results.\n"));
-               return NT_STATUS_INTERNAL_ERROR;
-       }
-
-       /* for now we just hope it is the first value */
-       *pac = data_blob_talloc(mem_ctx,
-                               set->elements[0].value,
-                               set->elements[0].length);
-
-       gss_maj = gss_release_buffer_set(&gss_min, &set);
-
-       return NT_STATUS_OK;
-}
-
-NTSTATUS gse_get_authtime(struct gse_context *gse_ctx, time_t *authtime)
-{
-       OM_uint32 gss_min, gss_maj;
-       gss_buffer_set_t set = GSS_C_NO_BUFFER_SET;
-       int32_t tkttime;
-
-       if (!gse_ctx->authenticated) {
-               return NT_STATUS_ACCESS_DENIED;
-       }
-
-       gss_maj = gss_inquire_sec_context_by_oid(
-                               &gss_min, gse_ctx->gss_ctx,
-                               &gse_authtime_oid, &set);
-       if (gss_maj) {
-               DEBUG(0, ("gss_inquire_sec_context_by_oid failed [%s]\n",
-                         gse_errstr(talloc_tos(), gss_maj, gss_min)));
-               return NT_STATUS_NOT_FOUND;
-       }
-
-       if ((set == GSS_C_NO_BUFFER_SET) || (set->count != 1) != 0) {
-               DEBUG(0, ("gss_inquire_sec_context_by_oid returned unknown "
-                         "data in results.\n"));
-               return NT_STATUS_INTERNAL_ERROR;
-       }
-
-       if (set->elements[0].length != sizeof(int32_t)) {
-               DEBUG(0, ("Invalid authtime size!\n"));
-               return NT_STATUS_INTERNAL_ERROR;
-       }
-
-       tkttime = *((int32_t *)set->elements[0].value);
-
-       gss_maj = gss_release_buffer_set(&gss_min, &set);
-
-       *authtime = (time_t)tkttime;
-       return NT_STATUS_OK;
-}
-
-size_t gse_get_signature_length(struct gse_context *gse_ctx,
-                               int seal, size_t payload_size)
+static size_t gse_get_signature_length(struct gse_context *gse_ctx,
+                                      bool seal, size_t payload_size)
 {
        OM_uint32 gss_min, gss_maj;
        gss_iov_buffer_desc iov[2];
-       uint8_t fakebuf[payload_size];
        int sealed;
 
+       /*
+        * gss_wrap_iov_length() only needs the type and length
+        */
        iov[0].type = GSS_IOV_BUFFER_TYPE_HEADER;
        iov[0].buffer.value = NULL;
        iov[0].buffer.length = 0;
        iov[1].type = GSS_IOV_BUFFER_TYPE_DATA;
-       iov[1].buffer.value = fakebuf;
+       iov[1].buffer.value = NULL;
        iov[1].buffer.length = payload_size;
 
-       gss_maj = gss_wrap_iov_length(&gss_min, gse_ctx->gss_ctx,
+       gss_maj = gss_wrap_iov_length(&gss_min, gse_ctx->gssapi_context,
                                        seal, GSS_C_QOP_DEFAULT,
                                        &sealed, iov, 2);
        if (gss_maj) {
@@ -748,17 +732,17 @@ size_t gse_get_signature_length(struct gse_context *gse_ctx,
        return iov[0].buffer.length;
 }
 
-NTSTATUS gse_seal(TALLOC_CTX *mem_ctx, struct gse_context *gse_ctx,
-                 DATA_BLOB *data, DATA_BLOB *signature)
+static NTSTATUS gse_seal(TALLOC_CTX *mem_ctx, struct gse_context *gse_ctx,
+                        DATA_BLOB *data, DATA_BLOB *signature)
 {
        OM_uint32 gss_min, gss_maj;
        gss_iov_buffer_desc iov[2];
        int req_seal = 1; /* setting to 1 means we request sign+seal */
-       int sealed;
+       int sealed = 1;
        NTSTATUS status;
 
        /* allocate the memory ourselves so we do not need to talloc_memdup */
-       signature->length = gse_get_signature_length(gse_ctx, 1, data->length);
+       signature->length = gse_get_signature_length(gse_ctx, true, data->length);
        if (!signature->length) {
                return NT_STATUS_INTERNAL_ERROR;
        }
@@ -775,7 +759,7 @@ NTSTATUS gse_seal(TALLOC_CTX *mem_ctx, struct gse_context *gse_ctx,
        iov[1].buffer.value = data->data;
        iov[1].buffer.length = data->length;
 
-       gss_maj = gss_wrap_iov(&gss_min, gse_ctx->gss_ctx,
+       gss_maj = gss_wrap_iov(&gss_min, gse_ctx->gssapi_context,
                                req_seal, GSS_C_QOP_DEFAULT,
                                &sealed, iov, 2);
        if (gss_maj) {
@@ -800,8 +784,8 @@ done:
        return status;
 }
 
-NTSTATUS gse_unseal(TALLOC_CTX *mem_ctx, struct gse_context *gse_ctx,
-                   DATA_BLOB *data, DATA_BLOB *signature)
+static NTSTATUS gse_unseal(TALLOC_CTX *mem_ctx, struct gse_context *gse_ctx,
+                          DATA_BLOB *data, const DATA_BLOB *signature)
 {
        OM_uint32 gss_min, gss_maj;
        gss_iov_buffer_desc iov[2];
@@ -817,7 +801,7 @@ NTSTATUS gse_unseal(TALLOC_CTX *mem_ctx, struct gse_context *gse_ctx,
        iov[1].buffer.value = data->data;
        iov[1].buffer.length = data->length;
 
-       gss_maj = gss_unwrap_iov(&gss_min, gse_ctx->gss_ctx,
+       gss_maj = gss_unwrap_iov(&gss_min, gse_ctx->gssapi_context,
                                 &sealed, NULL, iov, 2);
        if (gss_maj) {
                DEBUG(0, ("gss_unwrap_iov failed with [%s]\n",
@@ -841,8 +825,8 @@ done:
        return status;
 }
 
-NTSTATUS gse_sign(TALLOC_CTX *mem_ctx, struct gse_context *gse_ctx,
-                 DATA_BLOB *data, DATA_BLOB *signature)
+static NTSTATUS gse_sign(TALLOC_CTX *mem_ctx, struct gse_context *gse_ctx,
+                        DATA_BLOB *data, DATA_BLOB *signature)
 {
        OM_uint32 gss_min, gss_maj;
        gss_buffer_desc in_data = { 0, NULL };
@@ -852,7 +836,7 @@ NTSTATUS gse_sign(TALLOC_CTX *mem_ctx, struct gse_context *gse_ctx,
        in_data.value = data->data;
        in_data.length = data->length;
 
-       gss_maj = gss_get_mic(&gss_min, gse_ctx->gss_ctx,
+       gss_maj = gss_get_mic(&gss_min, gse_ctx->gssapi_context,
                              GSS_C_QOP_DEFAULT,
                              &in_data, &out_data);
        if (gss_maj) {
@@ -878,8 +862,8 @@ done:
        return status;
 }
 
-NTSTATUS gse_sigcheck(TALLOC_CTX *mem_ctx, struct gse_context *gse_ctx,
-                     DATA_BLOB *data, DATA_BLOB *signature)
+static NTSTATUS gse_sigcheck(TALLOC_CTX *mem_ctx, struct gse_context *gse_ctx,
+                            const DATA_BLOB *data, const DATA_BLOB *signature)
 {
        OM_uint32 gss_min, gss_maj;
        gss_buffer_desc in_data = { 0, NULL };
@@ -891,7 +875,7 @@ NTSTATUS gse_sigcheck(TALLOC_CTX *mem_ctx, struct gse_context *gse_ctx,
        in_token.value = signature->data;
        in_token.length = signature->length;
 
-       gss_maj = gss_verify_mic(&gss_min, gse_ctx->gss_ctx,
+       gss_maj = gss_verify_mic(&gss_min, gse_ctx->gssapi_context,
                                 &in_data, &in_token, NULL);
        if (gss_maj) {
                DEBUG(0, ("gss_verify_mic failed with [%s]\n",
@@ -906,107 +890,453 @@ done:
        return status;
 }
 
-#else
-
-NTSTATUS gse_init_client(TALLOC_CTX *mem_ctx,
-                         bool do_sign, bool do_seal,
-                         const char *ccache_name,
-                         const char *server,
-                         const char *service,
-                         const char *username,
-                         const char *password,
-                         uint32_t add_gss_c_flags,
-                         struct gse_context **_gse_ctx)
+static NTSTATUS gensec_gse_client_start(struct gensec_security *gensec_security)
 {
-       return NT_STATUS_NOT_IMPLEMENTED;
-}
+       struct gse_context *gse_ctx;
+       struct cli_credentials *creds = gensec_get_credentials(gensec_security);
+       NTSTATUS nt_status;
+       OM_uint32 want_flags = 0;
+       bool do_sign = false, do_seal = false;
+       const char *hostname = gensec_get_target_hostname(gensec_security);
+       const char *service = gensec_get_target_service(gensec_security);
+       const char *username = cli_credentials_get_username(creds);
+       const char *password = cli_credentials_get_password(creds);
+
+       if (!hostname) {
+               DEBUG(1, ("Could not determine hostname for target computer, cannot use kerberos\n"));
+               return NT_STATUS_INVALID_PARAMETER;
+       }
+       if (is_ipaddress(hostname)) {
+               DEBUG(2, ("Cannot do GSE to an IP address\n"));
+               return NT_STATUS_INVALID_PARAMETER;
+       }
+       if (strcmp(hostname, "localhost") == 0) {
+               DEBUG(2, ("GSE to 'localhost' does not make sense\n"));
+               return NT_STATUS_INVALID_PARAMETER;
+       }
 
-NTSTATUS gse_get_client_auth_token(TALLOC_CTX *mem_ctx,
-                                  struct gse_context *gse_ctx,
-                                  DATA_BLOB *token_in,
-                                  DATA_BLOB *token_out)
-{
-       return NT_STATUS_NOT_IMPLEMENTED;
+       if (gensec_security->want_features & GENSEC_FEATURE_SIGN) {
+               do_sign = true;
+       }
+       if (gensec_security->want_features & GENSEC_FEATURE_SEAL) {
+               do_seal = true;
+       }
+       if (gensec_security->want_features & GENSEC_FEATURE_DCE_STYLE) {
+               want_flags |= GSS_C_DCE_STYLE;
+       }
+
+       nt_status = gse_init_client(gensec_security, do_sign, do_seal, NULL,
+                                   hostname, service,
+                                   username, password, want_flags,
+                                   &gse_ctx);
+       if (!NT_STATUS_IS_OK(nt_status)) {
+               return nt_status;
+       }
+       gensec_security->private_data = gse_ctx;
+       return NT_STATUS_OK;
 }
 
-NTSTATUS gse_init_server(TALLOC_CTX *mem_ctx,
-                        bool do_sign, bool do_seal,
-                        uint32_t add_gss_c_flags,
-                        const char *keytab,
-                        struct gse_context **_gse_ctx)
+static NTSTATUS gensec_gse_server_start(struct gensec_security *gensec_security)
 {
-       return NT_STATUS_NOT_IMPLEMENTED;
+       struct gse_context *gse_ctx;
+       NTSTATUS nt_status;
+       OM_uint32 want_flags = 0;
+       bool do_sign = false, do_seal = false;
+
+       if (gensec_security->want_features & GENSEC_FEATURE_SIGN) {
+               do_sign = true;
+       }
+       if (gensec_security->want_features & GENSEC_FEATURE_SEAL) {
+               do_seal = true;
+       }
+       if (gensec_security->want_features & GENSEC_FEATURE_DCE_STYLE) {
+               want_flags |= GSS_C_DCE_STYLE;
+       }
+
+       nt_status = gse_init_server(gensec_security, do_sign, do_seal, want_flags,
+                                   &gse_ctx);
+       if (!NT_STATUS_IS_OK(nt_status)) {
+               return nt_status;
+       }
+       gensec_security->private_data = gse_ctx;
+       return NT_STATUS_OK;
 }
 
-NTSTATUS gse_get_server_auth_token(TALLOC_CTX *mem_ctx,
-                                  struct gse_context *gse_ctx,
-                                  DATA_BLOB *token_in,
-                                  DATA_BLOB *token_out)
+/**
+ * Check if the packet is one for this mechansim
+ *
+ * @param gensec_security GENSEC state
+ * @param in The request, as a DATA_BLOB
+ * @return Error, INVALID_PARAMETER if it's not a packet for us
+ *                or NT_STATUS_OK if the packet is ok.
+ */
+
+static NTSTATUS gensec_gse_magic(struct gensec_security *gensec_security,
+                                const DATA_BLOB *in)
 {
-       return NT_STATUS_NOT_IMPLEMENTED;
+       if (gensec_gssapi_check_oid(in, GENSEC_OID_KERBEROS5)) {
+               return NT_STATUS_OK;
+       } else {
+               return NT_STATUS_INVALID_PARAMETER;
+       }
 }
 
-NTSTATUS gse_verify_server_auth_flags(struct gse_context *gse_ctx)
+
+/**
+ * Next state function for the GSE GENSEC mechanism
+ *
+ * @param gensec_gse_state GSE State
+ * @param mem_ctx The TALLOC_CTX for *out to be allocated on
+ * @param in The request, as a DATA_BLOB
+ * @param out The reply, as an talloc()ed DATA_BLOB, on *mem_ctx
+ * @return Error, MORE_PROCESSING_REQUIRED if a reply is sent,
+ *                or NT_STATUS_OK if the user is authenticated.
+ */
+
+static NTSTATUS gensec_gse_update(struct gensec_security *gensec_security,
+                                 TALLOC_CTX *mem_ctx,
+                                 struct tevent_context *ev,
+                                 const DATA_BLOB in, DATA_BLOB *out)
 {
-       return NT_STATUS_NOT_IMPLEMENTED;
+       NTSTATUS status;
+       struct gse_context *gse_ctx =
+               talloc_get_type_abort(gensec_security->private_data,
+               struct gse_context);
+
+       switch (gensec_security->gensec_role) {
+       case GENSEC_CLIENT:
+               status = gse_get_client_auth_token(mem_ctx, gse_ctx,
+                                                  &in, out);
+               break;
+       case GENSEC_SERVER:
+               status = gse_get_server_auth_token(mem_ctx, gse_ctx,
+                                                  &in, out);
+               break;
+       }
+       if (!NT_STATUS_IS_OK(status)) {
+               return status;
+       }
+
+       if (gensec_security->gensec_role == GENSEC_SERVER) {
+               return gse_verify_server_auth_flags(gse_ctx);
+       }
+
+       return NT_STATUS_OK;
 }
 
-bool gse_require_more_processing(struct gse_context *gse_ctx)
+static NTSTATUS gensec_gse_wrap(struct gensec_security *gensec_security,
+                               TALLOC_CTX *mem_ctx,
+                               const DATA_BLOB *in,
+                               DATA_BLOB *out)
 {
-       return false;
+       struct gse_context *gse_ctx =
+               talloc_get_type_abort(gensec_security->private_data,
+               struct gse_context);
+       OM_uint32 maj_stat, min_stat;
+       gss_buffer_desc input_token, output_token;
+       int conf_state;
+       input_token.length = in->length;
+       input_token.value = in->data;
+
+       maj_stat = gss_wrap(&min_stat,
+                           gse_ctx->gssapi_context,
+                           gensec_have_feature(gensec_security, GENSEC_FEATURE_SEAL),
+                           GSS_C_QOP_DEFAULT,
+                           &input_token,
+                           &conf_state,
+                           &output_token);
+       if (GSS_ERROR(maj_stat)) {
+               DEBUG(0, ("gensec_gse_wrap: GSS Wrap failed: %s\n",
+                         gse_errstr(talloc_tos(), maj_stat, min_stat)));
+               return NT_STATUS_ACCESS_DENIED;
+       }
+
+       *out = data_blob_talloc(mem_ctx, output_token.value, output_token.length);
+       gss_release_buffer(&min_stat, &output_token);
+
+       if (gensec_have_feature(gensec_security, GENSEC_FEATURE_SEAL)
+           && !conf_state) {
+               return NT_STATUS_ACCESS_DENIED;
+       }
+       return NT_STATUS_OK;
 }
 
-DATA_BLOB gse_get_session_key(TALLOC_CTX *mem_ctx,
-                             struct gse_context *gse_ctx)
+static NTSTATUS gensec_gse_unwrap(struct gensec_security *gensec_security,
+                                    TALLOC_CTX *mem_ctx,
+                                    const DATA_BLOB *in,
+                                    DATA_BLOB *out)
 {
-       return data_blob_null;
+       struct gse_context *gse_ctx =
+               talloc_get_type_abort(gensec_security->private_data,
+               struct gse_context);
+       OM_uint32 maj_stat, min_stat;
+       gss_buffer_desc input_token, output_token;
+       int conf_state;
+       gss_qop_t qop_state;
+       input_token.length = in->length;
+       input_token.value = in->data;
+
+       maj_stat = gss_unwrap(&min_stat,
+                             gse_ctx->gssapi_context,
+                             &input_token,
+                             &output_token,
+                             &conf_state,
+                             &qop_state);
+       if (GSS_ERROR(maj_stat)) {
+               DEBUG(0, ("gensec_gse_unwrap: GSS UnWrap failed: %s\n",
+                         gse_errstr(talloc_tos(), maj_stat, min_stat)));
+               return NT_STATUS_ACCESS_DENIED;
+       }
+
+       *out = data_blob_talloc(mem_ctx, output_token.value, output_token.length);
+       gss_release_buffer(&min_stat, &output_token);
+
+       if (gensec_have_feature(gensec_security, GENSEC_FEATURE_SEAL)
+           && !conf_state) {
+               return NT_STATUS_ACCESS_DENIED;
+       }
+       return NT_STATUS_OK;
 }
 
-NTSTATUS gse_get_client_name(struct gse_context *gse_ctx,
-                            TALLOC_CTX *mem_ctx, char **cli_name)
+static NTSTATUS gensec_gse_seal_packet(struct gensec_security *gensec_security,
+                                      TALLOC_CTX *mem_ctx,
+                                      uint8_t *data, size_t length,
+                                      const uint8_t *whole_pdu, size_t pdu_length,
+                                      DATA_BLOB *sig)
 {
-       return NT_STATUS_NOT_IMPLEMENTED;
+       struct gse_context *gse_ctx =
+               talloc_get_type_abort(gensec_security->private_data,
+               struct gse_context);
+       DATA_BLOB payload = data_blob_const(data, length);
+       return gse_seal(mem_ctx, gse_ctx, &payload, sig);
 }
 
-NTSTATUS gse_get_authz_data(struct gse_context *gse_ctx,
-                           TALLOC_CTX *mem_ctx, DATA_BLOB *pac)
+static NTSTATUS gensec_gse_unseal_packet(struct gensec_security *gensec_security,
+                                        uint8_t *data, size_t length,
+                                        const uint8_t *whole_pdu, size_t pdu_length,
+                                        const DATA_BLOB *sig)
 {
-       return NT_STATUS_NOT_IMPLEMENTED;
+       struct gse_context *gse_ctx =
+               talloc_get_type_abort(gensec_security->private_data,
+               struct gse_context);
+       DATA_BLOB payload = data_blob_const(data, length);
+       return gse_unseal(talloc_tos() /* unused */, gse_ctx, &payload, sig);
 }
 
-NTSTATUS gse_get_authtime(struct gse_context *gse_ctx, time_t *authtime)
+static NTSTATUS gensec_gse_sign_packet(struct gensec_security *gensec_security,
+                                      TALLOC_CTX *mem_ctx,
+                                      const uint8_t *data, size_t length,
+                                      const uint8_t *whole_pdu, size_t pdu_length,
+                                      DATA_BLOB *sig)
 {
-       return NT_STATUS_NOT_IMPLEMENTED;
+       struct gse_context *gse_ctx =
+               talloc_get_type_abort(gensec_security->private_data,
+               struct gse_context);
+       DATA_BLOB payload = data_blob_const(data, length);
+       return gse_sign(mem_ctx, gse_ctx, &payload, sig);
 }
 
-size_t gse_get_signature_length(struct gse_context *gse_ctx,
-                               int seal, size_t payload_size)
+static NTSTATUS gensec_gse_check_packet(struct gensec_security *gensec_security,
+                                       const uint8_t *data, size_t length,
+                                       const uint8_t *whole_pdu, size_t pdu_length,
+                                       const DATA_BLOB *sig)
 {
-       return 0;
+       struct gse_context *gse_ctx =
+               talloc_get_type_abort(gensec_security->private_data,
+               struct gse_context);
+       DATA_BLOB payload = data_blob_const(data, length);
+       return gse_sigcheck(NULL, gse_ctx, &payload, sig);
 }
 
-NTSTATUS gse_seal(TALLOC_CTX *mem_ctx, struct gse_context *gse_ctx,
-                 DATA_BLOB *data, DATA_BLOB *signature)
+/* Try to figure out what features we actually got on the connection */
+static bool gensec_gse_have_feature(struct gensec_security *gensec_security,
+                                   uint32_t feature)
 {
-       return NT_STATUS_NOT_IMPLEMENTED;
+       struct gse_context *gse_ctx =
+               talloc_get_type_abort(gensec_security->private_data,
+               struct gse_context);
+
+       if (feature & GENSEC_FEATURE_SIGN) {
+               return gse_ctx->gss_got_flags & GSS_C_INTEG_FLAG;
+       }
+       if (feature & GENSEC_FEATURE_SEAL) {
+               return gse_ctx->gss_got_flags & GSS_C_CONF_FLAG;
+       }
+       if (feature & GENSEC_FEATURE_SESSION_KEY) {
+               /* Only for GSE/Krb5 */
+               if (gss_oid_equal(gse_ctx->ret_mech, gss_mech_krb5)) {
+                       return true;
+               }
+       }
+       if (feature & GENSEC_FEATURE_DCE_STYLE) {
+               return gse_ctx->gss_got_flags & GSS_C_DCE_STYLE;
+       }
+       if (feature & GENSEC_FEATURE_NEW_SPNEGO) {
+               NTSTATUS status;
+
+               if (!(gse_ctx->gss_got_flags & GSS_C_INTEG_FLAG)) {
+                       return false;
+               }
+
+               status = gse_init_lucid(gse_ctx);
+               if (!NT_STATUS_IS_OK(status)) {
+                       return false;
+               }
+
+               if (gse_ctx->lucid->protocol == 1) {
+                       return true;
+               }
+
+               return false;
+       }
+       /* We can always do async (rather than strict request/reply) packets.  */
+       if (feature & GENSEC_FEATURE_ASYNC_REPLIES) {
+               return true;
+       }
+       return false;
 }
 
-NTSTATUS gse_unseal(TALLOC_CTX *mem_ctx, struct gse_context *gse_ctx,
-                   DATA_BLOB *data, DATA_BLOB *signature)
+/*
+ * Extract the 'sesssion key' needed by SMB signing and ncacn_np
+ * (for encrypting some passwords).
+ *
+ * This breaks all the abstractions, but what do you expect...
+ */
+static NTSTATUS gensec_gse_session_key(struct gensec_security *gensec_security,
+                                      TALLOC_CTX *mem_ctx,
+                                      DATA_BLOB *session_key_out)
 {
-       return NT_STATUS_NOT_IMPLEMENTED;
+       struct gse_context *gse_ctx =
+               talloc_get_type_abort(gensec_security->private_data,
+               struct gse_context);
+
+       DATA_BLOB session_key = gse_get_session_key(mem_ctx, gse_ctx);
+       if (session_key.data == NULL) {
+               return NT_STATUS_NO_USER_SESSION_KEY;
+       }
+
+       *session_key_out = session_key;
+
+       return NT_STATUS_OK;
 }
 
-NTSTATUS gse_sign(TALLOC_CTX *mem_ctx, struct gse_context *gse_ctx,
-                 DATA_BLOB *data, DATA_BLOB *signature)
+/* Get some basic (and authorization) information about the user on
+ * this session.  This uses either the PAC (if present) or a local
+ * database lookup */
+static NTSTATUS gensec_gse_session_info(struct gensec_security *gensec_security,
+                                       TALLOC_CTX *mem_ctx,
+                                       struct auth_session_info **_session_info)
 {
-       return NT_STATUS_NOT_IMPLEMENTED;
+       struct gse_context *gse_ctx =
+               talloc_get_type_abort(gensec_security->private_data,
+               struct gse_context);
+       NTSTATUS nt_status;
+       TALLOC_CTX *tmp_ctx;
+       struct auth_session_info *session_info = NULL;
+       OM_uint32 maj_stat, min_stat;
+       DATA_BLOB pac_blob, *pac_blob_ptr = NULL;
+
+       gss_buffer_desc name_token;
+       char *principal_string;
+
+       tmp_ctx = talloc_named(mem_ctx, 0, "gensec_gse_session_info context");
+       NT_STATUS_HAVE_NO_MEMORY(tmp_ctx);
+
+       maj_stat = gss_display_name(&min_stat,
+                                   gse_ctx->client_name,
+                                   &name_token,
+                                   NULL);
+       if (GSS_ERROR(maj_stat)) {
+               DEBUG(1, ("GSS display_name failed: %s\n",
+                         gse_errstr(talloc_tos(), maj_stat, min_stat)));
+               talloc_free(tmp_ctx);
+               return NT_STATUS_FOOBAR;
+       }
+
+       principal_string = talloc_strndup(tmp_ctx,
+                                         (const char *)name_token.value,
+                                         name_token.length);
+
+       gss_release_buffer(&min_stat, &name_token);
+
+       if (!principal_string) {
+               talloc_free(tmp_ctx);
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       nt_status = gssapi_obtain_pac_blob(tmp_ctx,  gse_ctx->gssapi_context,
+                                          gse_ctx->client_name,
+                                          &pac_blob);
+
+       /* IF we have the PAC - otherwise we need to get this
+        * data from elsewere
+        */
+       if (NT_STATUS_IS_OK(nt_status)) {
+               pac_blob_ptr = &pac_blob;
+       }
+       nt_status = gensec_generate_session_info_pac(tmp_ctx,
+                                                    gensec_security,
+                                                    NULL,
+                                                    pac_blob_ptr, principal_string,
+                                                    gensec_get_remote_address(gensec_security),
+                                                    &session_info);
+       if (!NT_STATUS_IS_OK(nt_status)) {
+               talloc_free(tmp_ctx);
+               return nt_status;
+       }
+
+       nt_status = gensec_gse_session_key(gensec_security, session_info,
+                                          &session_info->session_key);
+       if (!NT_STATUS_IS_OK(nt_status)) {
+               talloc_free(tmp_ctx);
+               return nt_status;
+       }
+
+       *_session_info = talloc_move(mem_ctx, &session_info);
+       talloc_free(tmp_ctx);
+
+       return NT_STATUS_OK;
 }
 
-NTSTATUS gse_sigcheck(TALLOC_CTX *mem_ctx, struct gse_context *gse_ctx,
-                     DATA_BLOB *data, DATA_BLOB *signature)
+static size_t gensec_gse_sig_size(struct gensec_security *gensec_security,
+                                 size_t data_size)
 {
-       return NT_STATUS_NOT_IMPLEMENTED;
+       struct gse_context *gse_ctx =
+               talloc_get_type_abort(gensec_security->private_data,
+               struct gse_context);
+
+       return gse_get_signature_length(gse_ctx,
+                                       gensec_security->want_features & GENSEC_FEATURE_SEAL,
+                                       data_size);
 }
 
-#endif /* HAVE_KRB5 && HAVE_GSSAPI_EXT_H && HAVE_GSS_WRAP_IOV */
+static const char *gensec_gse_krb5_oids[] = {
+       GENSEC_OID_KERBEROS5_OLD,
+       GENSEC_OID_KERBEROS5,
+       NULL
+};
+
+const struct gensec_security_ops gensec_gse_krb5_security_ops = {
+       .name           = "gse_krb5",
+       .auth_type      = DCERPC_AUTH_TYPE_KRB5,
+       .oid            = gensec_gse_krb5_oids,
+       .client_start   = gensec_gse_client_start,
+       .server_start   = gensec_gse_server_start,
+       .magic          = gensec_gse_magic,
+       .update         = gensec_gse_update,
+       .session_key    = gensec_gse_session_key,
+       .session_info   = gensec_gse_session_info,
+       .sig_size       = gensec_gse_sig_size,
+       .sign_packet    = gensec_gse_sign_packet,
+       .check_packet   = gensec_gse_check_packet,
+       .seal_packet    = gensec_gse_seal_packet,
+       .unseal_packet  = gensec_gse_unseal_packet,
+       .wrap           = gensec_gse_wrap,
+       .unwrap         = gensec_gse_unwrap,
+       .have_feature   = gensec_gse_have_feature,
+       .enabled        = true,
+       .kerberos       = true,
+       .priority       = GENSEC_GSSAPI
+};
+
+#endif /* HAVE_KRB5 && HAVE_GSS_WRAP_IOV */