From: Alan T. DeKok <aland@freeradius.org>
Date: Wed, 20 Feb 2013 14:36:29 +0000 (-0500)
Subject: FIx build errors
X-Git-Tag: release_3_0_0_beta1~987
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0f88dc6062853ceae02c9e1080f58f4b71c3297b;p=thirdparty%2Ffreeradius-server.git

FIx build errors
---

diff --git a/share/dictionary.freeradius.internal b/share/dictionary.freeradius.internal
index 8af9c6cdfd9..2f004b53ca3 100644
--- 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 866c974472e..aca8089aaaf 100644
--- 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 e46e8f0416e..6913f068710 100644
--- 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 9fdcd3652a3..efc28da27a5 100644
--- 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);