diff options
| author | Yves-Alexis Perez <corsac@debian.org> | 2013-11-01 13:32:07 +0100 |
|---|---|---|
| committer | Yves-Alexis Perez <corsac@debian.org> | 2013-11-01 13:32:07 +0100 |
| commit | 5313d2d78ca150515f7f5eb39801c100690b6b29 (patch) | |
| tree | c78e420367283bb1b16f14210b12687cdfbd26eb /testing/scripts/recipes/patches | |
| parent | 6b99c8d9cff7b3e8ae8f3204b99e7ea40f791349 (diff) | |
| download | vyos-strongswan-5313d2d78ca150515f7f5eb39801c100690b6b29.tar.gz vyos-strongswan-5313d2d78ca150515f7f5eb39801c100690b6b29.zip | |
Imported Upstream version 5.1.1
Diffstat (limited to 'testing/scripts/recipes/patches')
| -rw-r--r-- | testing/scripts/recipes/patches/freeradius-avp-size | 18 | ||||
| -rw-r--r-- | testing/scripts/recipes/patches/freeradius-tnc-fhh | 6 |
2 files changed, 3 insertions, 21 deletions
diff --git a/testing/scripts/recipes/patches/freeradius-avp-size b/testing/scripts/recipes/patches/freeradius-avp-size deleted file mode 100644 index e7e1f635b..000000000 --- a/testing/scripts/recipes/patches/freeradius-avp-size +++ /dev/null @@ -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; - } - diff --git a/testing/scripts/recipes/patches/freeradius-tnc-fhh b/testing/scripts/recipes/patches/freeradius-tnc-fhh index 5abc6b25f..785538323 100644 --- a/testing/scripts/recipes/patches/freeradius-tnc-fhh +++ b/testing/scripts/recipes/patches/freeradius-tnc-fhh @@ -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> --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> --RCSID("$Id$") +-RCSID("$Id: 985ac01f384110b9a46ec8e84592351c21b3f09a $") +/* + * 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> --RCSID("$Id$") +-RCSID("$Id: 6077f6d2bdc2ebdea6575678e80e255f57215900 $") - -#include "tncs_connect.h" -#include <ltdl.h> |