X-Git-Url: http://www.project-moonshot.org/gitweb/?p=moonshot.git;a=blobdiff_plain;f=rpm-sources%2Ffreeradius-rlm_pap-overflow.patch;fp=rpm-sources%2Ffreeradius-rlm_pap-overflow.patch;h=0000000000000000000000000000000000000000;hp=f37c33c20f3834ae385ed12b8aed8570e01b75bb;hb=b14194ec327d694bc84fbab67ef3689711cc2dad;hpb=60450f58765da6ab187477a5cbfcb8fbd6c3b485

diff --git a/rpm-sources/freeradius-rlm_pap-overflow.patch b/rpm-sources/freeradius-rlm_pap-overflow.patch
deleted file mode 100644
index f37c33c..0000000
--- a/rpm-sources/freeradius-rlm_pap-overflow.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From ff5147c9e5088c7cf5c0b6ec6bfdd3a9d2042a28 Mon Sep 17 00:00:00 2001
-From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
-Date: Thu, 13 Feb 2014 13:49:54 +0000
-Subject: [PATCH 1/1] Fix potential crash with SSHA and salts > 44bytes
-
----
- src/modules/rlm_pap/rlm_pap.c | 10 ++++++----
- 1 file changed, 6 insertions(+), 4 deletions(-)
-
-diff --git a/src/modules/rlm_pap/rlm_pap.c b/src/modules/rlm_pap/rlm_pap.c
-index 689acf0..1bf6d4e 100644
---- a/src/modules/rlm_pap/rlm_pap.c
-+++ b/src/modules/rlm_pap/rlm_pap.c
-@@ -123,7 +123,7 @@ static int mod_instantiate(CONF_SECTION *conf, void *instance)
- static void normify(REQUEST *request, VALUE_PAIR *vp, size_t min_length)
- {
- 
--	uint8_t buffer[64];
-+	uint8_t buffer[256];
- 
- 	if (min_length >= sizeof(buffer)) return; /* paranoia */
- 
-@@ -132,9 +132,10 @@ static void normify(REQUEST *request, VALUE_PAIR *vp, size_t min_length)
- 	 */
- 	if (vp->length >= (2 * min_length)) {
- 		size_t decoded;
--		decoded = fr_hex2bin(buffer, vp->vp_strvalue, vp->length >> 1);
-+		decoded = fr_hex2bin(buffer, vp->vp_strvalue, sizeof(buffer));
- 		if (decoded == (vp->length >> 1)) {
--			RDEBUG2("Normalizing %s from hex encoding", vp->da->name);
-+			RDEBUG2("Normalizing %s from hex encoding, %zu bytes -> %zu bytes",
-+				vp->da->name, vp->length, decoded);
- 			pairmemcpy(vp, buffer, decoded);
- 			return;
- 		}
-@@ -150,7 +151,8 @@ static void normify(REQUEST *request, VALUE_PAIR *vp, size_t min_length)
- 					   sizeof(buffer));
- 		if (decoded < 0) return;
- 		if (decoded >= (ssize_t) min_length) {
--			RDEBUG2("Normalizing %s from base64 encoding", vp->da->name);
-+			RDEBUG2("Normalizing %s from base64 encoding, %zu bytes -> %zu bytes",
-+				vp->da->name, vp->length, decoded);
- 			pairmemcpy(vp, buffer, decoded);
- 			return;
- 		}
--- 
-1.8.5.3
-