X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=mifare-mad.pl;h=1748d6d803c4c308c762d65d21d05dc5a5e5285a;hb=d0bba341e27cf623b346590cdeaf39aae87c8380;hp=6a1012c17c726e36ea8ba6a31e3f07e516e653d5;hpb=ff223496e40b401a136efbc51753bc583312a643;p=perl-Mifare-MAD.git

diff --git a/mifare-mad.pl b/mifare-mad.pl
index 6a1012c..1748d6d 100755
--- a/mifare-mad.pl
+++ b/mifare-mad.pl
@@ -67,16 +67,54 @@ die "expected 4096 bytes, got ",length($card), " bytes\n"
 	unless length $card == 4096;
 
 foreach my $i ( 0 .. 15 ) {
-	my $v = unpack('v',(substr($card, 0x10 + ( $i * 2 ), 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
-		, $function_clusters->{ $cluster_id }
-		, $mad_id->{$full_id} || "FIXME: add $full_id from MAD_overview.pdf to __DATA__ at end of $0"
-		;
 
 	my $pos = 0x40 * $i;
 
+	if ( $i == 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)));
+		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
+			, $function_clusters->{ $cluster_id }
+			, $mad_id->{$full_id} || "FIXME: add $full_id from MAD_overview.pdf to __DATA__ at end of $0"
+			;
+
+		if ( $v == 0x0004 ) {
+			# RLE encoded card holder information
+			my $data = substr( $card, $pos, 0x30);
+			my $o = 0;
+			my $types = {
+				0b00 => 'surname',
+				0b01 => 'given name',
+				0b10 => 'sex',
+				0b11 => 'any',
+			};
+			while ( substr($data,$o,1) ne "\x00" ) {
+				my $len = ord(substr($data,$o,1));
+				my $type = ( $len & 0b11000000 ) >> 6;
+				$len     =   $len & 0b00111111;
+				my $dump = substr($data,$o+1,$len-1);
+				$dump = '0x' . unpack('H*', $dump) if $type == 0b11; # any
+				printf "%-10s %2d %s\n", $types->{$type}, $len, $dump;
+				$o += $len + 1;
+			}
+		} elsif ( $v == 0x0015 ) {
+			printf "Card number: %s\n", unpack('h*',substr($card,$pos + 0x04,6));
+		}
+
+	}
+
 	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;
@@ -99,35 +137,13 @@ foreach my $i ( 0 .. 15 ) {
 	}
 
 
-	printf "KEY A:%s | %s | B:%s\n"
+	printf "KEY A:%s | %s GDP: %s | B:%s\n"
 		,unpack('H*',substr($card,$pos+0x30   ,6))
-		,unpack('H*',substr($card,$pos+0x30+6 ,4))
+		,unpack('H*',substr($card,$pos+0x30+6 ,3))
+		,unpack('H*',substr($card,$pos+0x30+9 ,1))
 		,unpack('H*',substr($card,$pos+0x30+10,6))
 		;
 
-	if ( $v == 0x0004 ) {
-		# RLE encoded card holder information
-		my $data = substr( $card, $pos, 0x30);
-		my $o = 0;
-		my $types = {
-			0b00 => 'surname',
-			0b01 => 'given name',
-			0b10 => 'sex',
-			0b11 => 'any',
-		};
-		while ( substr($data,$o,1) ne "\x00" ) {
-			my $len = ord(substr($data,$o,1));
-			my $type = ( $len & 0b11000000 ) >> 6;
-			$len     =   $len & 0b00111111;
-			my $dump = substr($data,$o+1,$len-1);
-			$dump = '0x' . unpack('H*', $dump) if $type == 0b11; # any
-			printf "%-10s %2d %s\n", $types->{$type}, $len, $dump;
-			$o += $len + 1;
-		}
-	} elsif ( $v == 0x0015 ) {
-		printf "Card number: %s\n", unpack('h*',substr($card,$pos + 0x04,6));
-	}
-
 	print "\n";
 
 }
@@ -184,11 +200,12 @@ E8    computer
 F0    mail
 F8-FF miscellaneous applications
 
-0000	sector free
-0001	sector defective
-0002	sector reserved
-0003	DIR continuted
-0004	card holder
+0000	sector is free
+0001	sector is defect, e.g. access keys are destroyed or unknown
+0002	sector is reserved
+0003	sector contains additional directory info (useful only for future cards)
+0004	sector contains card holder information in ASCII format.
+0005	sector not applicable (above memory size)
 
 0015 - card administration MIKROELEKTRONIKA spol.s.v.MIKROELEKTRONIKA spol.s.v.o. worldwide 1 01.02.2007 Card publisher info
 0016 - card administration Mikroelektronika spol.s.r.o., Kpt.Mikroelektronika spol.s.r.o., Kpt. PoEurope    1 10.10.2007 Issuer information