projects
/
mech_eap.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixes for Heimdal (macOS) builds from Stefan.
[mech_eap.git]
/
mech_eap
/
util_krb.c
diff --git
a/mech_eap/util_krb.c
b/mech_eap/util_krb.c
index
9b9692a
..
f629a32
100644
(file)
--- a/
mech_eap/util_krb.c
+++ b/
mech_eap/util_krb.c
@@
-165,7
+165,7
@@
gssEapDeriveRfc3961Key(OM_uint32 *minor,
goto cleanup;
#endif /* HAVE_HEIMDAL_VERSION */
goto cleanup;
#endif /* HAVE_HEIMDAL_VERSION */
- /* Convert
BrowserID DH key
into a Kerberos key */
+ /* Convert
EAP MSK
into a Kerberos key */
#ifdef HAVE_HEIMDAL_VERSION
code = krb5_random_to_key(krbContext, encryptionType, inputKey,
#ifdef HAVE_HEIMDAL_VERSION
code = krb5_random_to_key(krbContext, encryptionType, inputKey,
@@
-329,7
+329,7
@@
rfc3961ChecksumTypeForKey(OM_uint32 *minor,
*cksumtype = KRB_CHECKSUM_TYPE(&cksum);
*cksumtype = KRB_CHECKSUM_TYPE(&cksum);
-
krb5_free_checksum_contents
(krbContext, &cksum);
+
KRB_CHECKSUM_FREE
(krbContext, &cksum);
#endif /* HAVE_KRB5INT_C_MANDATORY_CKSUMTYPE */
#ifdef HAVE_HEIMDAL_VERSION
#endif /* HAVE_KRB5INT_C_MANDATORY_CKSUMTYPE */
#ifdef HAVE_HEIMDAL_VERSION
@@
-350,7
+350,7
@@
krbCryptoLength(krb5_context krbContext,
#ifdef HAVE_HEIMDAL_VERSION
krb5_crypto krbCrypto,
#else
#ifdef HAVE_HEIMDAL_VERSION
krb5_crypto krbCrypto,
#else
- krb5_keyblock *key,
+
const
krb5_keyblock *key,
#endif
int type,
size_t *length)
#endif
int type,
size_t *length)
@@
-374,7
+374,7
@@
krbPaddingLength(krb5_context krbContext,
#ifdef HAVE_HEIMDAL_VERSION
krb5_crypto krbCrypto,
#else
#ifdef HAVE_HEIMDAL_VERSION
krb5_crypto krbCrypto,
#else
- krb5_keyblock *key,
+
const
krb5_keyblock *key,
#endif
size_t dataLength,
size_t *padLength)
#endif
size_t dataLength,
size_t *padLength)
@@
-417,7
+417,7
@@
krbBlockSize(krb5_context krbContext,
#ifdef HAVE_HEIMDAL_VERSION
krb5_crypto krbCrypto,
#else
#ifdef HAVE_HEIMDAL_VERSION
krb5_crypto krbCrypto,
#else
- krb5_keyblock *key,
+
const
krb5_keyblock *key,
#endif
size_t *blockSize)
{
#endif
size_t *blockSize)
{
@@
-480,6
+480,7
@@
krbEnctypeToString(
return 0;
}
return 0;
}
+#ifdef GSSEAP_ENABLE_REAUTH
krb5_error_code
krbMakeAuthDataKdcIssued(krb5_context context,
const krb5_keyblock *key,
krb5_error_code
krbMakeAuthDataKdcIssued(krb5_context context,
const krb5_keyblock *key,
@@
-675,3
+676,4
@@
cleanup:
return code;
#endif /* HAVE_HEIMDAL_VERSION */
}
return code;
#endif /* HAVE_HEIMDAL_VERSION */
}
+#endif /* GSSEAP_ENABLE_REAUTH */