Changeset 8478
- Timestamp:
- 03/05/13 13:01:41 (11 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/globals.h
r8477 r8478 1395 1395 uint8_t cnxlastecm; // == 0 - las ecm has not been paired ecm, > 0 last ecm has been paired ecm 1396 1396 1397 uint8_t bulcrypt_version;1398 1397 uint8_t emm_reassembly; 1399 1398 -
trunk/reader-bulcrypt.c
r8476 r8478 128 128 // See bulcrypt_card_info() for reponse description 129 129 130 struct bulcrypt_data { 131 uint8_t bulcrypt_version; 132 }; 133 130 134 static int32_t bulcrypt_card_init(struct s_reader *reader, ATR *newatr) 131 135 { … … 139 143 def_resp 140 144 141 reader->bulcrypt_version = 0;142 143 145 if (memcmp(atr, atr_carpet, MIN(sizeof(atr_carpet), atr_size)) != 0) 144 146 { … … 150 152 } 151 153 154 if (!cs_malloc(&reader->csystem_data, sizeof(struct bulcrypt_data))) 155 return ERROR; 156 struct bulcrypt_data *csystem_data = reader->csystem_data; 157 152 158 reader->nprov = 1; 153 159 memset(reader->prid, 0, sizeof(reader->prid)); … … 163 169 { 164 170 // The card is v1 165 reader->bulcrypt_version = 1;171 csystem_data->bulcrypt_version = 1; 166 172 set_key_command = cmd_set_key; 167 173 } else { 168 174 // The card is v2 169 reader->bulcrypt_version = 2;175 csystem_data->bulcrypt_version = 2; 170 176 set_key_command = cmd_set_key_v2; 171 177 } … … 180 186 } 181 187 182 rdr_log(reader, "Bulcrypt v%d card detected.%s", reader->bulcrypt_version,183 reader->bulcrypt_version != 1 ? " *UNSUPPORTED CARD VERSION*" : "");188 rdr_log(reader, "Bulcrypt v%d card detected.%s", csystem_data->bulcrypt_version, 189 csystem_data->bulcrypt_version != 1 ? " *UNSUPPORTED CARD VERSION*" : ""); 184 190 185 191 // Read card type … … 290 296 char tmp[512]; 291 297 uchar ecm_cmd[256]; 298 struct bulcrypt_data *csystem_data = reader->csystem_data; 292 299 293 300 def_resp … … 351 358 // Remove code word obfuscation 352 359 uchar *cw = cta_res + 3; 353 if ( reader->bulcrypt_version == 1) {360 if (csystem_data->bulcrypt_version == 1) { 354 361 int i; 355 362 for (i = 0 ; i < 16; i++) {
Note:
See TracChangeset
for help on using the changeset viewer.