Don't use rad_assert in libeap, it's a server-only function.

diff --git a/src/modules/rlm_eap/libeap/eap_tls.c b/src/modules/rlm_eap/libeap/eap_tls.c
index 6adc0dd..981a911 100644 (file)
--- a/src/modules/rlm_eap/libeap/eap_tls.c
+++ b/src/modules/rlm_eap/libeap/eap_tls.c
@@ -37,6 +37,8 @@
  *
  */
 
+#include <freeradius-devel/autoconf.h>
+#include <assert.h>
 #include "eap_tls.h"
 
 /*
@@ -458,7 +460,7 @@ static EAPTLS_PACKET *eaptls_extract(EAP_DS *eap_ds, eaptls_status_t status)
         *      MUST have TLS type octet, followed by flags, followed
         *      by data.
         */
-       rad_assert(eap_ds->response->length > 2);
+       assert(eap_ds->response->length > 2);
 
        tlspacket = eaptls_alloc();
        if (tlspacket == NULL) return NULL;

diff --git a/src/modules/rlm_eap/libeap/eap_types.h b/src/modules/rlm_eap/libeap/eap_types.h
index f7a3809..7711986 100644 (file)
--- a/src/modules/rlm_eap/libeap/eap_types.h
+++ b/src/modules/rlm_eap/libeap/eap_types.h
@@ -39,8 +39,6 @@
 #include <freeradius-devel/radiusd.h>
 #include <freeradius-devel/modules.h>
 
-#include <freeradius-devel/rad_assert.h>
-
 #define PW_EAP_REQUEST         1
 #define PW_EAP_RESPONSE                2
 #define PW_EAP_SUCCESS         3

diff --git a/src/modules/rlm_eap/libeap/eapcrypto.c b/src/modules/rlm_eap/libeap/eapcrypto.c
index 1dae74e..17375e6 100644 (file)
--- a/src/modules/rlm_eap/libeap/eapcrypto.c
+++ b/src/modules/rlm_eap/libeap/eapcrypto.c
@@ -34,8 +34,6 @@
 #include "eap_sim.h"
 #include <freeradius-devel/sha1.h>
 
-#include <freeradius-devel/rad_assert.h>
-
 void eapsim_calculate_keys(struct eapsim_keys *ek)
 {
        SHA1_CTX context;

diff --git a/src/modules/rlm_eap/libeap/fips186prf.c b/src/modules/rlm_eap/libeap/fips186prf.c
index 77fecf0..704f660 100644 (file)
--- a/src/modules/rlm_eap/libeap/fips186prf.c
+++ b/src/modules/rlm_eap/libeap/fips186prf.c
@@ -61,8 +61,6 @@
 #include <inttypes.h>
 #endif
 
-#include <freeradius-devel/rad_assert.h>
-
 #include <freeradius-devel/sha1.h>
 
 /*