#include "util_base64.h"
-typedef OM_uint32 (*init_sec_context)(
- OM_uint32 *, /* minor_status */
- gss_cred_id_t, /* claimant_cred_handle */
- gss_ctx_id_t *, /* context_handle */
- gss_name_t, /* target_name */
- gss_OID, /* mech_type (used to be const) */
- OM_uint32, /* req_flags */
- OM_uint32, /* time_req */
- gss_channel_bindings_t, /* input_chan_bindings */
- gss_buffer_t, /* input_token */
- gss_OID *, /* actual_mech_type */
- gss_buffer_t, /* output_token */
- OM_uint32 *, /* ret_flags */
- OM_uint32 * /* time_req */
-);
-
void
GSSInitSecContext::execute()
{
/* Variables */
- init_sec_context fn = (init_sec_context)function;
gss_OID actual_mech_type;
/* Error checking */
/* Main */
// MRW -- fix so that this uses all of the vars from the object
- retVal = fn(
+ retVal = function(
&minor_status,
GSS_C_NO_CREDENTIAL,
&context_handle,
GSSInitSecContext::GSSInitSecContext(
JSONObject *params,
- void *fn)
+ init_sec_context_type fn)
{
zeroOut(false);
loadParameters(params);
function = fn;
}
-GSSInitSecContext::GSSInitSecContext(void *fn)
+GSSInitSecContext::GSSInitSecContext(init_sec_context_type fn)
{
zeroOut(false);
function = fn;
#include <datamodel/GSSOID.h>
#include <gssapi.h>
+typedef OM_uint32 (KRB5_CALLCONV *init_sec_context_type)(
+ OM_uint32 *, /* minor_status */
+ gss_cred_id_t, /* claimant_cred_handle */
+ gss_ctx_id_t *, /* context_handle */
+ gss_name_t, /* target_name */
+ gss_OID, /* mech_type (used to be const) */
+ OM_uint32, /* req_flags */
+ OM_uint32, /* time_req */
+ gss_channel_bindings_t, /* input_chan_bindings */
+ gss_buffer_t, /* input_token */
+ gss_OID *, /* actual_mech_type */
+ gss_buffer_t, /* output_token */
+ OM_uint32 *, /* ret_flags */
+ OM_uint32 * /* time_req */
+);
+
class GSSInitSecContext : public GSSCommand
{
public:
void execute();
JSONObject *toJSON();
- GSSInitSecContext(void *fn = (void *)&gss_init_sec_context);
- GSSInitSecContext(JSONObject *params, void *fn = (void *)&gss_init_sec_context);
+ GSSInitSecContext(init_sec_context_type fn = &gss_init_sec_context);
+ GSSInitSecContext(JSONObject *params, init_sec_context_type fn = &gss_init_sec_context);
bool loadParameters(JSONObject *params);
bool zeroOut(bool initialized = true);
OM_uint32 getReqFlags() { return req_flags; }
OM_uint32 getTimeReq() { return time_req; }
gss_ctx_id_t getContextHandle() { return context_handle; }
- void *getGSSFunction() { return function; }
+ init_sec_context_type getGSSFunction() { return function; }
GSSOID getMechType() { return mechType; };
GSSOID getActualMechType() { return actualMechType; };
const char * getTargetDisplayName();
private:
- void *function;
+ init_sec_context_type function;
GSSContext context;
GSSOID mechType;
GSSOID actualMechType;
GSSCreateSecContextTest::testConstructor()
{
GSSInitSecContext cmd = GSSInitSecContext();
- void *cmdFn;
- void *GSSFn;
+ init_sec_context_type cmdFn;
+ init_sec_context_type GSSFn;
cmdFn = cmd.getGSSFunction();
- GSSFn = (void *)&gss_init_sec_context;
+ GSSFn = &gss_init_sec_context;
CPPUNIT_ASSERT_MESSAGE(
"The default constructor for GSSCreateSecContextCommand should assign the function gss_init_sec_context",
cmdFn == GSSFn);
GSSInitSecContext cmd = GSSInitSecContext(
&json,
- (void *)&mock_init_sec
+ &mock_init_sec
);
const char *from_cmd = cmd.getTargetDisplayName();
{
gss_ctx_id_t expectedResult, expectedArgument;
- GSSInitSecContext cmd ((void *)&mock_init_sec);
+ GSSInitSecContext cmd (&mock_init_sec);
/* Set expectations on what the GSS function will be called with */
cmd.time_req = rand() % 1024;
void GSSCreateSecContextTest::testJSONMarshal()
{
/* Variables */
- GSSInitSecContext cmd ((void *)&mock_init_sec);
+ GSSInitSecContext cmd (&mock_init_sec);
JSONObject *result;
GSSContextCache *cache = GSSContextCache::instance();
GSSContext context;