denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adapted recipe and patches to freeradius-2.2.1

Browse Source
This commit is contained in:
Andreas Steffen
2013-10-22 10:09:24 +02:00
parent 50d7a55c96
commit 252c04d3f9
3 changed files with 4 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
testing/scripts/recipes/003_freeradius.mk
+1 -2
View File
@@ -1,6 +1,6 @@
#!/usr/bin/make #!/usr/bin/make
PV = 2.2.0 PV = 2.2.1
PKG = freeradius-server-$(PV) PKG = freeradius-server-$(PV)
TAR = $(PKG).tar.bz2 TAR = $(PKG).tar.bz2
SRC = ftp://ftp.freeradius.org/pub/freeradius/$(TAR) SRC = ftp://ftp.freeradius.org/pub/freeradius/$(TAR)
@@ -16,7 +16,6 @@ CONFIG_OPTS = \
PATCHES = \ PATCHES = \
freeradius-eap-sim-identity \ freeradius-eap-sim-identity \
freeradius-avp-size \
freeradius-tnc-fhh freeradius-tnc-fhh
all: install all: install
testing/scripts/recipes/patches/freeradius-avp-size
-18
View File
@@ -1,18 +0,0 @@
diff --git a/src/modules/rlm_eap/types/rlm_eap_ttls/ttls.c b/src/modules/rlm_eap/types/rlm_eap_ttls/ttls.c
index 6c9bd13..3344c53 100644
--- a/src/modules/rlm_eap/types/rlm_eap_ttls/ttls.c
+++ b/src/modules/rlm_eap/types/rlm_eap_ttls/ttls.c
@@ -201,8 +201,11 @@ static VALUE_PAIR *diameter2vp(REQUEST *request, SSL *ssl,
goto next_attr;
}
- if (size > 253) {
- RDEBUG2("WARNING: diameter2vp skipping long attribute %u, attr");
+ /*
+ * EAP-Message AVPs can be larger than 253 octets.
+ */
+ if ((size > 253) && !((VENDOR(attr) == 0) && (attr == PW_EAP_MESSAGE))) {
+ RDEBUG2("WARNING: diameter2vp skipping long attribute %u", attr);
goto next_attr;
}
testing/scripts/recipes/patches/freeradius-tnc-fhh
+3 -3
View File
@@ -5074,7 +5074,7 @@ diff -u -r -N freeradius-server-2.2.0.orig/src/modules/rlm_eap/types/rlm_eap_tnc
* *
*/ */
-#include <freeradius-devel/ident.h> -#include <freeradius-devel/ident.h>
-RCSID("$Id$") -RCSID("$Id: 213ede51c46a8c533961be8715395c0ab1f6b5c9 $")
- -
- -
-/* -/*
@@ -5489,7 +5489,7 @@ diff -u -r -N freeradius-server-2.2.0.orig/src/modules/rlm_eap/types/rlm_eap_tnc
*/ */
-#include <freeradius-devel/ident.h> -#include <freeradius-devel/ident.h>
-RCSID("$Id$") -RCSID("$Id: 985ac01f384110b9a46ec8e84592351c21b3f09a $")
+/* +/*
+ * EAP-TNC Packet with EAP Header, general structure + * EAP-TNC Packet with EAP Header, general structure
+ * + *
@@ -6180,7 +6180,7 @@ diff -u -r -N freeradius-server-2.2.0.orig/src/modules/rlm_eap/types/rlm_eap_tnc
- * - *
- */ - */
-#include <freeradius-devel/ident.h> -#include <freeradius-devel/ident.h>
-RCSID("$Id$") -RCSID("$Id: 6077f6d2bdc2ebdea6575678e80e255f57215900 $")
- -
-#include "tncs_connect.h" -#include "tncs_connect.h"
-#include <ltdl.h> -#include <ltdl.h>