thomas/tvheadend-docker
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated libdvbcsa patch

Browse Source
This commit is contained in:
thomas
2022-12-28 10:13:29 +01:00
parent 2cea984025
commit 475f001721
1 changed files with 73 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
patches/libdvbcsa.patch
+73 -33
View File
@@ -1,24 +1,44 @@
diff --git a/README b/README
index f480e67..f41b865 100644
--- a/README
+++ b/README
@@ -135,6 +135,12 @@ Example:
dvbcsa_bs_encrypt(key, b, 184);
+ DVBCSA_KEY_ECM
+
+ unsigned char ecm = (ecm_caid >> 8 == 0x09 && (ecm_data[2] - ecm_data[4]) == 4) ? ecm_data[21] : 0;
+ dvbcsa_bs_key_set_ecm(ecm, cw, key);
+
+
Portability
===========
diff --git a/src/dvbcsa/dvbcsa.h b/src/dvbcsa/dvbcsa.h diff --git a/src/dvbcsa/dvbcsa.h b/src/dvbcsa/dvbcsa.h
index c7e9c59..b63fb7d 100644 index c7e9c59..4c37414 100644
--- a/src/dvbcsa/dvbcsa.h --- a/src/dvbcsa/dvbcsa.h
+++ b/src/dvbcsa/dvbcsa.h +++ b/src/dvbcsa/dvbcsa.h
@@ -93,6 +93,8 @@ void dvbcsa_bs_key_free(struct dvbcsa_bs_key_s *key); @@ -93,6 +93,10 @@ void dvbcsa_bs_key_free(struct dvbcsa_bs_key_s *key);
void dvbcsa_bs_key_set(const dvbcsa_cw_t cw, struct dvbcsa_bs_key_s *key); void dvbcsa_bs_key_set(const dvbcsa_cw_t cw, struct dvbcsa_bs_key_s *key);
+#ifndef DVBCSA_KEY_ECM
+#define DVBCSA_KEY_ECM 1
+void dvbcsa_bs_key_set_ecm(const unsigned char ecm, const dvbcsa_cw_t cw, struct dvbcsa_bs_key_s *key); +void dvbcsa_bs_key_set_ecm(const unsigned char ecm, const dvbcsa_cw_t cw, struct dvbcsa_bs_key_s *key);
+ +#endif
/** get maximum number of packet per batch */ /** get maximum number of packet per batch */
unsigned int dvbcsa_bs_batch_size(void); unsigned int dvbcsa_bs_batch_size(void);
diff --git a/src/dvbcsa_bs_key.c b/src/dvbcsa_bs_key.c diff --git a/src/dvbcsa_bs_key.c b/src/dvbcsa_bs_key.c
index e2fcf55..d703325 100644 index e2fcf55..4c5570b 100644
--- a/src/dvbcsa_bs_key.c --- a/src/dvbcsa_bs_key.c
+++ b/src/dvbcsa_bs_key.c +++ b/src/dvbcsa_bs_key.c
@@ -63,3 +63,39 @@ dvbcsa_bs_key_set (const dvbcsa_cw_t cw, struct dvbcsa_bs_key_s *key) @@ -63,3 +63,41 @@ dvbcsa_bs_key_set (const dvbcsa_cw_t cw, struct dvbcsa_bs_key_s *key)
} }
} }
+#if DVBCSA_KEY_ECM > 0
+void +void
+dvbcsa_bs_key_set_ecm (const unsigned char ecm, const dvbcsa_cw_t cw, struct dvbcsa_bs_key_s *key) +dvbcsa_bs_key_set_ecm (const unsigned char ecm, const dvbcsa_cw_t cw, struct dvbcsa_bs_key_s *key)
+{ +{
@@ -55,14 +75,16 @@ index e2fcf55..d703325 100644
+#endif +#endif
+ } + }
+} +}
+#endif
diff --git a/src/dvbcsa_key.c b/src/dvbcsa_key.c diff --git a/src/dvbcsa_key.c b/src/dvbcsa_key.c
index 1ff17e0..bd2a2c1 100644 index 1ff17e0..70e7d7e 100644
--- a/src/dvbcsa_key.c --- a/src/dvbcsa_key.c
+++ b/src/dvbcsa_key.c +++ b/src/dvbcsa_key.c
@@ -585,3 +585,18 @@ dvbcsa_key_schedule_block(const dvbcsa_cw_t cw, uint8_t * kk) @@ -585,3 +585,20 @@ dvbcsa_key_schedule_block(const dvbcsa_cw_t cw, uint8_t * kk)
kk[i*8+j] = (k[i]>>(j*8)) ^ i; kk[i*8+j] = (k[i]>>(j*8)) ^ i;
} }
+#if DVBCSA_KEY_ECM > 0
+void +void
+dvbcsa_key_schedule_block_ecm(const unsigned char ecm, const dvbcsa_cw_t cw, uint8_t * kk) +dvbcsa_key_schedule_block_ecm(const unsigned char ecm, const dvbcsa_cw_t cw, uint8_t * kk)
+{ +{
@@ -77,56 +99,73 @@ index 1ff17e0..bd2a2c1 100644
+ for (j = 0; j < 8; j++) + for (j = 0; j < 8; j++)
+ kk[i*8+j] = (k[i]>>(j*8)) ^ i; + kk[i*8+j] = (k[i]>>(j*8)) ^ i;
+} +}
+#endif
+ +
diff --git a/src/dvbcsa_pv.h b/src/dvbcsa_pv.h diff --git a/src/dvbcsa_pv.h b/src/dvbcsa_pv.h
index 83753b1..e59a70d 100644 index 83753b1..9c0117b 100644
--- a/src/dvbcsa_pv.h --- a/src/dvbcsa_pv.h
+++ b/src/dvbcsa_pv.h +++ b/src/dvbcsa_pv.h
@@ -88,6 +88,26 @@ struct dvbcsa_key_s @@ -87,6 +87,27 @@ struct dvbcsa_key_s
};
extern const uint8_t dvbcsa_block_sbox[256]; extern const uint8_t dvbcsa_block_sbox[256];
+#if DVBCSA_KEY_ECM > 0
+static const uint8_t csa_block_perm_ecm[256] = +static const uint8_t csa_block_perm_ecm[256] =
+ { +{
+ 0x00,0x02,0x80,0x82,0x20,0x22,0xa0,0xa2, 0x04,0x06,0x84,0x86,0x24,0x26,0xa4,0xa6, + 0x00, 0x02, 0x80, 0x82, 0x20, 0x22, 0xa0, 0xa2, 0x04, 0x06, 0x84, 0x86, 0x24, 0x26, 0xa4, 0xa6,
+ 0x40,0x42,0xc0,0xc2,0x60,0x62,0xe0,0xe2, 0x44,0x46,0xc4,0xc6,0x64,0x66,0xe4,0xe6, + 0x40, 0x42, 0xc0, 0xc2, 0x60, 0x62, 0xe0, 0xe2, 0x44, 0x46, 0xc4, 0xc6, 0x64, 0x66, 0xe4, 0xe6,
+ 0x01,0x03,0x81,0x83,0x21,0x23,0xa1,0xa3, 0x05,0x07,0x85,0x87,0x25,0x27,0xa5,0xa7, + 0x01, 0x03, 0x81, 0x83, 0x21, 0x23, 0xa1, 0xa3, 0x05, 0x07, 0x85, 0x87, 0x25, 0x27, 0xa5, 0xa7,
+ 0x41,0x43,0xc1,0xc3,0x61,0x63,0xe1,0xe3, 0x45,0x47,0xc5,0xc7,0x65,0x67,0xe5,0xe7, + 0x41, 0x43, 0xc1, 0xc3, 0x61, 0x63, 0xe1, 0xe3, 0x45, 0x47, 0xc5, 0xc7, 0x65, 0x67, 0xe5, 0xe7,
+ 0x08,0x0a,0x88,0x8a,0x28,0x2a,0xa8,0xaa, 0x0c,0x0e,0x8c,0x8e,0x2c,0x2e,0xac,0xae, + 0x08, 0x0a, 0x88, 0x8a, 0x28, 0x2a, 0xa8, 0xaa, 0x0c, 0x0e, 0x8c, 0x8e, 0x2c, 0x2e, 0xac, 0xae,
+ 0x48,0x4a,0xc8,0xca,0x68,0x6a,0xe8,0xea, 0x4c,0x4e,0xcc,0xce,0x6c,0x6e,0xec,0xee, + 0x48, 0x4a, 0xc8, 0xca, 0x68, 0x6a, 0xe8, 0xea, 0x4c, 0x4e, 0xcc, 0xce, 0x6c, 0x6e, 0xec, 0xee,
+ 0x09,0x0b,0x89,0x8b,0x29,0x2b,0xa9,0xab, 0x0d,0x0f,0x8d,0x8f,0x2d,0x2f,0xad,0xaf, + 0x09, 0x0b, 0x89, 0x8b, 0x29, 0x2b, 0xa9, 0xab, 0x0d, 0x0f, 0x8d, 0x8f, 0x2d, 0x2f, 0xad, 0xaf,
+ 0x49,0x4b,0xc9,0xcb,0x69,0x6b,0xe9,0xeb, 0x4d,0x4f,0xcd,0xcf,0x6d,0x6f,0xed,0xef, + 0x49, 0x4b, 0xc9, 0xcb, 0x69, 0x6b, 0xe9, 0xeb, 0x4d, 0x4f, 0xcd, 0xcf, 0x6d, 0x6f, 0xed, 0xef,
+ 0x10,0x12,0x90,0x92,0x30,0x32,0xb0,0xb2, 0x14,0x16,0x94,0x96,0x34,0x36,0xb4,0xb6, + 0x10, 0x12, 0x90, 0x92, 0x30, 0x32, 0xb0, 0xb2, 0x14, 0x16, 0x94, 0x96, 0x34, 0x36, 0xb4, 0xb6,
+ 0x50,0x52,0xd0,0xd2,0x70,0x72,0xf0,0xf2, 0x54,0x56,0xd4,0xd6,0x74,0x76,0xf4,0xf6, + 0x50, 0x52, 0xd0, 0xd2, 0x70, 0x72, 0xf0, 0xf2, 0x54, 0x56, 0xd4, 0xd6, 0x74, 0x76, 0xf4, 0xf6,
+ 0x11,0x13,0x91,0x93,0x31,0x33,0xb1,0xb3, 0x15,0x17,0x95,0x97,0x35,0x37,0xb5,0xb7, + 0x11, 0x13, 0x91, 0x93, 0x31, 0x33, 0xb1, 0xb3, 0x15, 0x17, 0x95, 0x97, 0x35, 0x37, 0xb5, 0xb7,
+ 0x51,0x53,0xd1,0xd3,0x71,0x73,0xf1,0xf3, 0x55,0x57,0xd5,0xd7,0x75,0x77,0xf5,0xf7, + 0x51, 0x53, 0xd1, 0xd3, 0x71, 0x73, 0xf1, 0xf3, 0x55, 0x57, 0xd5, 0xd7, 0x75, 0x77, 0xf5, 0xf7,
+ 0x18,0x1a,0x98,0x9a,0x38,0x3a,0xb8,0xba, 0x1c,0x1e,0x9c,0x9e,0x3c,0x3e,0xbc,0xbe, + 0x18, 0x1a, 0x98, 0x9a, 0x38, 0x3a, 0xb8, 0xba, 0x1c, 0x1e, 0x9c, 0x9e, 0x3c, 0x3e, 0xbc, 0xbe,
+ 0x58,0x5a,0xd8,0xda,0x78,0x7a,0xf8,0xfa, 0x5c,0x5e,0xdc,0xde,0x7c,0x7e,0xfc,0xfe, + 0x58, 0x5a, 0xd8, 0xda, 0x78, 0x7a, 0xf8, 0xfa, 0x5c, 0x5e, 0xdc, 0xde, 0x7c, 0x7e, 0xfc, 0xfe,
+ 0x19,0x1b,0x99,0x9b,0x39,0x3b,0xb9,0xbb, 0x1d,0x1f,0x9d,0x9f,0x3d,0x3f,0xbd,0xbf, + 0x19, 0x1b, 0x99, 0x9b, 0x39, 0x3b, 0xb9, 0xbb, 0x1d, 0x1f, 0x9d, 0x9f, 0x3d, 0x3f, 0xbd, 0xbf,
+ 0x59,0x5b,0xd9,0xdb,0x79,0x7b,0xf9,0xfb, 0x5d,0x5f,0xdd,0xdf,0x7d,0x7f,0xfd,0xff + 0x59, 0x5b, 0xd9, 0xdb, 0x79, 0x7b, 0xf9, 0xfb, 0x5d, 0x5f, 0xdd, 0xdf, 0x7d, 0x7f, 0xfd, 0xff
+}; +};
+ +#endif
void dvbcsa_block_decrypt (const dvbcsa_keys_t key, const dvbcsa_block_t in, dvbcsa_block_t out); void dvbcsa_block_decrypt (const dvbcsa_keys_t key, const dvbcsa_block_t in, dvbcsa_block_t out);
void dvbcsa_block_encrypt (const dvbcsa_keys_t key, const dvbcsa_block_t in, dvbcsa_block_t out); void dvbcsa_block_encrypt (const dvbcsa_keys_t key, const dvbcsa_block_t in, dvbcsa_block_t out);
@@ -95,6 +116,9 @@ void dvbcsa_stream_xor (const dvbcsa_cw_t cw, const dvbcsa_block_t iv,
@@ -95,6 +115,7 @@ void dvbcsa_stream_xor (const dvbcsa_cw_t cw, const dvbcsa_block_t iv,
uint8_t *stream, unsigned int len); uint8_t *stream, unsigned int len);
void dvbcsa_key_schedule_block(const dvbcsa_cw_t cw, uint8_t * kk); void dvbcsa_key_schedule_block(const dvbcsa_cw_t cw, uint8_t * kk);
+#if DVBCSA_KEY_ECM > 0
+void dvbcsa_key_schedule_block_ecm(const unsigned char ecm, const dvbcsa_cw_t cw, uint8_t * kk); +void dvbcsa_key_schedule_block_ecm(const unsigned char ecm, const dvbcsa_cw_t cw, uint8_t * kk);
+#endif
DVBCSA_INLINE static inline void DVBCSA_INLINE static inline void
dvbcsa_xor_64 (uint8_t *b, const uint8_t *a) dvbcsa_xor_64 (uint8_t *b, const uint8_t *a)
@@ -141,6 +162,33 @@ dvbcsa_load_le64(const uint8_t *p) @@ -141,6 +165,47 @@ dvbcsa_load_le64(const uint8_t *p)
#endif #endif
} }
+#if DVBCSA_KEY_ECM > 0
+static int8_t get_ecm(unsigned char ecm)
+{
+ switch(ecm)
+ {
+ case 0x04:
+ case 0x20:
+ return 1;
+ default:
+ return 0;
+ }
+}
+
+DVBCSA_INLINE static inline uint64_t +DVBCSA_INLINE static inline uint64_t
+dvbcsa_load_le64_ecm(const unsigned char ecm, const uint8_t *p) +dvbcsa_load_le64_ecm(const unsigned char ecm, const uint8_t *p)
+{ +{
+ dvbcsa_block_t W; + dvbcsa_block_t W;
+ memcpy(W, p, sizeof(W)); + memcpy(W, p, sizeof(W));
+ if (ecm == 4) + if (get_ecm(ecm) == 1)
+ { + {
+ W[0] = csa_block_perm_ecm[p[0]]; + W[0] = csa_block_perm_ecm[p[0]];
+ W[4] = csa_block_perm_ecm[p[4]]; + W[4] = csa_block_perm_ecm[p[4]];
@@ -147,6 +186,7 @@ index 83753b1..e59a70d 100644
+ ); + );
+#endif +#endif
+} +}
+# endif
+ +
DVBCSA_INLINE static inline void DVBCSA_INLINE static inline void
dvbcsa_store_le64(uint8_t *p, const uint64_t w) dvbcsa_store_le64(uint8_t *p, const uint64_t w)