krb5_data data;
krb5_checksum cksum;
krb5_boolean valid = FALSE;
+#ifdef HAVE_HEIMDAL_VERSION
+ krb5_crypto krbCrypto;
+#endif
if (chanBindings == GSS_C_NO_CHANNEL_BINDINGS ||
chanBindings->application_data.length == 0)
KRB_CHECKSUM_INIT(&cksum, ctx->checksumType, inputToken);
+#ifdef HAVE_HEIMDAL_VERSION
+ code = krb5_crypto_init(krbContext, &ctx->rfc3961Key, 0, &krbCrypto);
+ if (code != 0) {
+ *minor = code;
+ return GSS_S_FAILURE;
+ }
+
+ code = krb5_verify_checksum(krbContext, krbCrypto,
+ KEY_USAGE_GSSEAP_CHBIND_MIC,
+ data.data, data.length, &cksum);
+ if (code == KRB5KRB_AP_ERR_BAD_INTEGRITY) {
+ code = 0;
+ valid = FALSE;
+ } else if (code == 0) {
+ valid = TRUE;
+ }
+
+ krb5_crypto_destroy(krbContext, krbCrypto);
+#else
code = krb5_c_verify_checksum(krbContext, &ctx->rfc3961Key,
KEY_USAGE_GSSEAP_CHBIND_MIC,
&data, &cksum, &valid);
+#endif /* HAVE_HEIMDAL_VERSION */
if (code != 0) {
*minor = code;
return GSS_S_FAILURE;
#include "util_radius.h"
#include "utils/radius_utils.h"
#include "openssl/err.h"
+#ifdef HAVE_MOONSHOT_GET_IDENTITY
#include "libmoonshot.h"
+#endif
/* methods allowed for phase1 authentication*/
static const struct eap_method_type allowed_eap_method_types[] = {
} /* else log failures? */
}
+#ifdef HAVE_MOONSHOT_GET_IDENTITY
static int cert_to_byte_array(X509 *cert, unsigned char **bytes)
{
unsigned char *buf;
return hash_len;
}
-
static int peerValidateServerCert(int ok_so_far, X509* cert, void *ca_ctx)
{
char *realm = NULL;
wpa_printf(MSG_INFO, "peerValidateServerCert: Returning %d\n", ok_so_far);
return ok_so_far;
}
-
+#endif
static OM_uint32
peerConfigInit(OM_uint32 *minor, gss_ctx_id_t ctx)
eapPeerConfig->private_key_passwd = (char *)cred->password.value;
}
+#ifdef HAVE_MOONSHOT_GET_IDENTITY
eapPeerConfig->server_cert_cb = peerValidateServerCert;
+#endif
eapPeerConfig->server_cert_ctx = eapPeerConfig;
*minor = 0;
krb5_data data;
krb5_checksum cksum;
gss_buffer_desc cksumBuffer;
+#ifdef HAVE_HEIMDAL_VERSION
+ krb5_crypto krbCrypto;
+#endif
if (chanBindings == GSS_C_NO_CHANNEL_BINDINGS ||
chanBindings->application_data.length == 0)
gssBufferToKrbData(&chanBindings->application_data, &data);
+#ifdef HAVE_HEIMDAL_VERSION
+ code = krb5_crypto_init(krbContext, &ctx->rfc3961Key, 0, &krbCrypto);
+ if (code != 0) {
+ *minor = code;
+ return GSS_S_FAILURE;
+ }
+
+ code = krb5_create_checksum(krbContext, krbCrypto,
+ KEY_USAGE_GSSEAP_CHBIND_MIC,
+ ctx->checksumType,
+ data.data, data.length,
+ &cksum);
+ krb5_crypto_destroy(krbContext, krbCrypto);
+#else
code = krb5_c_make_checksum(krbContext, ctx->checksumType,
&ctx->rfc3961Key,
KEY_USAGE_GSSEAP_CHBIND_MIC,
&data, &cksum);
+#endif /* HAVE_HEIMDAL_VERSION */
if (code != 0) {
*minor = code;
return GSS_S_FAILURE;
major = duplicateBuffer(minor, &cksumBuffer, outputToken);
if (GSS_ERROR(major)) {
- krb5_free_checksum_contents(krbContext, &cksum);
+ KRB_CHECKSUM_FREE(krbContext, &cksum);
return major;
}
*minor = 0;
*smFlags |= SM_FLAG_OUTPUT_TOKEN_CRITICAL;
- krb5_free_checksum_contents(krbContext, &cksum);
+ KRB_CHECKSUM_FREE(krbContext, &cksum);
return GSS_S_CONTINUE_NEEDED;
}
#ifdef HAVE_HEIMDAL_VERSION
+#include <der.h>
+
#define KRB_TIME_FOREVER ((time_t)~0L)
#define KRB_KEY_TYPE(key) ((key)->keytype)
(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
(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 { \
} else {
size_t checksumSize;
+#ifdef HAVE_HEIMDAL_VERSION
+ code = krb5_checksumsize(krbContext, ctx->checksumType,
+ &checksumSize);
+#else
code = krb5_c_checksum_length(krbContext, ctx->checksumType,
&checksumSize);
+#endif
if (code != 0)
goto cleanup;
*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
return 0;
}
+#ifdef GSSEAP_ENABLE_REAUTH
krb5_error_code
krbMakeAuthDataKdcIssued(krb5_context context,
const krb5_keyblock *key,
return code;
#endif /* HAVE_HEIMDAL_VERSION */
}
+#endif /* GSSEAP_ENABLE_REAUTH */
*minor = GSSEAP_BAD_SERVICE_NAME;
}
- if (realm != NULL)
+ if (realm != NULL) {
+#ifdef HAVE_HEIMDAL_VERSION
+ krb5_xfree(realm);
+#else
krb5_free_default_realm(krbContext, realm);
+#endif
+ }
GSSEAP_FREE(service);
return major;