don't allow undefined symbols when linking

[mech_eap.git] / util_name.c

diff --git a/util_name.c b/util_name.c
index f1655cc..fc5a73f 100644 (file)
--- a/util_name.c
+++ b/util_name.c
@@ -57,7 +57,7 @@
 
 static gss_OID_desc gssEapNtPrincipalName = {
     /* 1.3.6.1.4.1.5322.21.2.1  */
-    12, "\x06\x0A\x2B\x06\x01\x04\x01\xA9\x4A\x15\x02\x01"
+    10, "\x2B\x06\x01\x04\x01\xA9\x4A\x15\x02\x01"
 };
 
 gss_OID GSS_EAP_NT_PRINCIPAL_NAME = &gssEapNtPrincipalName;
@@ -68,7 +68,7 @@ gssEapAllocName(OM_uint32 *minor, gss_name_t *pName)
     OM_uint32 tmpMinor;
     gss_name_t name;
 
-    assert(*pName == GSS_C_NO_NAME);
+    *pName = GSS_C_NO_NAME;
 
     name = (gss_name_t)GSSEAP_CALLOC(1, sizeof(*name));
     if (name == NULL) {
@@ -106,8 +106,7 @@ gssEapReleaseName(OM_uint32 *minor, gss_name_t *pName)
     GSSEAP_KRB_INIT(&krbContext);
     krb5_free_principal(krbContext, name->krbPrincipal);
 
-    radiusFreeAVPs(&tmpMinor, name->avps);
-    samlFreeAssertion(&tmpMinor, name->assertion);
+    samlReleaseAttrContext(&tmpMinor, &name->samlCtx);
 
     GSSEAP_MUTEX_DESTROY(&name->mutex);
     GSSEAP_FREE(name);
@@ -138,7 +137,9 @@ krbPrincipalToName(OM_uint32 *minor,
         name->flags |= NAME_FLAG_SERVICE;
     }
 
+    *pName = name;
     *minor = 0;
+
     return GSS_S_COMPLETE;
 }
 
