projects
/
mech_eap.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Avoid MIT compat API when building with Heimdal
[mech_eap.git]
/
mech_eap
/
util.h
diff --git
a/mech_eap/util.h
b/mech_eap/util.h
index
5475dca
..
2238ac1
100644
(file)
--- a/
mech_eap/util.h
+++ b/
mech_eap/util.h
@@
-376,6
+376,8
@@
gssEapDeriveRfc3961Key(OM_uint32 *minor,
#ifdef HAVE_HEIMDAL_VERSION
#ifdef HAVE_HEIMDAL_VERSION
+#include <der.h>
+
#define KRB_TIME_FOREVER ((time_t)~0L)
#define KRB_KEY_TYPE(key) ((key)->keytype)
#define KRB_TIME_FOREVER ((time_t)~0L)
#define KRB_KEY_TYPE(key) ((key)->keytype)
@@
-404,6
+406,11
@@
gssEapDeriveRfc3961Key(OM_uint32 *minor,
(cksum)->checksum.data = (d)->value; \
} while (0)
(cksum)->checksum.data = (d)->value; \
} while (0)
+#define KRB_CHECKSUM_FREE(ctx, cksum) do { \
+ der_free_octet_string(&(cksum)->checksum); \
+ memset((cksum), 0, sizeof(*(cksum))); \
+ } while (0)
+
#else
#define KRB_TIME_FOREVER KRB5_INT32_MAX
#else
#define KRB_TIME_FOREVER KRB5_INT32_MAX
@@
-440,6
+447,8
@@
gssEapDeriveRfc3961Key(OM_uint32 *minor,
(cksum)->contents = (d)->value; \
} while (0)
(cksum)->contents = (d)->value; \
} while (0)
+#define KRB_CHECKSUM_FREE(ctx, cksum) krb5_free_checksum_contents((ctx), (cksum))
+
#endif /* HAVE_HEIMDAL_VERSION */
#define KRB_KEY_INIT(key) do { \
#endif /* HAVE_HEIMDAL_VERSION */
#define KRB_KEY_INIT(key) do { \