projects
/
gssweb.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
a02c6ba
)
Add KRB5_CALLCONV decoration where required
author
Kevin Wasserman
<krwasserman@hotmail.com>
Thu, 6 Nov 2014 18:00:01 +0000
(13:00 -0500)
committer
Kevin Wasserman
<krwasserman@hotmail.com>
Sat, 22 Nov 2014 10:39:15 +0000
(
05:39
-0500)
json_gssapi/src/commands/GSSGetMic.h
patch
|
blob
|
history
json_gssapi/src/commands/GSSPseudoRandom.h
patch
|
blob
|
history
json_gssapi/src/commands/GSSUnwrap.h
patch
|
blob
|
history
json_gssapi/src/commands/GSSWrap.h
patch
|
blob
|
history
json_gssapi/src/datamodel/GSSCredential.h
patch
|
blob
|
history
json_gssapi/src/datamodel/GSSName.h
patch
|
blob
|
history
diff --git
a/json_gssapi/src/commands/GSSGetMic.h
b/json_gssapi/src/commands/GSSGetMic.h
index
424cc89
..
e8cce56
100644
(file)
--- a/
json_gssapi/src/commands/GSSGetMic.h
+++ b/
json_gssapi/src/commands/GSSGetMic.h
@@
-39,7
+39,7
@@
#include "datamodel/GSSBuffer.h"
#include <gssapi/gssapi.h>
#include "datamodel/GSSBuffer.h"
#include <gssapi/gssapi.h>
-typedef OM_uint32 (*gss_get_mic_type) (
+typedef OM_uint32 (
KRB5_CALLCONV
*gss_get_mic_type) (
OM_uint32 *, /* minor_status */
gss_ctx_id_t, /* context_handle */
gss_qop_t, /* qop_req */
OM_uint32 *, /* minor_status */
gss_ctx_id_t, /* context_handle */
gss_qop_t, /* qop_req */
diff --git
a/json_gssapi/src/commands/GSSPseudoRandom.h
b/json_gssapi/src/commands/GSSPseudoRandom.h
index
fdc88a5
..
251c844
100644
(file)
--- a/
json_gssapi/src/commands/GSSPseudoRandom.h
+++ b/
json_gssapi/src/commands/GSSPseudoRandom.h
@@
-35,13
+35,12
@@
#ifndef GSSPSEUDORANDOMCOMMAND_H
#define GSSPSEUDORANDOMCOMMAND_H
#ifndef GSSPSEUDORANDOMCOMMAND_H
#define GSSPSEUDORANDOMCOMMAND_H
-#include <openssl/rand.h>
#include <gssapi/gssapi.h>
#include "datamodel/GSSBuffer.h"
#include "GSSCommand.h"
#include <gssapi/gssapi.h>
#include "datamodel/GSSBuffer.h"
#include "GSSCommand.h"
-typedef OM_uint32 (*gss_pseudo_random_type) (
+typedef OM_uint32 (
KRB5_CALLCONV
*gss_pseudo_random_type) (
OM_uint32 *, /* minor_status */
gss_ctx_id_t, /* context */
int, /* prf_key */
OM_uint32 *, /* minor_status */
gss_ctx_id_t, /* context */
int, /* prf_key */
diff --git
a/json_gssapi/src/commands/GSSUnwrap.h
b/json_gssapi/src/commands/GSSUnwrap.h
index
e9fcf60
..
93d09d9
100644
(file)
--- a/
json_gssapi/src/commands/GSSUnwrap.h
+++ b/
json_gssapi/src/commands/GSSUnwrap.h
@@
-39,7
+39,7
@@
#include "datamodel/GSSBuffer.h"
#include <gssapi/gssapi.h>
#include "datamodel/GSSBuffer.h"
#include <gssapi/gssapi.h>
-typedef OM_uint32 (*gss_unwrap_type) (
+typedef OM_uint32 (
KRB5_CALLCONV
*gss_unwrap_type) (
OM_uint32 *, /* minor_status */
gss_ctx_id_t, /* context_handle */
gss_buffer_t, /* input_message_buffer */
OM_uint32 *, /* minor_status */
gss_ctx_id_t, /* context_handle */
gss_buffer_t, /* input_message_buffer */
diff --git
a/json_gssapi/src/commands/GSSWrap.h
b/json_gssapi/src/commands/GSSWrap.h
index
796450c
..
08894cf
100644
(file)
--- a/
json_gssapi/src/commands/GSSWrap.h
+++ b/
json_gssapi/src/commands/GSSWrap.h
@@
-40,7
+40,7
@@
#include "GSSCommand.h"
#include "datamodel/GSSBuffer.h"
#include "GSSCommand.h"
#include "datamodel/GSSBuffer.h"
-typedef OM_uint32 (*gss_wrap_type) (
+typedef OM_uint32 (
KRB5_CALLCONV
*gss_wrap_type) (
OM_uint32 *, /* minor_status */
gss_ctx_id_t, /* context_handle */
int, /* conf_req_flag */
OM_uint32 *, /* minor_status */
gss_ctx_id_t, /* context_handle */
int, /* conf_req_flag */
diff --git
a/json_gssapi/src/datamodel/GSSCredential.h
b/json_gssapi/src/datamodel/GSSCredential.h
index
9c81718
..
e324bc5
100644
(file)
--- a/
json_gssapi/src/datamodel/GSSCredential.h
+++ b/
json_gssapi/src/datamodel/GSSCredential.h
@@
-12,7
+12,7
@@
#include <gssapi/gssapi.h>
#include <string>
#include <gssapi/gssapi.h>
#include <string>
-typedef OM_uint32 (*gss_acq_cred_type)(
+typedef OM_uint32 (
KRB5_CALLCONV
*gss_acq_cred_type)(
OM_uint32 *, /* minor_status */
gss_name_t, /* desired_name */
OM_uint32, /* time_req */
OM_uint32 *, /* minor_status */
gss_name_t, /* desired_name */
OM_uint32, /* time_req */
diff --git
a/json_gssapi/src/datamodel/GSSName.h
b/json_gssapi/src/datamodel/GSSName.h
index
f8a4fdd
..
74eccbc
100644
(file)
--- a/
json_gssapi/src/datamodel/GSSName.h
+++ b/
json_gssapi/src/datamodel/GSSName.h
@@
-13,7
+13,7
@@
#define GSSNAME_H
#define GSSNAME_H
-typedef OM_uint32 (*gss_imp_name_type)(
+typedef OM_uint32 (
KRB5_CALLCONV
*gss_imp_name_type)(
OM_uint32 *, /* minor_status */
gss_buffer_t, /* input_name_buffer */
gss_OID, /* input_name_type(used to be const) */
OM_uint32 *, /* minor_status */
gss_buffer_t, /* input_name_buffer */
gss_OID, /* input_name_type(used to be const) */