X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=mifare-mad.pl;h=c74f03f3820ef61682ad09b47f56b040efeb773b;hb=2f234af309df951d51cc84545c68db328310e2fe;hp=709e5fc180bfc434efec8b05db0d21ad1d821613;hpb=28401255d81b2ee1ea420dbdcc9843973ff4faeb;p=perl-Mifare-MAD.git

diff --git a/mifare-mad.pl b/mifare-mad.pl
index 709e5fc..c74f03f 100755
--- a/mifare-mad.pl
+++ b/mifare-mad.pl
@@ -45,7 +45,7 @@ my $access_condition_data = {
 
 my $access_condition_trailer = {
 0b000 => 'R/W: KEYA:-/A ACCESS:A-/- DATB:A/A ?',
-0b010 => 'R/W: KEYA:-/- ACCESS:A-/- DATB:A/- ?'.
+0b010 => 'R/W: KEYA:-/- ACCESS:A-/- DATB:A/- ?',
 0b100 => 'R/W: KEYA:-/B ACCESS:AB/- KEYB:-/B',
 0b110 => 'R/W: KEYA:-/- ACCESS:AB/- KEYB:-/-',
 0b001 => 'R/W: KEYA:-/A ACCESS:A-/A DATB:A/A ? transport conf',
@@ -54,6 +54,12 @@ my $access_condition_trailer = {
 0b111 => 'R/W: KEYA:-/- ACCESS:AB/- KEYB:-/-',
 };
 
+my $life_cycle = {
+"\x78\x77\x88" => 'MAD INIT,RW',
+"\x7F\x07\x88" => 'NFC INIT,RW',
+"\x07\x8F\x0F" => 'READ ONLY',
+};
+
 
 if ( $debug ) {
 	warn "# function_clusters ",dump($function_clusters);
@@ -63,8 +69,8 @@ if ( $debug ) {
 local $/ = undef;
 my $card = <>;
 
-die "expected 4096 bytes, got ",length($card), " bytes\n"
-	unless length $card == 4096;
+die "expected 4096 or 1024 bytes, got ",length($card), " bytes\n"
+	unless length $card == 4096 || length $card == 1024;
 
 my ( $ADV, $MA, $DA );
 
@@ -74,6 +80,7 @@ foreach my $sector ( 0 .. 39 ) {
 
 	my $blocks = $sector < 32 ? 4 : 16;
 
+	last if $pos >= length($card);
 	next if substr($card,$pos,$blocks * 0x10) eq "\x00" x ($blocks * 0x10);
 
 	# General purpose byte (GPB)
@@ -90,7 +97,7 @@ foreach my $sector ( 0 .. 39 ) {
 		$ADV = $GBP & 0b00000011;
 		$MA  = $GBP & 0b01000000;
 		$DA  = $GBP & 0b10000000;
-		printf "ADV (MAD version code): %d %s\n", $ADV,
+		printf "ADV (MAD version code): %d\n", $ADV;
 		printf "MA (multiapplication): %s\n", $MA ? 'yes' : 'monoaplication';
 		printf "DA (MAD available): %s%s\n",  $DA ? 'yes' : 'no',
 			substr($card,$pos+0x30,6) eq "\xA0\xA1\xA2\xA3\xA4\xA5" ? ' public' : '';
@@ -101,7 +108,7 @@ foreach my $sector ( 0 .. 39 ) {
 		my $v = unpack('v',(substr($card, $mad_offset, 2)));
 		my $cluster_id = unpack('HH', (( $v & 0xff00 ) >> 8) );
 		my $full_id = sprintf "%04x",$v;
-		printf "MAD sector %-2d@%x %04x [%s]\n%s\n", $sector, $mad_offset, $v
+		printf "# sector %-2d MAD@%x %04x [%s]\n%s\n", $sector, $mad_offset, $v
 			, $function_clusters->{ $cluster_id }
 			, $mad_id->{$full_id} || "FIXME: add $full_id from MAD_overview.pdf to __DATA__ at end of $0"
 			;
@@ -138,43 +145,65 @@ foreach my $sector ( 0 .. 39 ) {
 	my $c2 = ( ord(substr($card,$trailer_pos+8,1)) & 0x0f );
 	my $c3 = ( ord(substr($card,$trailer_pos+8,1)) & 0xf0 ) >> 4;
 
-	printf "# trailer @%x c1:%d c2:%d c3:%d [%16b]\n"
-		, $trailer_pos, $c1, $c2, $c3
+	printf "# trailer @%x %016b c1:%08b c2:%08b c3:%08b\n"
 		, unpack('n',(substr($card,$trailer_pos+7,2)))
+		, $trailer_pos, $c1, $c2, $c3
 		;
 
+	my $condition = '';
 	foreach my $j ( 0 .. $blocks - 1 ) {
 		my $offset = $pos + $j * 0x10;
 		my $block = substr($card, $offset, 0x10);
-		my $mask = 1 << $j;
-		my $cond
-			= ( ( $c1 & $mask ) * 4 )
-			+ ( ( $c2 & $mask ) * 2 )
-			+ ( ( $c3 & $mask ) * 1 )
-			;
-		$cond >>= $j;
+
+		my $acl_block =
+			$sector < 32 ? $j :
+			$j % 5 == 0  ? $j / 5 :
+			undef; # display condition only once for block group
+
+		if ( defined $acl_block ) {
+			my $trailer = $j == ( $blocks - 1 );
+			my $mask = 1 << $acl_block;
+			my $cond
+				= ( ( $c1 & $mask ) * 4 )
+				+ ( ( $c2 & $mask ) * 2 )
+				+ ( ( $c3 & $mask ) * 1 )
+				;
+			$cond >>= $acl_block;
+			$condition = sprintf ' %03b %s'
+				, $cond
+				, $trailer ? $access_condition_trailer->{$cond}
+				           : $access_condition_data->{$cond}
+				;
+			if ( ! $trailer && ( $cond == 0b001 || $cond == 0b011 ) ) {
+				my $value_block = unpack 'x4Lx8', $block;
+				my $positive = $value_block & 0x8000_0000;
+				my $value    = $value_block & 0x7fff_ffff;
+				$value = -$value if ! $positive;
+				#$condition .= sprintf " = %d 0x%x", $value, $value_block;
+				$condition .= " = " . $value;
+			}
+		} else {
+			$condition = '';
+		}
 
 		my $hex = unpack('H*',$block);
 		$hex =~ s/(....)/$1 /g;
 
-		if ( $ENV{SWAP} && $j < 3 ) {
+		if ( $ENV{SWAP} ) {
 			my $hex_sw = unpack('h*',$block);
 			$hex_sw =~ s/(....)/$1 /g;
 			$hex .= " | $hex_sw";
 		}
 
-		printf "%04x  %s %03b %s\n", $offset, $hex
-			, $cond
-			, $j < 3 ? $access_condition_data->{$cond} : $access_condition_trailer->{$cond}
-			;
+		printf "%x %03x  %s%s\n", $j, $offset, $hex, $condition;
 	}
 
-
-	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))
+	printf "KEY A:%s | %s GDP: %s | B:%s %s\n"
+		,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))
+		,$life_cycle->{substr($card,$trailer_pos+6,3)} || ''
 		;
 
 	print "\n";