allow RADIUS config stanza to be set via cred option

diff --git a/gssapiP_eap.h b/gssapiP_eap.h
index 8d3f86c..29d43f7 100644 (file)
--- a/gssapiP_eap.h
+++ b/gssapiP_eap.h
@@ -109,6 +109,7 @@ struct gss_cred_id_struct {
     gss_OID_set mechanisms;
     time_t expiryTime;
     char *radiusConfigFile;
+    char *radiusConfigStanza;
 #ifdef GSSEAP_ENABLE_REAUTH
     krb5_ccache krbCredCache;
     gss_cred_id_t krbCred;

diff --git a/gssapi_eap.h b/gssapi_eap.h
index 2d0f07a..ce883c2 100644 (file)
--- a/gssapi_eap.h
+++ b/gssapi_eap.h
@@ -45,7 +45,9 @@ extern gss_OID GSS_EAP_AES256_CTS_HMAC_SHA1_96_MECHANISM;
 /* name type */
 extern gss_OID GSS_EAP_NT_PRINCIPAL_NAME;
 
-extern gss_OID GSS_EAP_CRED_SET_RADIUS_CONFIG;
+extern gss_OID GSS_EAP_CRED_SET_RADIUS_CONFIG_FILE;
+extern gss_OID GSS_EAP_CRED_SET_RADIUS_CONFIG_STANZA;
+
 extern gss_OID GSS_EAP_CRED_SET_CRED_FLAG;
 
 #define GSS_EAP_DISABLE_LOCAL_ATTRS_FLAG    0x00000001

diff --git a/set_cred_option.c b/set_cred_option.c
index 1ece0fd..f73564e 100644 (file)
--- a/set_cred_option.c
+++ b/set_cred_option.c
@@ -33,10 +33,10 @@
 #include "gssapiP_eap.h"
 
 static OM_uint32
-setCredRadiusConfig(OM_uint32 *minor,
-                    gss_cred_id_t cred,
-                    const gss_OID oid,
-                    const gss_buffer_t buffer)
+setCredRadiusConfigFile(OM_uint32 *minor,
+                        gss_cred_id_t cred,
+                        const gss_OID oid,
+                        const gss_buffer_t buffer)
 {
     OM_uint32 major;
     gss_buffer_desc configFileBuffer = GSS_C_EMPTY_BUFFER;
@@ -57,6 +57,30 @@ setCredRadiusConfig(OM_uint32 *minor,
 }
 
 static OM_uint32
+setCredRadiusConfigStanza(OM_uint32 *minor,
+                          gss_cred_id_t cred,
+                          const gss_OID oid,
+                          const gss_buffer_t buffer)
+{
+    OM_uint32 major;
+    gss_buffer_desc configStanzaBuffer = GSS_C_EMPTY_BUFFER;
+
+    if (buffer != GSS_C_NO_BUFFER && buffer->length != 0) {
+        major = duplicateBuffer(minor, buffer, &configStanzaBuffer);
+        if (GSS_ERROR(major))
+            return major;
+    }
+
+    if (cred->radiusConfigStanza != NULL)
+        GSSEAP_FREE(cred->radiusConfigStanza);
+
+    cred->radiusConfigStanza = (char *)configStanzaBuffer.value;
+
+    *minor = 0;
+    return GSS_S_COMPLETE;
+}
+
+static OM_uint32
 setCredFlag(OM_uint32 *minor,
             gss_cred_id_t cred,
             const gss_OID oid,
@@ -91,17 +115,23 @@ static struct {
     /* 1.3.6.1.4.1.5322.22.3.3.1 */
     {
         { 11, "\x2B\x06\x01\x04\x01\xA9\x4A\x16\x03\x03\x01" },
-        setCredRadiusConfig,
+        setCredRadiusConfigFile,
     },
     /* 1.3.6.1.4.1.5322.22.3.3.2 */
     {
         { 11, "\x2B\x06\x01\x04\x01\xA9\x4A\x16\x03\x03\x02" },
+        setCredRadiusConfigStanza,
+    },
+    /* 1.3.6.1.4.1.5322.22.3.3.3 */
+    {
+        { 11, "\x2B\x06\x01\x04\x01\xA9\x4A\x16\x03\x03\x03" },
         setCredFlag,
     },
 };
 
-gss_OID GSS_EAP_CRED_SET_RADIUS_CONFIG = &setCredOps[0].oid;
-gss_OID GSS_EAP_CRED_SET_CRED_FLAG     = &setCredOps[1].oid;
+gss_OID GSS_EAP_CRED_SET_RADIUS_CONFIG_FILE     = &setCredOps[0].oid;
+gss_OID GSS_EAP_CRED_SET_RADIUS_CONFIG_STANZA   = &setCredOps[1].oid;
+gss_OID GSS_EAP_CRED_SET_CRED_FLAG              = &setCredOps[2].oid;
 
 OM_uint32
 gssspi_set_cred_option(OM_uint32 *minor,

diff --git a/util_cred.c b/util_cred.c
index d90185f..f85639c 100644 (file)
--- a/util_cred.c
+++ b/util_cred.c
@@ -80,6 +80,8 @@ gssEapReleaseCred(OM_uint32 *minor, gss_cred_id_t *pCred)
 
     if (cred->radiusConfigFile != NULL)
         GSSEAP_FREE(cred->radiusConfigFile);
+    if (cred->radiusConfigStanza != NULL)
+        GSSEAP_FREE(cred->radiusConfigStanza);
 
 #ifdef GSSEAP_ENABLE_REAUTH
     if (cred->krbCredCache != NULL) {

diff --git a/util_radius.cpp b/util_radius.cpp
index b84dc73..68a6807 100644 (file)
--- a/util_radius.cpp
+++ b/util_radius.cpp
@@ -547,20 +547,25 @@ gssEapRadiusAllocConn(OM_uint32 *minor,
 {
     struct gss_eap_acceptor_ctx *actx = &ctx->acceptorCtx;
     const char *configFile = NULL;
+    const char *configStanza = "gss-eap";
     struct rs_error *err;
 
     assert(actx->radHandle == NULL);
     assert(actx->radConn == NULL);
 
-    if (cred != GSS_C_NO_CREDENTIAL && cred->radiusConfigFile != NULL)
-        configFile = cred->radiusConfigFile;
+    if (cred != GSS_C_NO_CREDENTIAL) {
+        if (cred->radiusConfigFile != NULL)
+            configFile = cred->radiusConfigFile;
+        if (cred->radiusConfigStanza != NULL)
+            configStanza = cred->radiusConfigStanza;
+    }
 
     err = radiusAllocHandle(configFile, &actx->radHandle);
     if (err != NULL || actx->radHandle == NULL) {
         return gssEapRadiusMapError(minor, err);
     }
 
-    if (rs_conn_create(actx->radHandle, &actx->radConn, "gss-eap") != 0) {
+    if (rs_conn_create(actx->radHandle, &actx->radConn, configStanza) != 0) {
         return gssEapRadiusMapError(minor, rs_err_conn_pop(actx->radConn));
     }