Merge branch 'pr-178'

lib/util.c

@@ -57,8 +57,8 @@
  */
 const uint8_t CHUID_TMPL[] = {
   0x30, 0x19, 0xd4, 0xe7, 0x39, 0xda, 0x73, 0x9c, 0xed, 0x39, 0xce, 0x73, 0x9d,
-  0x83, 0x68, 0x58, 0x21, 0x08, 0x42, 0x10, 0x84, 0x21, 0x38, 0x42, 0x10, 0xc3,
+  0x83, 0x68, 0x58, 0x21, 0x08, 0x42, 0x10, 0x84, 0x21, 0xc8, 0x42, 0x10, 0xc3,
-  0xf5, 0x34, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0xeb, 0x34, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x35, 0x08, 0x32, 0x30, 0x33, 0x30, 0x30,
   0x31, 0x30, 0x31, 0x3e, 0x00, 0xfe, 0x00,
 };

tools/fasc.pl

@@ -31,24 +31,24 @@
 #  S9999F9999F999999F0F1F0000000000300001E
 # and outputs that in hex, encoded in the 5-bit form described in
 # "Technical Implementation Guidance: Smart Card Enabled Physical Access
-#  Control Systems"
+#  Control Systems Version 2.2", Section 6.2, Figure 7.
 
 use strict;
 use Bit::Vector;
 
 my %encoding = (
   0 => "00001",
-  1 => "00010",
+  1 => "10000",
-  2 => "00100",
+  2 => "01000",
-  3 => "00111",
+  3 => "11001",
-  4 => "01000",
+  4 => "00100",
-  5 => "01011",
+  5 => "10101",
   6 => "01101",
-  7 => "01110",
+  7 => "11100",
-  8 => "10000",
+  8 => "00010",
   9 => "10011",
-  S => "11010", # the examples and definitions of S and F differ
+  S => "11010",
-  F => "10110", # but we'll go with the examples here..
+  F => "10110",
   E => "11111",
 );