LABERTHREAD zum Thema: Umstellung der SAT-Verschlüsselung bei Sky (Geschlossen)

diff --git a/config.sh b/config.sh
index bee5052ce..c64989217 100755
--- a/config.sh
+++ b/config.sh
@@ -347,7 +347,7 @@ list_config() {
not_have_flag USE_LIBCRYPTO && echo "CONFIG_LIB_AES=y" || echo "# CONFIG_LIB_AES=n"
enabled MODULE_CCCAM && echo "CONFIG_LIB_RC6=y" || echo "# CONFIG_LIB_RC6=n"
not_have_flag USE_LIBCRYPTO && enabled MODULE_CCCAM && echo "CONFIG_LIB_SHA1=y" || echo "# CONFIG_LIB_SHA1=n"
- enabled_any READER_DRE MODULE_SCAM READER_VIACCESS READER_NAGRA_MERLIN && echo "CONFIG_LIB_DES=y" || echo "# CONFIG_LIB_DES=n"
+ enabled_any READER_DRE MODULE_SCAM READER_VIACCESS READER_NAGRA_MERLIN READER_VIDEOGUARD && echo "CONFIG_LIB_DES=y" || echo "# CONFIG_LIB_DES=n"
enabled_any MODULE_CCCAM READER_NAGRA READER_NAGRA_MERLIN READER_SECA && echo "CONFIG_LIB_IDEA=y" || echo "# CONFIG_LIB_IDEA=n"
not_have_flag USE_LIBCRYPTO && enabled_any READER_CONAX READER_CRYPTOWORKS READER_NAGRA READER_NAGRA_MERLIN && echo "CONFIG_LIB_BIGNUM=y" || echo "# CONFIG_LIB_BIGNUM=n"
enabled READER_NAGRA_MERLIN && echo "CONFIG_LIB_MDC2=y" || echo "# CONFIG_LIB_MDC2=n"
diff --git a/reader-videoguard2.c b/reader-videoguard2.c
index 7ad9942b8..d7c151503 100644
--- a/reader-videoguard2.c
+++ b/reader-videoguard2.c
@@ -1,6 +1,7 @@
#include "globals.h"
#ifdef READER_VIDEOGUARD
#include "cscrypt/md5.h"
+#include "cscrypt/des.h"
#include "oscam-work.h"
#include "reader-common.h"
#include "reader-videoguard-common.h"
@@ -1200,6 +1201,8 @@ static int32_t videoguard2_card_init(struct s_reader *reader, ATR *newatr)
return OK;
}

+static uint8_t ockey[8] = { 0x73, 0x69, 0x6c, 0x62, 0x65, 0x72, 0x74, 0x6c }; // = silbertl
+
static int32_t videoguard2_do_ecm(struct s_reader *reader, const ECM_REQUEST *er, struct s_ecm_answer *ea)
{
uint8_t cta_res[CTA_RES_LEN];
@@ -1392,8 +1395,9 @@ static int32_t videoguard2_do_ecm(struct s_reader *reader, const ECM_REQUEST *er
// case 55_01 xx where bit0==1
if(buff_55[0] & 1)
{
- rdr_log(reader, "classD3 ins54: CW is crypted, pairing active, bad cw");
- return ERROR;
+ uint8_t iv[8];
+ memset(iv, 0, 8);
+ des_cbc_decrypt(ea->cw, iv, ockey, 8);
}

// case 55_01 xx where bit2==1, old dimeno_PostProcess_Decrypt(reader, rbuff, ea->cw);