cleanup GBP and indicate public MAD key

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

diff --git a/mifare-mad.pl b/mifare-mad.pl
index 18e4b6b..992c283 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:-/-',
 };
 
 
@@ -71,6 +71,8 @@ my ( $ADV, $MA, $DA );
 foreach my $i ( 0 .. 15 ) {
 
        my $pos = 0x40 * $i;
+       # General purpose byte (GPB)
+       my $GBP = ord(substr($card,0x39,1));
 
        if ( $i == 0 ) {
                printf "manufacturer block\nSerial number: %s\nCB: %s\nmanufacturer data: %s\n"
@@ -78,14 +80,15 @@ foreach my $i ( 0 .. 15 ) {
                        , 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;
-               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';
+
+               # 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 ) {