Changeset 11489
- Timestamp:
- 01/29/19 17:35:10 (5 years ago)
- Location:
- trunk
- Files:
-
- 1 added
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/.gitignore
r10511 r11489 6 6 *~ 7 7 *.swp 8 9 # IDE resources 10 .vscode 8 11 9 12 # build directories … … 16 19 tests.bin 17 20 tests.bin.debug 21 22 # Emu files 23 *.patch 24 SoftCam.* -
trunk/module-dvbapi.c
r11482 r11489 4007 4007 for(i = program_info_length + program_info_start; i + 4 < length; i += es_info_length + 5) 4008 4008 { 4009 uint8_t stream_type = buffer[i], type = STREAM_ UNDEFINED;4009 uint8_t stream_type = buffer[i], type = STREAM_AUDIO; // default to audio - quick fix for missing audio when recording 4010 4010 uint16_t elementary_pid = b2i(2, buffer + i + 1) & 0x1FFF; 4011 4011 es_info_length = b2i(2, buffer + i + 3) & 0x0FFF; … … 7182 7182 { 7183 7183 int32_t key_pos_a = 0; 7184 uint8_t *cw;7185 7184 demux[i].ECMpids[j].useMultipleIndices = 1; 7186 7185 … … 7189 7188 if(demux[i].STREAMpidsType[k] == STREAM_VIDEO) 7190 7189 { 7191 cw = er->cw;7190 dvbapi_write_cw(i, er->cw, j, k, er->cw_ex.algo, er->cw_ex.algo_mode, er->msgid); 7192 7191 } 7193 7192 else if(demux[i].STREAMpidsType[k] == STREAM_AUDIO) 7194 7193 { 7195 cw = er->cw_ex.audio[key_pos_a]; 7196 if(key_pos_a < 3) 7194 if(key_pos_a < 4) 7197 7195 { 7196 dvbapi_write_cw(i, er->cw_ex.audio[key_pos_a], j, k, er->cw_ex.algo, er->cw_ex.algo_mode, er->msgid); 7198 7197 key_pos_a++; 7199 7198 } 7200 7199 } 7201 else // Data 7202 { 7203 cw = er->cw_ex.data; 7204 } 7205 dvbapi_write_cw(i, cw, j, k, er->cw_ex.algo, er->cw_ex.algo_mode, er->msgid); 7200 // Every channel that uses the extended cw has unencrypted subtitle streams, 7201 // so disable CW writing to save indices for audio streams and recordings. 7202 //else // Data 7203 //{ 7204 // dvbapi_write_cw(i, er->cw_ex.data, j, k, er->cw_ex.algo, er->cw_ex.algo_mode, er->msgid); 7205 //} 7206 7206 } 7207 7207 } -
trunk/module-newcamd-des.c
r11473 r11489 3 3 #include "oscam-string.h" 4 4 5 #define DES_IP 16 #define DES_IP_1 27 #define DES_RIGHT 48 #define DES_HASH 89 10 #define DES_ECM_CRYPT 011 #define DES_ECM_HASH DES_HASH12 5 #define DES_ECS2_DECRYPT (DES_IP | DES_IP_1 | DES_RIGHT) 13 6 #define DES_ECS2_CRYPT (DES_IP | DES_IP_1) 14 15 7 16 8 #define CRYPT 0 … … 357 349 } 358 350 359 staticvoid nc_des(uint8_t key[], uint8_t mode, uint8_t data[])351 void nc_des(uint8_t key[], uint8_t mode, uint8_t data[]) 360 352 { 361 353 uint8_t i; -
trunk/module-newcamd-des.h
r11480 r11489 2 2 #define MODULE_NEWCAMD_DES_H_ 3 3 4 int nc_des_encrypt(uint8_t *buffer, int len, uint8_t *deskey); 5 int nc_des_decrypt(uint8_t *buffer, int len, uint8_t *deskey); 6 uint8_t *nc_des_login_key_get(uint8_t *key1, uint8_t *key2, int len, uint8_t *des16); 4 #define DES_IP 1 5 #define DES_IP_1 2 6 #define DES_RIGHT 4 7 #define DES_HASH 8 8 9 #define DES_ECM_CRYPT 0 10 #define DES_ECM_HASH DES_HASH 11 12 void nc_des(uint8_t key[], uint8_t mode, uint8_t data[]) 13 int nc_des_encrypt(uint8_t *buffer, int len, uint8_t *deskey); 14 int nc_des_decrypt(uint8_t *buffer, int len, uint8_t *deskey); 15 uint8_t *nc_des_login_key_get(uint8_t *key1, uint8_t *key2, int len, uint8_t *des16); 7 16 8 17 #endif -
trunk/oscam-config-reader.c
r11473 r11489 1035 1035 } 1036 1036 1037 1038 static void reader_fixups_fn(void *var) 1037 void reader_fixups_fn(void *var) 1039 1038 { 1040 1039 struct s_reader *rdr = var; … … 1057 1056 } 1058 1057 } 1059 1060 1058 1061 1059 #define OFS(X) offsetof(struct s_reader, X) -
trunk/oscam-config.h
r11479 r11489 23 23 int32_t write_server(void); 24 24 void reload_readerdb(void); 25 void reader_fixups_fn(void *var); 25 26 26 27 void chk_sidtab(char *token, char *value, struct s_sidtab *sidtab); … … 64 65 FTAB_LOCALCARDS = 0x20, 65 66 FTAB_IGNCHKSMCAID = 0x40, 66 FTAB_IGNCRCCEX4USERONLYFOR = 0x80 67 FTAB_IGNCRCCEX4USERONLYFOR = 0x80, 68 FTAB_EMUAU = 0x100 67 69 }; 68 70
Note:
See TracChangeset
for help on using the changeset viewer.