s3-gse: the server should not check for GSS_C_MUTUAL_FLAG
[metze/samba/wip.git] / source3 / librpc / crypto / gse.c
index bd7146c1c87a31e98a4503fd7200d37b3d3e2037..c7ce38e14f8e6526af73740f84db270573063f37 100644 (file)
 #include "smb_krb5.h"
 #include "gse_krb5.h"
 
+#ifndef GSS_C_DCE_STYLE
+#define GSS_C_DCE_STYLE 0x1000
+#endif
+
 #ifndef GSS_KRB5_INQ_SSPI_SESSION_KEY_OID
 #define GSS_KRB5_INQ_SSPI_SESSION_KEY_OID_LENGTH 11
 #define GSS_KRB5_INQ_SSPI_SESSION_KEY_OID "\x2a\x86\x48\x86\xf7\x12\x01\x02\x02\x05\x05"
@@ -70,20 +74,17 @@ struct gse_context {
        krb5_ccache ccache;
        krb5_keytab keytab;
 
-       gss_ctx_id_t gss_ctx;
+       gss_ctx_id_t gssapi_context;
 
        gss_OID_desc gss_mech;
-       OM_uint32 gss_c_flags;
+       OM_uint32 gss_want_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;
+       OM_uint32 gss_got_flags;
+       gss_cred_id_t delegated_cred_handle;
        gss_name_t client_name;
-
-       bool more_processing;
-       bool authenticated;
 };
 
 #ifndef HAVE_GSS_OID_EQUAL
@@ -123,9 +124,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) {
@@ -140,9 +141,9 @@ 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);
+                                          &gse_ctx->delegated_cred_handle);
        }
 
        /* MIT and Heimdal differ as to if you can call
@@ -178,19 +179,19 @@ 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_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();
@@ -227,15 +228,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;
@@ -310,10 +311,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;
@@ -326,24 +327,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,
-                                       &gse_ctx->ret_flags, 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",
@@ -364,10 +362,10 @@ done:
        return status;
 }
 
-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)
+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;
@@ -459,10 +457,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;
@@ -474,35 +472,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);
                }
 
@@ -525,39 +519,40 @@ 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_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;
                }
        }
@@ -616,20 +611,15 @@ done:
        return errstr;
 }
 
-bool gse_require_more_processing(struct gse_context *gse_ctx)
-{
-       return gse_ctx->more_processing;
-}
-
-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",
@@ -645,7 +635,7 @@ DATA_BLOB gse_get_session_key(TALLOC_CTX *mem_ctx,
 #ifdef HAVE_GSSKRB5_GET_SUBKEY
                krb5_keyblock *subkey;
                gss_maj = gsskrb5_get_subkey(&gss_min,
-                                            gse_ctx->gss_ctx,
+                                            gse_ctx->gssapi_context,
                                             &subkey);
                if (gss_maj != 0) {
                        DEBUG(1, ("NO session key for this mech\n"));
@@ -671,106 +661,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(mem_ctx,
-                                  (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_pac_blob(struct gse_context *gse_ctx,
-                         TALLOC_CTX *mem_ctx, DATA_BLOB *pac_blob)
-{
-       if (!gse_ctx->authenticated) {
-               return NT_STATUS_ACCESS_DENIED;
-       }
-
-       return gssapi_obtain_pac_blob(mem_ctx, gse_ctx->gss_ctx,
-                                       gse_ctx->client_name, pac_blob);
-}
-
-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) {
@@ -782,8 +690,8 @@ 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];
@@ -792,7 +700,7 @@ NTSTATUS gse_seal(TALLOC_CTX *mem_ctx, struct gse_context *gse_ctx,
        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;
        }
@@ -809,7 +717,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) {
@@ -834,8 +742,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];
@@ -851,7 +759,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",
@@ -875,8 +783,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 };
@@ -886,7 +794,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) {
@@ -912,8 +820,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 };
@@ -925,7 +833,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",
@@ -1066,9 +974,6 @@ static NTSTATUS gensec_gse_update(struct gensec_security *gensec_security,
        if (!NT_STATUS_IS_OK(status)) {
                return status;
        }
-       if (gse_ctx->more_processing) {
-               return NT_STATUS_MORE_PROCESSING_REQUIRED;
-       }
 
        if (gensec_security->gensec_role == GENSEC_SERVER) {
                return gse_verify_server_auth_flags(gse_ctx);
@@ -1092,7 +997,7 @@ static NTSTATUS gensec_gse_wrap(struct gensec_security *gensec_security,
        input_token.value = in->data;
 
        maj_stat = gss_wrap(&min_stat,
-                           gse_ctx->gss_ctx,
+                           gse_ctx->gssapi_context,
                            gensec_have_feature(gensec_security, GENSEC_FEATURE_SEAL),
                            GSS_C_QOP_DEFAULT,
                            &input_token,
@@ -1130,7 +1035,7 @@ static NTSTATUS gensec_gse_unwrap(struct gensec_security *gensec_security,
        input_token.value = in->data;
 
        maj_stat = gss_unwrap(&min_stat,
-                             gse_ctx->gss_ctx,
+                             gse_ctx->gssapi_context,
                              &input_token,
                              &output_token,
                              &conf_state,
@@ -1210,10 +1115,10 @@ static bool gensec_gse_have_feature(struct gensec_security *gensec_security,
                struct gse_context);
 
        if (feature & GENSEC_FEATURE_SIGN) {
-               return gse_ctx->ret_flags & GSS_C_INTEG_FLAG;
+               return gse_ctx->gss_got_flags & GSS_C_INTEG_FLAG;
        }
        if (feature & GENSEC_FEATURE_SEAL) {
-               return gse_ctx->ret_flags & GSS_C_CONF_FLAG;
+               return gse_ctx->gss_got_flags & GSS_C_CONF_FLAG;
        }
        if (feature & GENSEC_FEATURE_SESSION_KEY) {
                /* Only for GSE/Krb5 */
