more work on SAML ification

[mech_eap.git] / util.h

diff --git a/util.h b/util.h
index 9933615..087dc1c 100644 (file)
--- a/util.h
+++ b/util.h
@@ -57,10 +57,16 @@
 #ifndef _UTIL_H_
 #define _UTIL_H_ 1
 
+#include <string.h>
+#include <errno.h>
+
 #include <krb5.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include "util_saml.h"
-#include "util_radius.h"
 
 #define KRB_KEY_TYPE(key)       ((key)->enctype)
 #define KRB_KEY_DATA(key)       ((key)->contents)
@@ -209,9 +215,9 @@ OM_uint32
 gssEapKerberosInit(OM_uint32 *minor, krb5_context *context);
 
 OM_uint32
-rfc3961EncTypeToChecksumType(OM_uint32 *minor,
-                             krb5_enctype etype,
-                             krb5_cksumtype *cksumtype);
+rfc3961ChecksumTypeForKey(OM_uint32 *minor,
+                          krb5_keyblock *key,
+                          krb5_cksumtype *cksumtype);
 
 #define GSSEAP_KRB_INIT(ctx) do {                   \
         OM_uint32 tmpMajor;                         \
@@ -504,4 +510,9 @@ store_oid(gss_OID oid, void *vp)
 
     return store_buffer(&buf, vp, FALSE);
 }
+
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _UTIL_H_ */