@@ -220,7 +221,6 @@ importExportedName(OM_uint32 *minor,
     OM_uint32 major, tmpMinor;
     krb5_context krbContext;
     unsigned char *p;
-    int composite = 0;
     size_t len, remain;
     gss_buffer_desc buf;
     enum gss_eap_token_type tok_type;
@@ -253,7 +253,7 @@ importExportedName(OM_uint32 *minor,
         return GSS_S_BAD_NAME;
     if (p[1] != GSS_EAP_MECHANISM->length)
         return GSS_S_BAD_MECH;
-    if (memcmp(p, GSS_EAP_MECHANISM->elements, GSS_EAP_MECHANISM->length))
+    if (memcmp(&p[2], GSS_EAP_MECHANISM->elements, GSS_EAP_MECHANISM->length))
         return GSS_S_BAD_MECH;
     p += 2 + GSS_EAP_MECHANISM->length;
     remain -= 2 + GSS_EAP_MECHANISM->length;
@@ -261,6 +261,7 @@ importExportedName(OM_uint32 *minor,
     /* NAME_LEN */
     len = load_uint32_be(p);
     p += 4;
+    remain -= 4;
 
     if (remain < len)
         return GSS_S_BAD_NAME;
@@ -272,22 +273,34 @@ importExportedName(OM_uint32 *minor,
     p += len;
     remain -= len;
 
-    if (composite == 0 && remain != 0)
+    if (remain != 0)
         return GSS_S_BAD_NAME;
 
     major = importUserName(minor, &buf, pName);
     if (GSS_ERROR(major))
         return major;
 
-    /* XXX TODO composite handling */
+    if (tok_type == TOK_TYPE_EXPORT_NAME_COMPOSITE) {
+        gss_buffer_desc saml;
+
+        saml.length = remain;
+        saml.value = p;
+
+        major = samlImportAttrContext(minor, &saml, &(*pName)->samlCtx);
+        if (GSS_ERROR(major)) {
+            gssEapReleaseName(&tmpMinor, pName);
+            return major;
+        }
+    }
 
     return GSS_S_COMPLETE;
 }
 
-OM_uint32 gssEapImportName(OM_uint32 *minor,
-                           const gss_buffer_t nameBuffer,
-                           gss_OID nameType,
-                           gss_name_t *name)
+OM_uint32
+gssEapImportName(OM_uint32 *minor,
+                 const gss_buffer_t nameBuffer,
+                 gss_OID nameType,
+                 gss_name_t *name)
 {
     OM_uint32 major, tmpMinor;
 
@@ -311,16 +324,21 @@ OM_uint32 gssEapImportName(OM_uint32 *minor,
     return major;
 }
 
-OM_uint32 gssEapExportName(OM_uint32 *minor,
-                           const gss_name_t name,
-                           gss_buffer_t exportedName,
-                           int composite)
+OM_uint32
+gssEapExportName(OM_uint32 *minor,
+                 const gss_name_t name,
+                 gss_buffer_t exportedName,
+                 int composite)
 {
     OM_uint32 major = GSS_S_FAILURE, tmpMinor;
     krb5_context krbContext;
     char *krbName = NULL;
     size_t krbNameLen;
     unsigned char *p;
+    gss_buffer_desc saml;
+
+    saml.length = 0;
+    saml.value = NULL;
 
     exportedName->length = 0;
     exportedName->value = NULL;
@@ -335,18 +353,24 @@ OM_uint32 gssEapExportName(OM_uint32 *minor,
         composite = 0;
 
     *minor = krb5_unparse_name(krbContext, name->krbPrincipal, &krbName);
-    if (*minor != 0)
+    if (*minor != 0) {
+        major = GSS_S_FAILURE;
         goto cleanup;
+    }
     krbNameLen = strlen(krbName);
 
     exportedName->length = 6 + GSS_EAP_MECHANISM->length + 4 + krbNameLen;
     if (composite) {
-        /* TODO: export SAML/AVP, this is pending specification */
-        GSSEAP_NOT_IMPLEMENTED;
+        major = samlExportAttrContext(minor, name->samlCtx, &saml);
+        if (GSS_ERROR(major))
+            goto cleanup;
+
+        exportedName->length += 4 + saml.length;
     }
 
     exportedName->value = GSSEAP_MALLOC(exportedName->length);
     if (exportedName->value == NULL) {
+        major = GSS_S_FAILURE;
         *minor = ENOMEM;
         goto cleanup;
     }
@@ -375,11 +399,18 @@ OM_uint32 gssEapExportName(OM_uint32 *minor,
     memcpy(p, krbName, krbNameLen);
     p += krbNameLen;
 
+    store_uint32_be(saml.length, p);
+    p += 4;
+
+    memcpy(p, saml.value, saml.length);
+    p += saml.length;
+
     *minor = 0;
     major = GSS_S_COMPLETE;
 
 cleanup:
     GSSEAP_MUTEX_UNLOCK(&name->mutex);
+    gss_release_buffer(&tmpMinor, &saml);
     if (GSS_ERROR(major))
         gss_release_buffer(&tmpMinor, exportedName);
     krb5_free_unparsed_name(krbContext, krbName);
@@ -419,12 +450,8 @@ gssEapAttributePrefixToType(const gss_buffer_t prefix)
          i < sizeof(attributePrefixes) / sizeof(attributePrefixes[0]);
          i++)
     {
-        gss_buffer_t p = &attributePrefixes[i];
-
-        if (p->length == prefix->length &&
-            memcmp(p->value, prefix->value, prefix->length) == 0) {
+        if (bufferEqual(&attributePrefixes[i], prefix))
             return i;
-        }
     }
 
     return ATTR_TYPE_NONE;