@@ -1222,7 +1127,7 @@ static bool gensec_gse_have_feature(struct gensec_security *gensec_security,
                }
        }
        if (feature & GENSEC_FEATURE_DCE_STYLE) {
-               return gse_ctx->ret_flags & GSS_C_DCE_STYLE;
+               return gse_ctx->gss_got_flags & GSS_C_DCE_STYLE;
        }
        /* We can always do async (rather than strict request/reply) packets.  */
        if (feature & GENSEC_FEATURE_ASYNC_REPLIES) {
@@ -1299,7 +1204,7 @@ static NTSTATUS gensec_gse_session_info(struct gensec_security *gensec_security,
                return NT_STATUS_NO_MEMORY;
        }
 
-       nt_status = gssapi_obtain_pac_blob(tmp_ctx,  gse_ctx->gss_ctx,
+       nt_status = gssapi_obtain_pac_blob(tmp_ctx,  gse_ctx->gssapi_context,
                                           gse_ctx->client_name,
                                           &pac_blob);
 
@@ -1374,107 +1279,4 @@ const struct gensec_security_ops gensec_gse_krb5_security_ops = {
        .priority       = GENSEC_GSSAPI
 };
 
-#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)
-{
-       return NT_STATUS_NOT_IMPLEMENTED;
-}
-
-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;
-}
-
-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)
-{
-       return NT_STATUS_NOT_IMPLEMENTED;
-}
-
-NTSTATUS gse_get_server_auth_token(TALLOC_CTX *mem_ctx,
-                                  struct gse_context *gse_ctx,
-                                  DATA_BLOB *token_in,
-                                  DATA_BLOB *token_out)
-{
-       return NT_STATUS_NOT_IMPLEMENTED;
-}
-
-NTSTATUS gse_verify_server_auth_flags(struct gse_context *gse_ctx)
-{
-       return NT_STATUS_NOT_IMPLEMENTED;
-}
-
-bool gse_require_more_processing(struct gse_context *gse_ctx)
-{
-       return false;
-}
-
-DATA_BLOB gse_get_session_key(TALLOC_CTX *mem_ctx,
-                             struct gse_context *gse_ctx)
-{
-       return data_blob_null;
-}
-
-NTSTATUS gse_get_client_name(struct gse_context *gse_ctx,
-                            TALLOC_CTX *mem_ctx, char **cli_name)
-{
-       return NT_STATUS_NOT_IMPLEMENTED;
-}
-
-NTSTATUS gse_get_authz_data(struct gse_context *gse_ctx,
-                           TALLOC_CTX *mem_ctx, DATA_BLOB *pac)
-{
-       return NT_STATUS_NOT_IMPLEMENTED;
-}
-
-NTSTATUS gse_get_pac_blob(struct gse_context *gse_ctx,
-                         TALLOC_CTX *mem_ctx, DATA_BLOB *pac_blob)
-{
-       return NT_STATUS_NOT_IMPLEMENTED;
-}
-
-size_t gse_get_signature_length(struct gse_context *gse_ctx,
-                               int seal, size_t payload_size)
-{
-       return 0;
-}
-
-NTSTATUS gse_seal(TALLOC_CTX *mem_ctx, struct gse_context *gse_ctx,
-                 DATA_BLOB *data, DATA_BLOB *signature)
-{
-       return NT_STATUS_NOT_IMPLEMENTED;
-}
-
-NTSTATUS gse_unseal(TALLOC_CTX *mem_ctx, struct gse_context *gse_ctx,
-                   DATA_BLOB *data, DATA_BLOB *signature)
-{
-       return NT_STATUS_NOT_IMPLEMENTED;
-}
-
-NTSTATUS gse_sign(TALLOC_CTX *mem_ctx, struct gse_context *gse_ctx,
-                 DATA_BLOB *data, DATA_BLOB *signature)
-{
-       return NT_STATUS_NOT_IMPLEMENTED;
-}
-
-NTSTATUS gse_sigcheck(TALLOC_CTX *mem_ctx, struct gse_context *gse_ctx,
-                     DATA_BLOB *data, DATA_BLOB *signature)
-{
-       return NT_STATUS_NOT_IMPLEMENTED;
-}
-
 #endif /* HAVE_KRB5 && HAVE_GSS_WRAP_IOV */