code cleanup to support dumping all 4k

[perl-Mifare-MAD.git] / mifare-mad.pl

diff --git a/mifare-mad.pl b/mifare-mad.pl
index 1748d6d..d5dd772 100755 (executable)
--- a/mifare-mad.pl
+++ b/mifare-mad.pl
@@ -33,25 +33,25 @@ 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: KEYSECXA:-/A ACCESS COND:A-/- KEYSECXB:A/A',
-0b010 => 'R/W: KEYSECXA:-/- ACCESS COND:A-/- KEYSECXB:A/-',
-0b100 => 'R/W: KEYSECXA:-/B ACCESS COND:AB/- KEYSECXB:-/B',
-0b110 => 'R/W: KEYSECXA:-/- ACCESS COND:AB/- KEYSECXB:-/-',
-0b001 => 'R/W: KEYSECXA:-/A ACCESS COND:A-/A KEYSECXB:A/A',
-0b011 => 'R/W: KEYSECXA:-/B ACCESS COND:AB/B KEYSECXB:-/B',
-0b101 => 'R/W: KEYSECXA:-/- ACCESS COND:AB/B KEYSECXB:-/-',
-0b111 => 'R/W: KEYSECXA:-/- ACCESS COND:AB/- KEYSECXB:-/-',
+0b000 => 'R/W: KEYA:-/A ACCESS:A-/- DATB:A/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',
+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:-/-',
 };
 
 
@@ -66,26 +66,40 @@ my $card = <>;
 die "expected 4096 bytes, got ",length($card), " bytes\n"
        unless length $card == 4096;
 
-foreach my $i ( 0 .. 15 ) {
+my ( $ADV, $MA, $DA );
 
-       my $pos = 0x40 * $i;
+my $pos = 0;
 
-       if ( $i == 0 ) {
+foreach my $sector ( 0 .. 39 ) {
+
+       my $blocks = $sector < 32 ? 4 : 16;
+
+       # 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,$pos+0x39,1));
-               printf "ADV (MAD version code): %d\n", $gdp & 0b00000011;
-               printf "MA (multiapplication): %s\n",  $gdp & 0b01000000 ? 'yes' : 'monoaplication';
-               printf "DA (MAD available): %s\n",     $gdp & 0b10000000 ? 'yes' : 'no';
-       } else {
-               my $v = unpack('v',(substr($card, 0x10 + ( $i * 2 ), 2)));
+
+               # MAD
+               $ADV = $GBP & 0b00000011;
+               $MA  = $GBP & 0b01000000;
+               $DA  = $GBP & 0b10000000;
+               printf "ADV (MAD version code): %d %s\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' : '';
+
+               printf "Info byte (publisher sector): %x\n", ord(substr($card,0x11,1));
+       } elsif ( $DA ) {
+               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 %04x [%s]\n%s\n", $i, $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"
                        ;
@@ -113,13 +127,21 @@ foreach my $i ( 0 .. 15 ) {
                        printf "Card number: %s\n", unpack('h*',substr($card,$pos + 0x04,6));
                }
 
+       } else {
+               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 c1:%d c2:%d c3:%d [%16b]\n"
+               , $trailer_pos, $c1, $c2, $c3
+               , unpack('n',(substr($card,$trailer_pos+7,2)))
+               ;
+
+       foreach my $j ( 0 .. $blocks - 1 ) {
                my $offset = $pos + $j * 0x10;
                my $block = substr($card, $offset, 0x10);
                my $mask = 1 << $j;
@@ -130,7 +152,16 @@ foreach my $i ( 0 .. 15 ) {
                        ;
                $cond >>= $j;
 
-               printf "%04x %s %03b %s\n", $offset, unpack('H*',$block)
+               my $hex = unpack('H*',$block);
+               $hex =~ s/(....)/$1 /g;
+
+               if ( $ENV{SWAP} && $j < 3 ) {
+                       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}
                        ;
@@ -146,6 +177,7 @@ foreach my $i ( 0 .. 15 ) {
 
        print "\n";
 
+       $pos += $blocks * 0x10;
 }
 
 __DATA__