X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=mifare-mad.pl;h=ce41e8240de4af7ce434503ebfdc1fdbd3a13f2b;hb=113b599ce569d8bc161f3c499921f2c845eac7ab;hp=027e6fcc277b157f0f5378c27a48c48f7b9618f3;hpb=8bc1f7fd2fd25155739071f06ac9020f2eb9d333;p=perl-Mifare-MAD.git

diff --git a/mifare-mad.pl b/mifare-mad.pl
index 027e6fc..ce41e82 100755
--- a/mifare-mad.pl
+++ b/mifare-mad.pl
@@ -33,27 +33,33 @@ while(<DATA>) {
 }
 
 my $access_condition_data = {
-0b000 => 'R:AB W:AB I:AB DTR:AB',
-0b010 => 'R:AB W:-- I:-- DTR:--',
-0b100 => 'R:AB W:-B I:-- DTR:--', 
-0b110 => 'R:AB W:-B I:-B DTR:AB',
-0b001 => 'R:AB W:-- I:-- DTR:AB',
-0b011 => 'R:-B W:-B I:-- DTR:--',
-0b101 => 'R:-B W:-- I:-- DTR:--',
-0b111 => 'R:-- W:-- I:-- DTR:--',
+0b000 => 'R:AB W:AB I:AB DTR:AB transport conf',
+0b010 => 'R:AB W:-- I:-- DTR:-- r/w block',
+0b100 => 'R:AB W:-B I:-- DTR:-- r/w block', 
+0b110 => 'R:AB W:-B I:-B DTR:AB r/w block',
+0b001 => 'R:AB W:-- I:-- DTR:AB value block',
+0b011 => 'R:-B W:-B I:-- DTR:-- value block',
+0b101 => 'R:-B W:-- I:-- DTR:-- r/w block',
+0b111 => 'R:-- W:-- I:-- DTR:-- r/w block',
 };
 
 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 ?',
+0b001 => 'R/W: KEYA:-/A ACCESS:A-/A DATB:A/A ? transport conf',
 0b011 => 'R/W: KEYA:-/B ACCESS:AB/B KEYB:-/B',
 0b101 => 'R/W: KEYA:-/- ACCESS:AB/B KEYB:-/-',
 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,37 +69,46 @@ 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 );
 
-foreach my $i ( 0 .. 15 ) {
+my $pos = 0;
+
+foreach my $sector ( 0 .. 39 ) {
+
+	my $blocks = $sector < 32 ? 4 : 16;
 
-	my $pos = 0x40 * $i;
+	last if $pos >= length($card);
+	next if substr($card,$pos,$blocks * 0x10) eq "\x00" x ($blocks * 0x10);
 
-	if ( $i == 0 ) {
+	# General purpose byte (GPB)
+	my $GBP = ord(substr($card,0x39,1));
+
+	if ( $sector == 0 ) {
 		printf "manufacturer block\nSerial number: %s\nCB: %s\nmanufacturer data: %s\n"
 			, unpack('H*',substr($card,0,4))
 			, unpack('H*',substr($card,4,1))
 			, unpack('H*',substr($card,5,11))
 			;
-		# General purpose byte (GPB)
-		my $gdp = ord(substr($card,0x39,1));
-		$ADV = $gdp & 0b00000011;
-		$MA  = $gdp & 0b01000000;
-		$DA  = $gdp & 0b10000000;
+
+		# MAD
+		$ADV = $GBP & 0b00000011;
+		$MA  = $GBP & 0b01000000;
+		$DA  = $GBP & 0b10000000;
 		printf "ADV (MAD version code): %d\n", $ADV;
-		printf "MA (multiapplication): %s\n",  $MA ? 'yes' : 'monoaplication';
-		printf "DA (MAD available): %s\n",     $DA ? 'yes' : 'no';
+		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' : '';
 
 		printf "Info byte (publisher sector): %x\n", ord(substr($card,0x11,1));
 	} elsif ( $DA ) {
-		my $mad_offset = 0x10 + ( $i * 2 );
+		my $mad_offset = 0x10 + ( $sector * 2 );
 		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", $i, $mad_offset, $v
+		printf "MAD sector %-2d@%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"
 			;
@@ -122,49 +137,70 @@ foreach my $i ( 0 .. 15 ) {
 		}
 
 	} else {
-		printf "# sector %-2d\n", $i;
+		printf "# sector %-2d with %d blocks\n", $sector, $blocks;
 	}
 
-	my $c1 = ( ord(substr($card,$pos+0x37,1)) & 0xf0 ) >> 4;
-	my $c2 = ( ord(substr($card,$pos+0x38,1)) & 0x0f );
-	my $c3 = ( ord(substr($card,$pos+0x38,1)) & 0xf0 ) >> 4;
+	my $trailer_pos = $pos + $blocks * 0x10 - 0x10;
+	my $c1 = ( ord(substr($card,$trailer_pos+7,1)) & 0xf0 ) >> 4;
+	my $c2 = ( ord(substr($card,$trailer_pos+8,1)) & 0x0f );
+	my $c3 = ( ord(substr($card,$trailer_pos+8,1)) & 0xf0 ) >> 4;
 
-	foreach my $j ( 0 .. 3 ) {
+	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 $cond = '';
+	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 $mask = 1 << $acl_block;
+			$cond
+				= ( ( $c1 & $mask ) * 4 )
+				+ ( ( $c2 & $mask ) * 2 )
+				+ ( ( $c3 & $mask ) * 1 )
+				;
+			$cond >>= $acl_block;
+			$cond = sprintf ' %03b %s'
+				, $cond
+				, $j == ( $blocks - 1 )
+					? $access_condition_trailer->{$cond}
+					: $access_condition_data->{$cond}
+				;
+		} else {
+			$cond = '';
+		}
 
 		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, $cond;
 	}
 
-
-	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";
 
+	$pos += $blocks * 0x10;
 }
 
 __DATA__