From: Alan T. DeKok <aland@freeradius.org>
Date: Fri, 27 Jul 2012 20:51:14 +0000 (-0400)
Subject: Dump invalid diameter attrs in TTLS inner tunnel
X-Git-Tag: release_3_0_0_beta0~110
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=833b199c1868df7568c7e6e7f5773782ba15fbfa;p=thirdparty%2Ffreeradius-server.git

Dump invalid diameter attrs in TTLS inner tunnel
---

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 6402bd65110..7c966803e78 100644
--- a/src/modules/rlm_eap/types/rlm_eap_ttls/ttls.c
+++ b/src/modules/rlm_eap/types/rlm_eap_ttls/ttls.c
@@ -56,6 +56,20 @@ static int diameter_verify(REQUEST *request,
 
 		if (data_len < 12) {
 			RDEBUG2(" Diameter attribute is too small to contain a Diameter header");
+#ifndef NDEBUG
+		dump_hex:
+			if (debug_flag) {
+				unsigned int i;
+
+				for (i = 0; i < data_len; i++) {
+					if ((i & 0x0f) == 0) printf("%04x: ", i);
+					printf("%02x ", data[i]);
+					if ((i & 0x0f) == 0x0f) printf("\n");
+				}
+				if ((data_len & 0x0f) != 0x0f) printf("\n");
+			}
+#endif
+
 			return 0;
 		}
 
@@ -67,7 +81,7 @@ static int diameter_verify(REQUEST *request,
 		if ((data[4] & 0x80) != 0) {
 			if (data_len < 16) {
 				RDEBUG2(" Diameter attribute is too small to contain a Diameter header with Vendor-Id");
-				return 0;
+				goto dump_hex;
 			}
 
 			hdr_len = 16;
@@ -83,12 +97,12 @@ static int diameter_verify(REQUEST *request,
 		 */
 		if (length <= (hdr_len - 4)) {
 			RDEBUG2("Tunneled attribute %u is too short (%u < %u) to contain anything useful.", attr, length, hdr_len);
-			return 0;
+			goto dump_hex;
 		}
 
 		if (length > data_left) {
 			RDEBUG2("Tunneled attribute %u is longer than room left in the packet (%u > %u).", attr, length, data_left);
-			return 0;
+			goto dump_hex;
 		}
 
 		/*
@@ -114,7 +128,7 @@ static int diameter_verify(REQUEST *request,
 		 */
 		if (data_left < length) {
 			RDEBUG2("ERROR! Diameter attribute overflows packet!");
-			return 0;
+			goto dump_hex;
 		}
 
 		/*