From: Dobrica Pavlinusic <dpavlin@rot13.org>
Date: Sun, 23 Jan 2011 16:39:46 +0000 (+0100)
Subject: fix keys output to 16 block sectors
X-Git-Url: http://git.rot13.org/?p=perl-Mifare-MAD.git;a=commitdiff_plain;h=bffc5fe4ca42fbeb7577657b1b9f058030011329

fix keys output to 16 block sectors
---

diff --git a/mifare-mad.pl b/mifare-mad.pl
index 92474e1..5319f2c 100755
--- a/mifare-mad.pl
+++ b/mifare-mad.pl
@@ -157,7 +157,7 @@ foreach my $sector ( 0 .. 39 ) {
 		my $hex = unpack('H*',$block);
 		$hex =~ s/(....)/$1 /g;
 
-		if ( $ENV{SWAP} && $j < 3 ) {
+		if ( $ENV{SWAP} && $j < $blocks - 1 ) {
 			my $hex_sw = unpack('h*',$block);
 			$hex_sw =~ s/(....)/$1 /g;
 			$hex .= " | $hex_sw";
@@ -171,10 +171,10 @@ foreach my $sector ( 0 .. 39 ) {
 
 
 	printf "KEY A:%s | %s GDP: %s | B:%s\n"
-		,unpack('H*',substr($card,$pos+0x30   ,6))
-		,unpack('H*',substr($card,$pos+0x30+6 ,3))
-		,unpack('H*',substr($card,$pos+0x30+9 ,1))
-		,unpack('H*',substr($card,$pos+0x30+10,6))
+		,unpack('H*',substr($card,$trailer_pos   ,6))
+		,unpack('H*',substr($card,$trailer_pos+6 ,3))
+		,unpack('H*',substr($card,$trailer_pos+9 ,1))
+		,unpack('H*',substr($card,$trailer_pos+10,6))
 		;
 
 	print "\n";