Changeset 4742
- Timestamp:
- 02/20/11 22:42:39 (13 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/reader-common.h
r4693 r4742 29 29 #define def_resp \ 30 30 unsigned char cta_res[CTA_RES_LEN]; \ 31 memset(cta_res, 0, CTA_RES_LEN); \ 31 32 unsigned short cta_lr; -
trunk/reader-nagra.c
r4669 r4742 172 172 memset(parte_fija, 0, 120); 173 173 BN_bn2bin(bnPT, parte_fija + (120-BN_num_bytes(bnPT))); 174 #ifndef WITH_LIBCRYPTO 174 175 BN_CTX_end(ctx); 176 #endif 175 177 BN_CTX_free (ctx); 176 178 … … 192 194 193 195 memcpy(reader->hexserial+2, parte_fija+15, 4); 194 196 memcpy(reader->sa[0], parte_fija+15, 2); 195 197 196 198 memcpy(reader->irdId, parte_fija+19, 4); … … 209 211 memset(parte_variable, 0, 88); 210 212 BN_bn2bin(bnPT1, parte_variable + (88-BN_num_bytes(bnPT1))); 213 #ifndef WITH_LIBCRYPTO 211 214 BN_CTX_end(ctx1); 215 #endif 212 216 BN_CTX_free (ctx1); 213 217 214 215 216 217 218 reader->ActivationDate[0] = parte_variable[65]; 219 reader->ActivationDate[1] = parte_variable[66]; 220 reader->ExpiryDate[0] = parte_variable[69]; 221 reader->ExpiryDate[1] = parte_variable[70]; 218 222 219 223 reader->prid[0][0]=0x00; … … 243 247 memset(d2_data, 0, 88); 244 248 BN_bn2bin(bnPT3, d2_data + (88-BN_num_bytes(bnPT3))); 249 #ifndef WITH_LIBCRYPTO 245 250 BN_CTX_end(ctx3); 251 #endif 246 252 BN_CTX_free (ctx3); 247 253 ReverseMem(d2_data, 88); … … 355 361 memset(cmd2b+10, 0, 64); 356 362 BN_bn2bin(bnPT, cmd2b+10 + (64-BN_num_bytes(bnPT))); 363 #ifndef WITH_LIBCRYPTO 357 364 BN_CTX_end(ctx); 365 #endif 358 366 BN_CTX_free (ctx); 359 367 ReverseMem(cmd2b+10, 64); … … 372 380 } 373 381 } 374 else 375 if(!do_cmd(reader, 0x27,0x47,0xa7,0x02,cmd2b+10,cta_res,&cta_lr)) { 376 cs_debug_mask(D_READER, "[nagra-reader] CMD$27 failed"); 377 return ERROR; 378 } 382 else if(!do_cmd(reader, 0x27,0x47,0xa7,0x02,cmd2b+10,cta_res,&cta_lr)) { 383 cs_debug_mask(D_READER, "[nagra-reader] CMD$27 failed"); 384 return ERROR; 385 } 379 386 380 387 cs_debug_mask(D_READER, "[nagra-reader] session key negotiated"); … … 570 577 def_resp; 571 578 memset(reader->rom, 0, 15); 572 reader->nprov = 1;573 579 reader->is_pure_nagra = 0; 574 580 reader->is_tiger = 0; 575 581 reader->is_n3_na = 0; 576 582 reader->has_dt08 = 0; 577 583 reader->swapCW = 0; 578 584 memset(reader->irdId, 0xff, 4); 579 585 memset(reader->hexserial, 0, 8); 580 reader->caid=SYSTEM_NAGRA;581 586 582 587 if(memcmp(atr+11,"DNASP240",8)==0 || memcmp(atr+11,"DNASP241", 8)==0) { … … 619 624 } 620 625 else return ERROR; 626 627 reader->nprov = 1; 621 628 622 629 if (!reader->is_tiger)
Note:
See TracChangeset
for help on using the changeset viewer.