Merge branch 'oldradius'

[mech_eap.git] / util_radius.h

diff --git a/util_radius.h b/util_radius.h
index f789830..acc2283 100644 (file)
--- a/util_radius.h
+++ b/util_radius.h
@@ -33,38 +33,111 @@
 #ifndef _UTIL_RADIUS_H_
 #define _UTIL_RADIUS_H_ 1
 
-struct eap_gss_radius_attr_ctx;
+#ifdef __cplusplus
 
-OM_uint32
-radiusDuplicateAttrContext(OM_uint32 *minor,
-                           const struct eap_gss_radius_attr_ctx *in,
-                           struct eap_gss_radius_attr_ctx **out);
+struct gss_eap_radius_attr_provider : gss_eap_attr_provider {
+public:
+    gss_eap_radius_attr_provider(void);
+    ~gss_eap_radius_attr_provider(void);
 
-OM_uint32
-radiusReleaseAttrContext(OM_uint32 *minor,
-                         struct eap_gss_radius_attr_ctx **ctx);
+    bool initFromExistingContext(const gss_eap_attr_ctx *source,
+                                 const gss_eap_attr_provider *ctx);
+    bool initFromGssContext(const gss_eap_attr_ctx *source,
+                            const gss_cred_id_t cred,
+                            const gss_ctx_id_t ctx);
+
+    bool getAttributeTypes(gss_eap_attr_enumeration_cb, void *data) const;
+    void setAttribute(int complete,
+                      const gss_buffer_t attr,
+                      const gss_buffer_t value);
+    void deleteAttribute(const gss_buffer_t value);
+    bool getAttribute(const gss_buffer_t attr,
+                      int *authenticated,
+                      int *complete,
+                      gss_buffer_t value,
+                      gss_buffer_t display_value,
+                      int *more) const;
+    gss_any_t mapToAny(int authenticated,
+                       gss_buffer_t type_id) const;
+    void releaseAnyNameMapping(gss_buffer_t type_id,
+                               gss_any_t input) const;
+
+    void exportToBuffer(gss_buffer_t buffer) const;
+    bool initFromBuffer(const gss_eap_attr_ctx *ctx,
+                        const gss_buffer_t buffer);
+
+    bool getAttribute(int attribute,
+                      int *authenticated,
+                      int *complete,
+                      gss_buffer_t value,
+                      gss_buffer_t display_value,
+                      int *more) const;
+    bool getAttribute(int attribute,
+                      int vendor,
+                      int *authenticated,
+                      int *complete,
+                      gss_buffer_t value,
+                      gss_buffer_t display_value,
+                      int *more) const;
+
+    bool authenticated() const { return m_authenticated; }
+
+    static bool init();
+    static void finalize();
+
+    static gss_eap_attr_provider *createAttrContext(void);
+
+private:
+    bool initFromGssCred(const gss_cred_id_t cred);
+    static VALUE_PAIR *copyAvps(const VALUE_PAIR *in);
+    const VALUE_PAIR *getAvps(void) const {
+        return m_avps;
+    }
+
+    rc_handle *m_rh;
+    VALUE_PAIR *m_avps;
+    bool m_authenticated;
+};
+
+/* For now */
+#define PW_SAML_ASSERTION           1936
+
+extern "C" {
+#endif
 
 OM_uint32
-radiusGetAttributeTypes(OM_uint32 *minor,
-                        const struct eap_gss_radius_attr_ctx *ctx,
-                        void *data,
-                        OM_uint32 (*addAttribute)(OM_uint32 *, void *, gss_buffer_t));
+addAvpFromBuffer(OM_uint32 *minor,
+                 rc_handle *rh,
+                 VALUE_PAIR **vp,
+                 int type,
+                 gss_buffer_t buffer);
 
 OM_uint32
-radiusGetAttribute(OM_uint32 *minor,
-                   const struct eap_gss_radius_attr_ctx *ctx,
-                   gss_buffer_t attr,
-                   int *authenticated,
-                   int *complete,
-                   gss_buffer_t value,
-                   gss_buffer_t display_value,
-                   int *more);
+getBufferFromAvps(OM_uint32 *minor,
+                  VALUE_PAIR *vps,
+                  int type,
+                  gss_buffer_t buffer,
+                  int concat);
+
+OM_uint32 gssEapRadiusAttrProviderInit(OM_uint32 *minor);
+OM_uint32 gssEapRadiusAttrProviderFinalize(OM_uint32 *minor);
 
 OM_uint32
-radiusSetAttribute(OM_uint32 *minor,
-                   struct eap_gss_radius_attr_ctx *ctx,
-                   int complete,
-                   gss_buffer_t attr,
-                   gss_buffer_t value);
+gssEapRadiusAllocHandle(OM_uint32 *minor,
+                        const gss_cred_id_t cred,
+                        rc_handle **pHandle);
+
+#define RC_CONFIG_FILE      SYSCONFDIR "/radiusclient/radiusclient.conf"
+
+/* RFC 2548 - Microsoft Vendor-specific RADIUS Attributes */
+#define RADIUS_VENDOR_ID_MICROSOFT 311
+
+enum { RADIUS_VENDOR_ATTR_MS_MPPE_SEND_KEY = 16,
+       RADIUS_VENDOR_ATTR_MS_MPPE_RECV_KEY = 17
+};
+
+#ifdef __cplusplus
+}
+#endif
 
 #endif /* _UTIL_RADIUS_H_ */