From 2274792ed0070490bd54da6a9a2167200ecdf1ac Mon Sep 17 00:00:00 2001
From: Rich Wareham <rjw57@cam.ac.uk>
Date: Tue, 21 Sep 2010 14:25:10 +0100
Subject: [PATCH] and replace reduce() with sum

---
 generate_key.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/generate_key.py b/generate_key.py
index 7c7b00e..0352b8d 100755
--- a/generate_key.py
+++ b/generate_key.py
@@ -111,12 +111,10 @@ def do_test(key_matrix):
 	output_human_readable(snk_ksv, snk_key, True)
 
 	# add sink keys together according to src ksv
-	key1 = reduce(lambda x, y: (x+y) & 0xffffffffffffff, 
-		( x[1] for x in zip(range(40), snk_key) if src_ksv & (1<<x[0]) ))
+	key1 = sum( x[1] for x in zip(range(40), snk_key) if src_ksv & (1<<x[0]) ) & 0xffffffffffffff
 
 	# add source keys together according to sink ksv
-	key2 = reduce(lambda x, y: (x+y) & 0xffffffffffffff, 
-		( x[1] for x in zip(range(40), src_key) if snk_ksv & (1<<x[0]) ))
+	key2 = sum( x[1] for x in zip(range(40), src_key) if snk_ksv & (1<<x[0]) ) & 0xffffffffffffff
 
 	print('\nGenerated keys: sink = %014x, source = %014x' % (key1, key2))