From: Alan T. DeKok Date: Fri, 17 Nov 2017 21:01:47 +0000 (-0500) Subject: re-arrange X-Git-Tag: release_3_0_16~46 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=65dd334db058b9092e94e1f0eaddd950a63d4a19;p=thirdparty%2Ffreeradius-server.git re-arrange --- diff --git a/src/modules/rlm_eap/types/rlm_eap_fast/eap_fast.c b/src/modules/rlm_eap/types/rlm_eap_fast/eap_fast.c index 95e52171885..69070e5e288 100644 --- a/src/modules/rlm_eap/types/rlm_eap_fast/eap_fast.c +++ b/src/modules/rlm_eap/types/rlm_eap_fast/eap_fast.c @@ -268,11 +268,11 @@ static void eap_fast_append_crypto_binding(REQUEST *request, tls_session_t *tls_ { eap_fast_tunnel_t *t = tls_session->opaque; eap_tlv_crypto_binding_tlv_t binding; - memset(&binding, 0, sizeof(eap_tlv_crypto_binding_tlv_t)); const int len = sizeof(binding) - (&binding.reserved - (uint8_t *)&binding); RDEBUG("Sending Cryptobinding"); + memset(&binding, 0, sizeof(eap_tlv_crypto_binding_tlv_t)); binding.tlv_type = htons(EAP_FAST_TLV_MANDATORY | EAP_FAST_TLV_CRYPTO_BINDING); binding.length = htons(len); binding.version = EAP_FAST_VERSION; @@ -283,7 +283,6 @@ static void eap_fast_append_crypto_binding(REQUEST *request, tls_session_t *tls_ RANDFILL(binding.nonce); binding.nonce[sizeof(binding.nonce) - 1] &= ~0x01; /* RFC 4851 section 4.2.8 */ - fr_hmac_sha1(binding.compound_mac, (uint8_t *)&binding, sizeof(binding), t->cmk, EAP_FAST_CMK_LEN); eap_fast_tlv_append(tls_session, EAP_FAST_TLV_CRYPTO_BINDING, true, len, &binding.reserved);