Properly implement neg_mechs & GM_USE_MG_CRED

[metze/heimdal/wip.git] / lib / gssapi / krb5 / external.c

diff --git a/lib/gssapi/krb5/external.c b/lib/gssapi/krb5/external.c
index 59d5bba7bb0f8c201e2215cea25874ceb2e1d806..045d554976978e966b0564429ba12b02452d32d8 100644 (file)
--- a/lib/gssapi/krb5/external.c
+++ b/lib/gssapi/krb5/external.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997 - 2000 Kungliga Tekniska Högskolan
+ * Copyright (c) 1997 - 2018 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden).
  * All rights reserved.
  *
@@ -180,7 +180,7 @@ static gss_mo_desc krb5_mo[] = {
        GSS_C_MA_SASL_MECH_NAME,
        GSS_MO_MA,
        "SASL mech name",
-       "GS2-KRB5",
+       rk_UNCONST("GS2-KRB5"),
        _gss_mo_get_ctx_as_string,
        NULL
     },
@@ -188,7 +188,7 @@ static gss_mo_desc krb5_mo[] = {
        GSS_C_MA_MECH_NAME,
        GSS_MO_MA,
        "Mechanism name",
-       "KRB5",
+       rk_UNCONST("KRB5"),
        _gss_mo_get_ctx_as_string,
        NULL
     },
@@ -196,73 +196,129 @@ static gss_mo_desc krb5_mo[] = {
        GSS_C_MA_MECH_DESCRIPTION,
        GSS_MO_MA,
        "Mechanism description",
-       "Heimdal Kerberos 5 mech",
+       rk_UNCONST("Heimdal Kerberos 5 mech"),
        _gss_mo_get_ctx_as_string,
        NULL
     },
     {
        GSS_C_MA_MECH_CONCRETE,
-       GSS_MO_MA
+       GSS_MO_MA,
+       NULL,
+       NULL,
+       NULL,
+       NULL
     },
     {
        GSS_C_MA_ITOK_FRAMED,
-       GSS_MO_MA
+       GSS_MO_MA,
+       NULL,
+       NULL,
+       NULL,
+       NULL
     },
     {
        GSS_C_MA_AUTH_INIT,
-       GSS_MO_MA
+       GSS_MO_MA,
+       NULL,
+       NULL,
+       NULL,
+       NULL
     },
     {
        GSS_C_MA_AUTH_TARG,
-       GSS_MO_MA
-    },
-    {
-       GSS_C_MA_AUTH_INIT_ANON,
-       GSS_MO_MA
+       GSS_MO_MA,
+       NULL,
+       NULL,
+       NULL,
+       NULL
     },
     {
        GSS_C_MA_DELEG_CRED,
-       GSS_MO_MA
+       GSS_MO_MA,
+       NULL,
+       NULL,
+       NULL,
+       NULL
     },
     {
        GSS_C_MA_INTEG_PROT,
-       GSS_MO_MA
+       GSS_MO_MA,
+       NULL,
+       NULL,
+       NULL,
+       NULL
     },
     {
        GSS_C_MA_CONF_PROT,
-       GSS_MO_MA
+       GSS_MO_MA,
+       NULL,
+       NULL,
+       NULL,
+       NULL
     },
     {
        GSS_C_MA_MIC,
-       GSS_MO_MA
+       GSS_MO_MA,
+       NULL,
+       NULL,
+       NULL,
+       NULL
     },
     {
        GSS_C_MA_WRAP,
-       GSS_MO_MA
+       GSS_MO_MA,
+       NULL,
+       NULL,
+       NULL,
+       NULL
     },
     {
        GSS_C_MA_PROT_READY,
-       GSS_MO_MA
+       GSS_MO_MA,
+       NULL,
+       NULL,
+       NULL,
+       NULL
     },
     {
        GSS_C_MA_REPLAY_DET,
-       GSS_MO_MA
+       GSS_MO_MA,
+       NULL,
+       NULL,
+       NULL,
+       NULL
     },
     {
        GSS_C_MA_OOS_DET,
-       GSS_MO_MA
+       GSS_MO_MA,
+       NULL,
+       NULL,
+       NULL,
+       NULL
     },
     {
        GSS_C_MA_CBINDINGS,
-       GSS_MO_MA
+       GSS_MO_MA,
+       NULL,
+       NULL,
+       NULL,
+       NULL
     },
     {
        GSS_C_MA_PFS,
-       GSS_MO_MA
+       GSS_MO_MA,
+       NULL,
+       NULL,
+       NULL,
+       NULL
     },
     {
        GSS_C_MA_CTX_TRANS,
-       GSS_MO_MA
+       GSS_MO_MA,
+       NULL,
+       NULL,
+       NULL,
+       NULL
     }
 };
 
@@ -273,9 +329,9 @@ static gss_mo_desc krb5_mo[] = {
 static gssapi_mech_interface_desc krb5_mech = {
     GMI_VERSION,
     "kerberos 5",
-    {9, "\x2a\x86\x48\x86\xf7\x12\x01\x02\x02" },
+    {9, rk_UNCONST("\x2a\x86\x48\x86\xf7\x12\x01\x02\x02") },
     0,
-    _gsskrb5_acquire_cred,
+    NULL, /* gm_acquire_cred */
     _gsskrb5_release_cred,
     _gsskrb5_init_sec_context,
     _gsskrb5_accept_sec_context,
@@ -296,7 +352,7 @@ static gssapi_mech_interface_desc krb5_mech = {
     _gsskrb5_inquire_cred,
     _gsskrb5_inquire_context,
     _gsskrb5_wrap_size_limit,
-    _gsskrb5_add_cred,
+    NULL, /* gm_add_cred */
     _gsskrb5_inquire_cred_by_mech,
     _gsskrb5_export_sec_context,
     _gsskrb5_import_sec_context,
@@ -312,10 +368,10 @@ static gssapi_mech_interface_desc krb5_mech = {
     _gk_wrap_iov,
     _gk_unwrap_iov,
     _gk_wrap_iov_length,
-    _gsskrb5_store_cred,
+    NULL, /* gm_store_cred */
     _gsskrb5_export_cred,
     _gsskrb5_import_cred,
-    NULL,
+    _gsskrb5_acquire_cred_from,
     NULL,
     NULL,
     NULL,
@@ -324,9 +380,22 @@ static gssapi_mech_interface_desc krb5_mech = {
     NULL,
     krb5_mo,
     sizeof(krb5_mo) / sizeof(krb5_mo[0]),
-    NULL,
-    _gsskrb5_userok,
-    _gsskrb5_pname_to_uid
+    _gsskrb5_localname,
+    _gsskrb5_authorize_localname,
+    NULL, /* gm_display_name_ext */
+    NULL, /* gm_inquire_name */
+    NULL, /* gm_get_name_attribute */
+    NULL, /* gm_set_name_attribute */
+    NULL, /* gm_delete_name_attribute */
+    NULL, /* gm_export_name_composite */
+    _gsskrb5_duplicate_cred,
+    _gsskrb5_add_cred_from,
+    _gsskrb5_store_cred_into,
+    NULL, /* gm_query_mechanism_info */
+    NULL, /* gm_query_meta_data */
+    NULL, /* gm_exchange_meta_data */
+    _gsskrb5_store_cred_into2,
+    NULL  /* gm_compat */
 };
 
 gssapi_mech_interface