Browse Source

Init bit sliced dvbpsi key

Georgi Chorbadzhiyski 13 years ago
parent
commit
c94b13b0a5
3 changed files with 10 additions and 0 deletions
  1. 3
    0
      camd.c
  2. 6
    0
      data.c
  3. 1
    0
      data.h

+ 3
- 0
camd.c View File

@@ -145,6 +145,9 @@ READ:
145 145
 	dvbcsa_key_set(c->key->cw    , c->key->csakey[0]);
146 146
 	dvbcsa_key_set(c->key->cw + 8, c->key->csakey[1]);
147 147
 
148
+	dvbcsa_bs_key_set(c->key->cw    , c->key->bs_csakey[0]);
149
+	dvbcsa_bs_key_set(c->key->cw + 8, c->key->bs_csakey[1]);
150
+
148 151
 	return ret;
149 152
 }
150 153
 

+ 6
- 0
data.c View File

@@ -29,6 +29,9 @@ void data_init(struct ts *ts) {
29 29
 	ts->key.csakey[0] = dvbcsa_key_alloc();
30 30
 	ts->key.csakey[1] = dvbcsa_key_alloc();
31 31
 
32
+	ts->key.bs_csakey[0] = dvbcsa_bs_key_alloc();
33
+	ts->key.bs_csakey[1] = dvbcsa_bs_key_alloc();
34
+
32 35
 	// CAMD
33 36
 	memset(&ts->camd35, 0, sizeof(ts->camd35));
34 37
 	ts->camd35.server_fd    = -1;
@@ -66,6 +69,9 @@ void data_free(struct ts *ts) {
66 69
 	dvbcsa_key_free(ts->key.csakey[0]);
67 70
 	dvbcsa_key_free(ts->key.csakey[1]);
68 71
 
72
+	dvbcsa_bs_key_free(ts->key.bs_csakey[0]);
73
+	dvbcsa_bs_key_free(ts->key.bs_csakey[1]);
74
+
69 75
 	FREE(ts->input.fname);
70 76
 	FREE(ts->output.fname);
71 77
 }

+ 1
- 0
data.h View File

@@ -15,6 +15,7 @@ struct key {
15 15
 	uint8_t				cw[16];
16 16
 	int					is_valid_cw;
17 17
 	struct dvbcsa_key_s	*csakey[2];
18
+	struct dvbcsa_bs_key_s	*bs_csakey[2];
18 19
 };
19 20
 
20 21
 // 4 auth header, 20 header size, 256 max data size, 16 potential padding

Loading…
Cancel
Save