FIx build errors

diff --git a/share/dictionary.freeradius.internal b/share/dictionary.freeradius.internal
index 8af9c6cdfd93597d8ce69f4f63ce786c3db5c2d4..2f004b53ca37d375517d5dca56cd307dc25cbfe1 100644 (file)
--- a/share/dictionary.freeradius.internal
+++ b/share/dictionary.freeradius.internal
@@ -239,7 +239,7 @@ ATTRIBUTE   FreeRADIUS-Client-Src-IP-Address        1143    ipaddr
 ATTRIBUTE      FreeRADIUS-Client-Src-IPv6-Address      1144    ipv6addr
 
 ATTRIBUTE      OTP-Challenge                           1145    string
-
+ATTRIBUTE      EAP-Session-Id                          1146    octets
 #
 #      Range:  1200-1279
 #              EAP-SIM (and other EAP type) weirdness.

diff --git a/src/include/radius.h b/src/include/radius.h
index 866c974472e12d93315097428883423c9100abfd..aca8089aaaf861d9c23ec4b513db61b7c47964a7 100644 (file)
--- a/src/include/radius.h
+++ b/src/include/radius.h
@@ -251,6 +251,8 @@ typedef enum {
 #define PW_FREERADIUS_CLIENT_SRC_IPV6_ADDRESS  1144
 
 #define PW_OTP_CHALLENGE               1145
+#define PW_EAP_SESSION_ID              1146
+
 /*
  *     Integer Translations
  */

diff --git a/src/modules/rlm_eap/libeap/eap_tls.h b/src/modules/rlm_eap/libeap/eap_tls.h
index e46e8f0416e3f37baf8d6405356b9b4d6ebb3c90..6913f0687100a84c4a1aef840f9c0aff796006cc 100644 (file)
--- a/src/modules/rlm_eap/libeap/eap_tls.h
+++ b/src/modules/rlm_eap/libeap/eap_tls.h
@@ -70,6 +70,7 @@ int           eaptls_request(EAP_DS *eap_ds, tls_session_t *ssn);
 void            eaptls_gen_mppe_keys(VALUE_PAIR **reply_vps, SSL *s,
                                     const char *prf_label);
 void           eapttls_gen_challenge(SSL *s, uint8_t *buffer, size_t size);
+void eaptls_gen_eap_key(SSL *s, uint32_t header, VALUE_PAIR **vps);
 
 #define BUFFER_SIZE 1024
 

diff --git a/src/modules/rlm_eap/libeap/mppe_keys.c b/src/modules/rlm_eap/libeap/mppe_keys.c
index 9fdcd3652a32edd35bb532b78b4166dcedc77a45..efc28da27a5caeeb1de483808409a82a3456ac4e 100644 (file)
--- a/src/modules/rlm_eap/libeap/mppe_keys.c
+++ b/src/modules/rlm_eap/libeap/mppe_keys.c
@@ -181,8 +181,8 @@ void eapttls_gen_challenge(SSL *s, uint8_t *buffer, size_t size)
                return;
        }
 
-       memcpy(p, EAPTLS_PRF_CHALLENGE, sizeof(EAPTLS_PRF_CHALLENGE)-1);
-       p += sizeof(EAPTLS_PRF_CHALLENGE)-1;
+       memcpy(p, FR_TLS_PRF_CHALLENGE, sizeof(FR_TLS_PRF_CHALLENGE)-1);
+       p += sizeof(FR_TLS_PRF_CHALLENGE)-1;
        memcpy(p, s->s3->client_random, SSL3_RANDOM_SIZE);
        p += SSL3_RANDOM_SIZE;
        memcpy(p, s->s3->server_random, SSL3_RANDOM_SIZE);