From 1c92d5ba0241eb5707b5911989a7aa276db86dd5 Mon Sep 17 00:00:00 2001 From: bust3d Date: Wed, 20 Dec 2023 11:24:18 +0000 Subject: [PATCH 01/21] macOS openssl patch removed as no longer needed since last revision, thanks @ohmza for the fix new ATR added fix for Readers Protocol, display of protocol type without page refresh. Note: Use CTRL+F5 to refresh the cacheed javascript compontents or delete page cache, first use doesn't neet this step. git-svn-id: http://www.streamboard.tv/svn/oscam/trunk@11727 4b0bc96b-bc66-0410-9d44-ebda105a78c1 --- Makefile | 10 ++-------- reader-videoguard-common.c | 5 ++++- webif/include/jscript.js | 5 ++++- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index dec3b480b..ea18ffde8 100644 --- a/Makefile +++ b/Makefile @@ -110,15 +110,9 @@ ifeq ($(uname_S),FreeBSD) DEFAULT_LIBUSB_LIB = -lusb endif ifeq ($(uname_S),Darwin) - FIX_OPENSSL_FLAGS_DIR := $(shell ln -sf /usr/local/opt/openssl@1.1/include/openssl /usr/local/include) - FIX_OPENSSL_LIB_DIR := $(shell ln -sf /usr/local/opt/openssl@1.1/lib/libssl.1.1.dylib /usr/local/lib) - FIX_OPENSSL_LIBCRYPTO_DIR := $(shell ln -sf /usr/local/opt/openssl@1.1/lib/libcrypto.1.1.dylib /usr/local/lib) - DEFAULT_LIBCRYPTO_LIB = -L/usr/local/opt/openssl@1.1/lib -lcrypto - DEFAULT_SSL_LIB = -L/usr/local/opt/openssl@1.1/lib -lssl - DEFAULT_LIBUSB_FLAGS = -I/usr/local/opt/libusb/include - DEFAULT_LIBUSB_LIB = -L/usr/local/opt/libusb/lib -lusb-1.0 -framework IOKit -framework CoreFoundation -framework Security + DEFAULT_LIBUSB_LIB = -lusb-1.0 -lobjc -framework IOKit -framework CoreFoundation -framework Security DEFAULT_PCSC_FLAGS = -I/usr/local/opt/pcsc-lite/include/PCSC - DEFAULT_PCSC_LIB = -L/usr/local/opt/pcsc-lite/lib -framework IOKit -framework CoreFoundation -framework PCSC + DEFAULT_PCSC_LIB = -L/usr/local/opt/pcsc-lite/lib -lpcsclite -lobjc -framework IOKit -framework CoreFoundation -framework PCSC else # Get the compiler's last include PATHs. Basicaly it is /usr/include # but in case of cross compilation it might be something else. diff --git a/reader-videoguard-common.c b/reader-videoguard-common.c index 9875bf833..2c968d631 100644 --- a/reader-videoguard-common.c +++ b/reader-videoguard-common.c @@ -64,7 +64,10 @@ void set_known_card_info(struct s_reader *reader, const uint8_t *atr, const uint 22, 1997, 0, NDS2, "VideoGuard Sky Italia (0919)" }, { { 0x3F, 0xFF, 0x14, 0x25, 0x03, 0x10, 0x80, 0x41, 0xB0, 0x01, 0x69, 0xFF, 0x4A, 0x50, 0x70, 0x00, 0x00, 0x5A, 0x4A, 0x01, 0x00, 0x00 }, - 22, 2004, 0, NDS2, "VideoGuard Dolce Romania (092F)" }, + 22, 2004, 0, NDS2, "VideoGuard Telekom (Dolce TV) Romania (092F)" }, + + { { 0x3F, 0xFD, 0x13, 0x25, 0x02, 0x50, 0x80, 0x0F, 0x41, 0xB0, 0x0F, 0x69, 0xFF, 0x4A, 0x50, 0xF0, 0x80, 0x00, 0x5A, 0x4A, 0x03 }, + 21, 2004, 0, NDS2, "VideoGuard Telekom (Dolce TV) Romania (0952)" }, { { 0x3F, 0xFF, 0x14, 0x25, 0x03, 0x10, 0x80, 0x41, 0xB0, 0x01, 0x69, 0xFF, 0x4A, 0x50, 0x70, 0x00, 0x00, 0x5A, 0x4B, 0x01, 0x00, 0x00 }, 22, 2004, 0, NDS2, "VideoGuard Viasat Ukraine (0931)" }, diff --git a/webif/include/jscript.js b/webif/include/jscript.js index 14516e903..452c3f782 100644 --- a/webif/include/jscript.js +++ b/webif/include/jscript.js @@ -835,7 +835,7 @@ function updateReaderpage(data) { $(uid + " td.readercol9").text(item.stats.emmwritten); } if (!is_nopoll('readercol20')) { - $(uid + " td.readercol20").html( item.status + "
" + item.ip); + $(uid + " td.readercol20").html(item.status + "
" + item.ip); } if (!is_nopoll('readercol10')) { $(uid + " td.readercol10").text(item.stats.emmskipped); @@ -846,6 +846,9 @@ function updateReaderpage(data) { if (!is_nopoll('readercol12')) { $(uid + " td.readercol12").text(item.stats.lbweight); } + if (!is_nopoll('readercol2')) { + $(uid + " td.readercol2").text(item.protocol); + } if (typeof custompoll == 'function') { custompoll(item); From aa8ab6022ebdb51a71771e2b6fca2a28207d7831 Mon Sep 17 00:00:00 2001 From: bust3d Date: Tue, 2 Jan 2024 21:50:32 +0000 Subject: [PATCH 02/21] fix for Picons for readers Page -> https://trac.streamboard.tv/oscam/ticket/4901 Note: Use CTRL+F5 to refresh the cacheed javascript compontents or delete page cache, first use doesn't neet this step. ATR added thanks to @ohmza Patch PC dvbapi (extended cw api) for CSA_ALT mode thanks to @Clemens1234 git-svn-id: http://www.streamboard.tv/svn/oscam/trunk@11728 4b0bc96b-bc66-0410-9d44-ebda105a78c1 --- config.h | 1 + config.sh | 6 ++-- globals.h | 1 + module-dvbapi.c | 27 ++++++++++++++++++ module-webif.c | 31 ++++++++++++++++++++ reader-videoguard-common.c | 58 +++++++++++++++++++++++++++----------- webif/config/dvbapi.html | 4 +-- webif/include/jscript.js | 22 ++++++++++----- 8 files changed, 122 insertions(+), 28 deletions(-) diff --git a/config.h b/config.h index 32f1dd21a..cf96dd234 100644 --- a/config.h +++ b/config.h @@ -8,6 +8,7 @@ //#define WITH_SSL 1 #if defined(__linux__) || defined(__CYGWIN__) #define HAVE_DVBAPI 1 +//#define WITH_EXTENDED_CW 1 #endif //#define WITH_NEUTRINO 1 #define READ_SDT_CHARSETS 1 diff --git a/config.sh b/config.sh index e7ea074c2..411c9fe07 100755 --- a/config.sh +++ b/config.sh @@ -1,6 +1,6 @@ #!/bin/sh -addons="WEBIF WEBIF_LIVELOG WEBIF_JQUERY TOUCH WITH_SSL HAVE_DVBAPI WITH_NEUTRINO READ_SDT_CHARSETS IRDETO_GUESSING CS_ANTICASC WITH_DEBUG MODULE_MONITOR WITH_LB CS_CACHEEX CS_CACHEEX_AIO CW_CYCLE_CHECK LCDSUPPORT LEDSUPPORT CLOCKFIX IPV6SUPPORT" +addons="WEBIF WEBIF_LIVELOG WEBIF_JQUERY TOUCH WITH_SSL HAVE_DVBAPI WITH_EXTENDED_CW WITH_NEUTRINO READ_SDT_CHARSETS IRDETO_GUESSING CS_ANTICASC WITH_DEBUG MODULE_MONITOR WITH_LB CS_CACHEEX CS_CACHEEX_AIO CW_CYCLE_CHECK LCDSUPPORT LEDSUPPORT CLOCKFIX IPV6SUPPORT" protocols="MODULE_CAMD33 MODULE_CAMD35 MODULE_CAMD35_TCP MODULE_NEWCAMD MODULE_CCCAM MODULE_CCCSHARE MODULE_GBOX MODULE_RADEGAST MODULE_SCAM MODULE_SERIAL MODULE_CONSTCW MODULE_PANDORA MODULE_GHTTP" readers="READER_NAGRA READER_NAGRA_MERLIN READER_IRDETO READER_CONAX READER_CRYPTOWORKS READER_SECA READER_VIACCESS READER_VIDEOGUARD READER_DRE READER_TONGFANG READER_BULCRYPT READER_GRIFFIN READER_DGCRYPT" card_readers="CARDREADER_PHOENIX CARDREADER_INTERNAL CARDREADER_SC8IN1 CARDREADER_MP35 CARDREADER_SMARGO CARDREADER_DB2COM CARDREADER_STAPI CARDREADER_STAPI5 CARDREADER_STINGER CARDREADER_DRECAS" @@ -12,6 +12,7 @@ CONFIG_WEBIF_JQUERY=y # CONFIG_TOUCH=n # CONFIG_WITH_SSL=n CONFIG_HAVE_DVBAPI=y +# CONFIG_WITH_EXTENDED_CW=n # CONFIG_WITH_NEUTRINO=n CONFIG_READ_SDT_CHARSETS=y CONFIG_IRDETO_GUESSING=y @@ -454,6 +455,7 @@ menu_addons() { TOUCH "Touch Web Interface" $(check_test "TOUCH") \ WITH_SSL "OpenSSL support" $(check_test "WITH_SSL") \ HAVE_DVBAPI "DVB API" $(check_test "HAVE_DVBAPI") \ + WITH_EXTENDED_CW "DVB API EXTENDED CW API" $(check_test "WITH_EXTENDED_CW") \ WITH_NEUTRINO "Neutrino support" $(check_test "WITH_NEUTRINO") \ READ_SDT_CHARSETS "DVB API read-sdt charsets" $(check_test "READ_SDT_CHARSETS") \ IRDETO_GUESSING "Irdeto guessing" $(check_test "IRDETO_GUESSING") \ @@ -462,7 +464,7 @@ menu_addons() { MODULE_MONITOR "Monitor" $(check_test "MODULE_MONITOR") \ WITH_LB "Loadbalancing" $(check_test "WITH_LB") \ CS_CACHEEX "Cache exchange" $(check_test "CS_CACHEEX") \ - CS_CACHEEX_AIO "Cache exchange aio (depend on Cache exchange)" $(check_test "CS_CACHEEX_AIO") \ + CS_CACHEEX_AIO "Cache exchange aio (depend on Cache exchange)" $(check_test "CS_CACHEEX_AIO") \ CW_CYCLE_CHECK "CW Cycle Check" $(check_test "CW_CYCLE_CHECK") \ LCDSUPPORT "LCD support" $(check_test "LCDSUPPORT") \ LEDSUPPORT "LED support" $(check_test "LEDSUPPORT") \ diff --git a/globals.h b/globals.h index 62e6b1cd5..157a9c846 100644 --- a/globals.h +++ b/globals.h @@ -628,6 +628,7 @@ enum {E2_GLOBAL = 0, E2_GROUP, E2_CAID, E2_IDENT, E2_CLASS, E2_CHID, E2_QUEUE, E #define CW_ALGO_CSA 0 #define CW_ALGO_DES 1 #define CW_ALGO_AES128 2 +#define CW_ALGO_CSA_ALT 3 #define CW_ALGO_MODE_ECB 0 #define CW_ALGO_MODE_CBC 1 diff --git a/module-dvbapi.c b/module-dvbapi.c index dc441815f..3e1b48193 100644 --- a/module-dvbapi.c +++ b/module-dvbapi.c @@ -7489,6 +7489,25 @@ void delayer(ECM_REQUEST *er, uint32_t delay) } } +#ifdef WITH_EXTENDED_CW +bool caid_is_csa_alt(uint16_t caid) +{ + return caid == 0x09c4 || caid == 0x098c || caid==0x098d; +} + +bool select_csa_alt(ECM_REQUEST *er) +{ + if(caid_is_csa_alt(er->caid)) + { + if((er->ecm[2] - er->ecm[4]) == 4) + { + return true; + } + } + return false; +} +#endif + void dvbapi_send_dcw(struct s_client *client, ECM_REQUEST *er) { int32_t i, j, k, handled = 0; @@ -7907,6 +7926,14 @@ void dvbapi_send_dcw(struct s_client *client, ECM_REQUEST *er) { dvbapi_write_cw(i, j, 0, er->cw_ex.session_word, 16, er->cw_ex.data, 16, er->cw_ex.algo, er->cw_ex.algo_mode, er->msgid); } + else if(er->cw_ex.algo == CW_ALGO_CSA) + { + if(select_csa_alt(er)) + { + er->cw_ex.algo = CW_ALGO_CSA_ALT; + } + dvbapi_write_cw(i, j, 0, er->cw, 8, NULL, 0, er->cw_ex.algo, er->cw_ex.algo_mode, er->msgid); + } else { dvbapi_write_cw(i, j, 0, er->cw, 8, NULL, 0, er->cw_ex.algo, er->cw_ex.algo_mode, er->msgid); diff --git a/module-webif.c b/module-webif.c index 29c96083b..a0adeca1f 100644 --- a/module-webif.c +++ b/module-webif.c @@ -2025,6 +2025,10 @@ static char *send_oscam_reader(struct templatevars *vars, struct uriparams *para tpl_addVar(vars, TPLADD, "LASTGSMS", rdr->last_gsms); } #endif + if(apicall) + { + tpl_printf(vars, TPLADD, "PICONENABLED", "%d", cfg.http_showpicons?1:0); + } tpl_addVar(vars, TPLADD, "READERNAMEENC", urlencode(vars, rdr->label)); if(!existing_insert) { @@ -2048,6 +2052,15 @@ static char *send_oscam_reader(struct templatevars *vars, struct uriparams *para { tpl_addVar(vars, TPLADD, "CLIENTPROTOSORT", (const char*)new_proto); tpl_addVar(vars, TPLADD, "CLIENTPROTO", (const char*)new_proto); + if(cfg.http_showpicons) + { + char picon_name[32]; + snprintf(picon_name, sizeof(picon_name) / sizeof(char) - 1, "%s", new_proto); + if(picon_exists(picon_name)) + { + tpl_printf(vars, TPLADDONCE, "PROTOICON", (const char*)new_proto); + } + } if(rdr->cacheex.feature_bitfield & 32) tpl_addVar(vars, TPLADD, "CLIENTPROTOTITLE", rdr->cacheex.aio_version); @@ -2058,10 +2071,28 @@ static char *send_oscam_reader(struct templatevars *vars, struct uriparams *para { tpl_addVar(vars, TPLADD, "CLIENTPROTOSORT", proto); tpl_addVar(vars, TPLADD, "CLIENTPROTO", proto); + if(cfg.http_showpicons) + { + char picon_name[32]; + snprintf(picon_name, sizeof(picon_name) / sizeof(char) - 1, "%s", proto); + if(picon_exists(picon_name)) + { + tpl_printf(vars, TPLADDONCE, "PROTOICON", "%s",(char *)proto); + } + } } #else tpl_addVar(vars, TPLADD, "CLIENTPROTO", reader_get_type_desc(rdr, 0)); tpl_addVar(vars, TPLADD, "CLIENTPROTOSORT", reader_get_type_desc(rdr, 0)); + if(cfg.http_showpicons) + { + char picon_name[32]; + snprintf(picon_name, sizeof(picon_name) / sizeof(char) - 1, "%s", reader_get_type_desc(rdr, 0)); + if(picon_exists(picon_name)) + { + tpl_printf(vars, TPLADDONCE, "PROTOICON", "%s", reader_get_type_desc(rdr, 0)); + } + } #endif switch(rdr->card_status) { diff --git a/reader-videoguard-common.c b/reader-videoguard-common.c index 2c968d631..5ebf755a7 100644 --- a/reader-videoguard-common.c +++ b/reader-videoguard-common.c @@ -123,8 +123,32 @@ void set_known_card_info(struct s_reader *reader, const uint8_t *atr, const uint { { 0x3F, 0xFD, 0x11, 0x25, 0x02, 0x50, 0x80, 0x0F, 0x41, 0xB0, 0x05, 0x69, 0xFF, 0x4A, 0x50, 0xF0, 0x00, 0x00, 0x41, 0x5A, 0x03 }, 21, 2004, 50, NDS2, "VideoGuard Astro Malaysia (0910)" }, + { { 0x3F, 0xFD, 0x12, 0x25, 0x02, 0x50, 0x80, 0x0F, 0x41, 0xB0, 0x05, 0x69, 0xFF, 0x4A, 0x50, 0xF0, 0x00, 0x00, 0x41, 0x5A, 0x03 }, + 21, 2004, 50, NDS2, "VideoGuard Astro Malaysia (0910) FastMode" }, + + { { 0x3F, 0xFD, 0x13, 0x25, 0x02, 0x50, 0x80, 0x0F, 0x41, 0xB0, 0x05, 0x69, 0xFF, 0x4A, 0x50, 0xF0, 0x00, 0x00, 0x41, 0x5A, 0x03 }, + 21, 2004, 50, NDS2, "VideoGuard Astro Malaysia (0910) FastMode" }, + + { { 0x3F, 0xFD, 0x14, 0x25, 0x02, 0x50, 0x80, 0x0F, 0x41, 0xB0, 0x05, 0x69, 0xFF, 0x4A, 0x50, 0xF0, 0x00, 0x00, 0x41, 0x5A, 0x03 }, + 21, 2004, 50, NDS2, "VideoGuard Astro Malaysia (0910) FastMode" }, + { { 0x3F, 0xFD, 0x15, 0x25, 0x02, 0x50, 0x80, 0x0F, 0x41, 0xB0, 0x05, 0x69, 0xFF, 0x4A, 0x50, 0xF0, 0x00, 0x00, 0x41, 0x5A, 0x03 }, - 21, 2004, 50, NDS2, "VideoGuard Astro Malaysia (0910)" }, + 21, 2004, 50, NDS2, "VideoGuard Astro Malaysia (0910) FastMode" }, + + { { 0x3F, 0xFD, 0x11, 0x25, 0x02, 0x50, 0x80, 0x0F, 0x41, 0xB0, 0x10, 0x69, 0xFF, 0x4A, 0x50, 0xF0, 0x80, 0x00, 0x41, 0x5A, 0x03 }, + 21, 2004, 50, NDS2, "VideoGuard Astro Malaysia (0913)"}, + + { { 0x3F, 0xFD, 0x12, 0x25, 0x02, 0x50, 0x80, 0x0F, 0x41, 0xB0, 0x10, 0x69, 0xFF, 0x4A, 0x50, 0xF0, 0x80, 0x00, 0x41, 0x5A, 0x03 }, + 21, 2004, 50, NDS2, "VideoGuard Astro Malaysia (0913) FastMode"}, + + { { 0x3F, 0xFD, 0x13, 0x25, 0x02, 0x50, 0x80, 0x0F, 0x41, 0xB0, 0x10, 0x69, 0xFF, 0x4A, 0x50, 0xF0, 0x80, 0x00, 0x41, 0x5A, 0x03 }, + 21, 2004, 50, NDS2, "VideoGuard Astro Malaysia (0913) FastMode"}, + + { { 0x3F, 0xFD, 0x14, 0x25, 0x02, 0x50, 0x80, 0x0F, 0x41, 0xB0, 0x10, 0x69, 0xFF, 0x4A, 0x50, 0xF0, 0x80, 0x00, 0x41, 0x5A, 0x03 }, + 21, 2004, 50, NDS2, "VideoGuard Astro Malaysia (0913) FastMode"}, + + { { 0x3F, 0xFD, 0x15, 0x25, 0x02, 0x50, 0x80, 0x0F, 0x41, 0xB0, 0x10, 0x69, 0xFF, 0x4A, 0x50, 0xF0, 0x80, 0x00, 0x41, 0x5A, 0x03 }, + 21, 2004, 50, NDS2, "VideoGuard Astro Malaysia (0913) FastMode"}, { { 0x3F, 0xFF, 0x11, 0x25, 0x03, 0x10, 0x80, 0x41, 0xB0, 0x06, 0x69, 0xFF, 0x4A, 0x50, 0x70, 0x00, 0x00, 0x41, 0x5A, 0x01, 0x00, 0x11 }, 22, 2004, 50, NDS2, "VideoGuard Astro Malaysia (09AC)" }, @@ -263,51 +287,51 @@ void set_known_card_info(struct s_reader *reader, const uint8_t *atr, const uint { { 0x3F, 0xFF, 0x14, 0x25, 0x03, 0x10, 0x80, 0x41, 0xB0, 0x07, 0x69, 0xFF, 0x4A, 0x50, 0x70, 0x80, 0x00, 0x58, 0x45, 0x01, 0x00, 0x14 }, 22, 2004, 0, NDS2, "VideoGuard OTE TV Sat (09BE)" }, - + { { 0x3F, 0xFD, 0x11, 0x25, 0x02, 0x50, 0x80, 0x0F, 0x41, 0xB0, 0x0B, 0x69, 0xFF, 0x4A, 0x50, 0xD0, 0x80, 0x00, 0x33, 0x54, 0x83 }, - 21, 2008, 0, NDS2, "VideoGuard TrueVisions T3VV (0927)" }, + 21, 2008, 0, NDS2, "VideoGuard TrueVisions 0002 Card (0927)" }, { { 0x3F, 0xFD, 0x12, 0x25, 0x02, 0x50, 0x80, 0x0F, 0x41, 0xB0, 0x0B, 0x69, 0xFF, 0x4A, 0x50, 0xD0, 0x80, 0x00, 0x33, 0x54, 0x83 }, - 21, 2008, 0, NDS2, "VideoGuard TrueVisions T3VV (0927) FastMode" }, + 21, 2008, 0, NDS2, "VideoGuard TrueVisions 0002 Card (0927) FastMode" }, { { 0x3F, 0xFD, 0x13, 0x25, 0x02, 0x50, 0x80, 0x0F, 0x41, 0xB0, 0x0B, 0x69, 0xFF, 0x4A, 0x50, 0xD0, 0x80, 0x00, 0x33, 0x54, 0x83 }, - 21, 2008, 0, NDS2, "VideoGuard TrueVisions T3VV (0927) FastMode" }, + 21, 2008, 0, NDS2, "VideoGuard TrueVisions 0002 Card (0927) FastMode" }, { { 0x3F, 0xFD, 0x14, 0x25, 0x02, 0x50, 0x80, 0x0F, 0x41, 0xB0, 0x0B, 0x69, 0xFF, 0x4A, 0x50, 0xD0, 0x80, 0x00, 0x33, 0x54, 0x83 }, - 21, 2008, 0, NDS2, "VideoGuard TrueVisions T3VV (0927) FastMode" }, + 21, 2008, 0, NDS2, "VideoGuard TrueVisions 0002 Card (0927) FastMode" }, { { 0x3F, 0xFD, 0x15, 0x25, 0x02, 0x50, 0x80, 0x0F, 0x41, 0xB0, 0x0B, 0x69, 0xFF, 0x4A, 0x50, 0xD0, 0x80, 0x00, 0x33, 0x54, 0x83 }, - 21, 2008, 0, NDS2, "VideoGuard TrueVisions T3VV (0927) FastMode" }, + 21, 2008, 0, NDS2, "VideoGuard TrueVisions 0002 Card (0927) FastMode" }, { { 0x3F, 0xFD, 0x11, 0x25, 0x02, 0x50, 0x80, 0x0F, 0x41, 0xB0, 0x0B, 0x69, 0xFF, 0x4A, 0x50, 0xD0, 0x80, 0x00, 0x54, 0x33, 0x03 }, - 21, 2008, 0, NDS2, "VideoGuard TrueVisions T3TV (0927)" }, + 21, 2008, 0, NDS2, "VideoGuard TrueVisions 0001 Card (0927)" }, { { 0x3F, 0xFD, 0x12, 0x25, 0x02, 0x50, 0x80, 0x0F, 0x41, 0xB0, 0x0B, 0x69, 0xFF, 0x4A, 0x50, 0xD0, 0x80, 0x00, 0x54, 0x33, 0x03 }, - 21, 2008, 0, NDS2, "VideoGuard TrueVisions T3TV (0927) FastMode" }, + 21, 2008, 0, NDS2, "VideoGuard TrueVisions 0001 Card (0927) FastMode" }, { { 0x3F, 0xFD, 0x13, 0x25, 0x02, 0x50, 0x80, 0x0F, 0x41, 0xB0, 0x0B, 0x69, 0xFF, 0x4A, 0x50, 0xD0, 0x80, 0x00, 0x54, 0x33, 0x03 }, - 21, 2008, 0, NDS2, "VideoGuard TrueVisions T3TV (0927) FastMode" }, + 21, 2008, 0, NDS2, "VideoGuard TrueVisions 0001 Card (0927) FastMode" }, { { 0x3F, 0xFD, 0x14, 0x25, 0x02, 0x50, 0x80, 0x0F, 0x41, 0xB0, 0x0B, 0x69, 0xFF, 0x4A, 0x50, 0xD0, 0x80, 0x00, 0x54, 0x33, 0x03 }, - 21, 2008, 0, NDS2, "VideoGuard TrueVisions T3TV (0927) FastMode" }, + 21, 2008, 0, NDS2, "VideoGuard TrueVisions 0001 Card (0927) FastMode" }, { { 0x3F, 0xFD, 0x15, 0x25, 0x02, 0x50, 0x80, 0x0F, 0x41, 0xB0, 0x0B, 0x69, 0xFF, 0x4A, 0x50, 0xD0, 0x80, 0x00, 0x54, 0x33, 0x03 }, - 21, 2008, 0, NDS2, "VideoGuard TrueVisions T3TV (0927) FastMode" }, + 21, 2008, 0, NDS2, "VideoGuard TrueVisions 0001 Card (0927) FastMode" }, { { 0x3F, 0xFD, 0x11, 0x25, 0x02, 0x50, 0x80, 0x0F, 0x55, 0xB0, 0x02, 0x69, 0xFF, 0x4A, 0x50, 0xF0, 0x80, 0x00, 0x33, 0x54, 0x83 }, - 21, 2008, 0, NDS2, "VideoGuard TrueVisions T3VV (09BF)" }, + 21, 2008, 0, NDS2, "VideoGuard TrueVisions 0004 Card (09BF)" }, { { 0x3F, 0xFD, 0x12, 0x25, 0x02, 0x50, 0x80, 0x0F, 0x55, 0xB0, 0x02, 0x69, 0xFF, 0x4A, 0x50, 0xF0, 0x80, 0x00, 0x33, 0x54, 0x83 }, - 21, 2008, 0, NDS2, "VideoGuard TrueVisions T3VV (09BF) FastMode" }, + 21, 2008, 0, NDS2, "VideoGuard TrueVisions 0004 Card (09BF) FastMode" }, { { 0x3F, 0xFD, 0x13, 0x25, 0x02, 0x50, 0x80, 0x0F, 0x55, 0xB0, 0x02, 0x69, 0xFF, 0x4A, 0x50, 0xF0, 0x80, 0x00, 0x33, 0x54, 0x83 }, - 21, 2008, 0, NDS2, "VideoGuard TrueVisions T3VV (09BF) FastMode" }, + 21, 2008, 0, NDS2, "VideoGuard TrueVisions 0004 Card (09BF) FastMode" }, { { 0x3F, 0xFD, 0x14, 0x25, 0x02, 0x50, 0x80, 0x0F, 0x55, 0xB0, 0x02, 0x69, 0xFF, 0x4A, 0x50, 0xF0, 0x80, 0x00, 0x33, 0x54, 0x83 }, - 21, 2008, 0, NDS2, "VideoGuard TrueVisions T3VV (09BF) FastMode" }, + 21, 2008, 0, NDS2, "VideoGuard TrueVisions 0004 Card (09BF) FastMode" }, { { 0x3F, 0xFD, 0x15, 0x25, 0x02, 0x50, 0x80, 0x0F, 0x55, 0xB0, 0x02, 0x69, 0xFF, 0x4A, 0x50, 0xF0, 0x80, 0x00, 0x33, 0x54, 0x83 }, - 21, 2008, 0, NDS2, "VideoGuard TrueVisions T3VV (09BF) FastMode" }, + 21, 2008, 0, NDS2, "VideoGuard TrueVisions 0004 Card (09BF) FastMode" }, // NDS Version Unknown as Yet { { 0x3F, 0x7F, 0x13, 0x25, 0x02, 0x40, 0xB0, 0x12, 0x69, 0xFF, 0x4A, 0x50, 0x90, 0x41, 0x55, 0x00, 0x00, 0x00, 0x00, 0x00 }, diff --git a/webif/config/dvbapi.html b/webif/config/dvbapi.html index 52a45e04c..1485267eb 100644 --- a/webif/config/dvbapi.html +++ b/webif/config/dvbapi.html @@ -56,7 +56,7 @@ Write detected prov name to srvid: - + diff --git a/webif/include/jscript.js b/webif/include/jscript.js index 452c3f782..af9a3d37c 100644 --- a/webif/include/jscript.js +++ b/webif/include/jscript.js @@ -847,7 +847,15 @@ function updateReaderpage(data) { $(uid + " td.readercol12").text(item.stats.lbweight); } if (!is_nopoll('readercol2')) { - $(uid + " td.readercol2").text(item.protocol); + if (data.oscam.piconenabled == "1" && item.protoicon) { + $(uid + " td.readercol2").html('IC_' + item.protoicon + ''); + } else { + $(uid + " td.readercol2").text(item.protocol); + } + + $(uid + " td.readercol2") + .data('sort-value', item.protosort); } if (typeof custompoll == 'function') { @@ -1249,20 +1257,20 @@ function updateStatuspage(data) { '" href="status.html?hide=' + item.thid.substring(3, item.thid.length) + '">Hide'); + '" src="image?i=ICHID">'); } if (!is_nopoll('statuscol1')) { $(uid + " > td.statuscol1").append('' + kill2 + - ''); + '" src="image?i=' + kill3 + '">'); } if (!is_nopoll('statuscol4')) { if (data.oscam.piconenabled == "1" && !item.upicmissing) { $(uid + " > td.statuscol4").append(''); + name1 + ': ' + name3 + (item.desc ? '\n' + item.desc.replace(' ', '') : '') + '" src="image?i=IC_' + name2 + '">'); } else { $(uid + " > td.statuscol4").append('' + name3 + ''); @@ -1276,7 +1284,7 @@ function updateStatuspage(data) { if (!is_nopoll('statuscol9')) { if (data.oscam.piconenabled == "1" && item.protoicon) { $(uid + " > td.statuscol9").append('IC_' + item.protoicon + ''); + item.protocolext + '" alt="IC_' + item.protoicon + '" src="image?i=IC_' + item.protoicon + '">'); } else { $(uid + " > td.statuscol9").attr('title', item.protocolext).text(item.protocol); } @@ -1290,7 +1298,7 @@ function updateStatuspage(data) { if (!is_nopoll('statuscol9')) { if (data.oscam.piconenabled == "1" && item.protoicon) { $(uid + " > td.statuscol9").html('IC_' + item.protoicon + ''); + item.protocolext + '" alt="IC_' + item.protoicon + '" src="image?i=IC_' + item.protoicon + '">'); } else { $(uid + " > td.statuscol9").attr('title', item.protocolext).text(item.protocol); } @@ -1300,7 +1308,7 @@ function updateStatuspage(data) { if (data.oscam.piconenabled == "1" && !item.upicmissing) { $(uid + " > td.statuscol4").html(''); + '" src="image?i=IC_' + item.name_enc + '">'); } else { $(uid + " > td.statuscol4").html('' + decodeURIComponent(item.name_enc) + ''); From 326f3a2c3640d09ad8f5ea9f8f721e5f84a561c7 Mon Sep 17 00:00:00 2001 From: bust3d Date: Thu, 4 Jan 2024 20:30:29 +0000 Subject: [PATCH 03/21] fix for picons - not network readers was not included in the last fix fix for Build error when no reader is selected, introduced with sendcmd patch git-svn-id: http://www.streamboard.tv/svn/oscam/trunk@11729 4b0bc96b-bc66-0410-9d44-ebda105a78c1 --- module-webif.c | 9 +++++++++ oscam-work.c | 5 ++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/module-webif.c b/module-webif.c index a0adeca1f..5ed5eb196 100644 --- a/module-webif.c +++ b/module-webif.c @@ -2150,6 +2150,15 @@ static char *send_oscam_reader(struct templatevars *vars, struct uriparams *para tpl_addVar(vars, TPLADD, "CLIENTPROTO", reader_get_type_desc(rdr, 0)); tpl_addVar(vars, TPLADD, "CLIENTPROTOSORT", reader_get_type_desc(rdr, 0)); + if(cfg.http_showpicons) + { + char picon_name[32]; + snprintf(picon_name, sizeof(picon_name) / sizeof(char) - 1, "%s", reader_get_type_desc(rdr, 0)); + if(picon_exists(picon_name)) + { + tpl_printf(vars, TPLADDONCE, "PROTOICON", "%s", reader_get_type_desc(rdr, 0)); + } + } } } diff --git a/oscam-work.c b/oscam-work.c index 148dc7dc4..ec21a2d49 100644 --- a/oscam-work.c +++ b/oscam-work.c @@ -129,7 +129,7 @@ void *work_thread(void *ptr) { return NULL; } cl->work_mbuf = mbuf; // Track locally allocated data, because some callback may call cs_exit/cs_disconect_client/pthread_exit and then mbuf would be leaked - int32_t n = 0, rc = 0, i, idx, s, dblvl; + int32_t n = 0, rc = 0, i, idx, s; uint8_t dcw[16]; int8_t restart_reader = 0; @@ -305,6 +305,8 @@ void *work_thread(void *ptr) break; case ACTION_READER_SENDCMD: +#ifdef WITH_CARDREADER + int32_t dblvl; dblvl = cs_dblevel; cs_dblevel = dblvl | D_READER; rc = cardreader_do_rawcmd(reader, data->ptr); @@ -323,6 +325,7 @@ void *work_thread(void *ptr) } } cs_dblevel = dblvl; +#endif break; case ACTION_READER_CARDINFO: From c22f2b76c6f6a1ca2595e51e325dbba74e847e3e Mon Sep 17 00:00:00 2001 From: bust3d Date: Thu, 4 Jan 2024 21:45:05 +0000 Subject: [PATCH 04/21] fix for clang compiling errors - thanks to @samur for testing git-svn-id: http://www.streamboard.tv/svn/oscam/trunk@11730 4b0bc96b-bc66-0410-9d44-ebda105a78c1 --- module-webif.c | 2 +- oscam-work.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/module-webif.c b/module-webif.c index 5ed5eb196..c3eb9652e 100644 --- a/module-webif.c +++ b/module-webif.c @@ -2058,7 +2058,7 @@ static char *send_oscam_reader(struct templatevars *vars, struct uriparams *para snprintf(picon_name, sizeof(picon_name) / sizeof(char) - 1, "%s", new_proto); if(picon_exists(picon_name)) { - tpl_printf(vars, TPLADDONCE, "PROTOICON", (const char*)new_proto); + tpl_printf(vars, TPLADDONCE, "PROTOICON", "%s",(char*)new_proto); } } diff --git a/oscam-work.c b/oscam-work.c index ec21a2d49..b7a02affe 100644 --- a/oscam-work.c +++ b/oscam-work.c @@ -129,7 +129,8 @@ void *work_thread(void *ptr) { return NULL; } cl->work_mbuf = mbuf; // Track locally allocated data, because some callback may call cs_exit/cs_disconect_client/pthread_exit and then mbuf would be leaked - int32_t n = 0, rc = 0, i, idx, s; + int32_t n = 0, rc = 0, i, idx, s, dblvl; + (void)dblvl; uint8_t dcw[16]; int8_t restart_reader = 0; @@ -306,7 +307,6 @@ void *work_thread(void *ptr) case ACTION_READER_SENDCMD: #ifdef WITH_CARDREADER - int32_t dblvl; dblvl = cs_dblevel; cs_dblevel = dblvl | D_READER; rc = cardreader_do_rawcmd(reader, data->ptr); From f12c27d778dc10858da3c5f514ebed1eccb1b99f Mon Sep 17 00:00:00 2001 From: bust3d Date: Sat, 6 Jan 2024 10:33:33 +0000 Subject: [PATCH 05/21] clang compiler warnings: fix build warnings on DRE and DRE CAS - thanks to @ohmza fix build warning for sendcmd patch git-svn-id: http://www.streamboard.tv/svn/oscam/trunk@11731 4b0bc96b-bc66-0410-9d44-ebda105a78c1 --- module-webif.c | 2 +- reader-dre-cas.c | 42 +++++++++++++++++++++++++++--------------- reader-dre.c | 43 ++++++++++++++++++++++++++----------------- 3 files changed, 54 insertions(+), 33 deletions(-) diff --git a/module-webif.c b/module-webif.c index c3eb9652e..118e2be02 100644 --- a/module-webif.c +++ b/module-webif.c @@ -8474,7 +8474,7 @@ static char *send_oscam_api(struct templatevars * vars, FILE * f, struct uripara cmd_pack->client = webif_client; cmd_pack->cmdlen = strlen(getParam(params, "cmd")) / 2; - if(cmd_pack->cmdlen > 0 && abs(cmd_pack->cmdlen) <= sizeof(cmd_pack->cmd)) + if(cmd_pack->cmdlen > 0 && (unsigned long)abs(cmd_pack->cmdlen) <= sizeof(cmd_pack->cmd)) { if(key_atob_l(getParam(params, "cmd"), cmd_pack->cmd, cmd_pack->cmdlen*2)) { diff --git a/reader-dre-cas.c b/reader-dre-cas.c index d3bc3815d..642a27e85 100644 --- a/reader-dre-cas.c +++ b/reader-dre-cas.c @@ -236,14 +236,20 @@ static int32_t drecas_MSP_command(struct s_reader *reader, const uint8_t *cmd, i return OK; } +#define drecas_MSP_script_nb(cmd, len) \ + drecas_MSP_command(reader, cmd, len, cta_res, &cta_lr); \ + #define drecas_MSP_script(cmd, len) \ { \ - drecas_MSP_command(reader, cmd, len, cta_res, &cta_lr); \ + drecas_MSP_script_nb(cmd, len) \ } +#define drecas_MSP_cmd_nb(cmd) \ + drecas_MSP_command(reader, cmd, sizeof(cmd), cta_res, &cta_lr); \ + #define drecas_MSP_cmd(cmd) \ { \ - drecas_MSP_command(reader, cmd, sizeof(cmd), cta_res, &cta_lr); \ + drecas_MSP_cmd_nb(cmd) \ } static int32_t drecas_STM_command(struct s_reader *reader, const uint8_t *cmd, int32_t cmdlen, uint8_t *cta_res, uint16_t *p_cta_lr) @@ -342,14 +348,20 @@ static int32_t drecas_STM_command(struct s_reader *reader, const uint8_t *cmd, i return OK; } +#define drecas_STM_script_nb(cmd, len) \ + drecas_STM_command(reader, cmd, len, cta_res, &cta_lr); \ + #define drecas_STM_script(cmd, len) \ { \ - drecas_STM_command(reader, cmd, len, cta_res, &cta_lr); \ + drecas_STM_script_nb(cmd, len) \ } +#define drecas_STM_cmd_nb(cmd) \ + drecas_STM_command(reader, cmd, sizeof(cmd), cta_res, &cta_lr); \ + #define drecas_STM_cmd(cmd) \ { \ - drecas_STM_command(reader, cmd, sizeof(cmd), cta_res, &cta_lr); \ + drecas_STM_cmd_nb(cmd) \ } static int32_t drecas_set_provider_info(struct s_reader *reader) @@ -363,7 +375,7 @@ static int32_t drecas_set_provider_info(struct s_reader *reader) cs_clear_entitlement(reader); - if((drecas_MSP_cmd(subscr))) // ask subscription packages, returns error on 0x11 card + if(({drecas_MSP_cmd_nb(subscr)})) // ask subscription packages, returns error on 0x11 card { uint8_t pbm[32]; char tmp_dbg[65]; @@ -451,12 +463,12 @@ static int32_t drecas_card_init(struct s_reader *reader, ATR *newatr) cmd54[1] = csystem_data->provider; uint8_t geocode = 0; - if((drecas_MSP_cmd(cmd54))) // error would not be fatal, like on 0x11 cards + if(({drecas_MSP_cmd_nb(cmd54)})) // error would not be fatal, like on 0x11 cards { geocode = cta_res[7]; } providers[1] = csystem_data->provider; - if(!(drecas_MSP_cmd(providers))) + if(!({drecas_MSP_cmd_nb(providers)})) { return ERROR; } // fatal error if((cta_res[2] != 0x09) || (cta_res[3] != 0xC0)) @@ -557,11 +569,11 @@ static int32_t drecas_card_init(struct s_reader *reader, ATR *newatr) if(tempbuf[0] != '7' && tempbuf[1] != '4') { - rdr_log(reader, "Script %s", (drecas_MSP_script(usercmd, cmd_len)) ? "done" : "error"); + rdr_log(reader, "Script %s", ({drecas_MSP_script_nb(usercmd, cmd_len)}) ? "done" : "error"); } else { - rdr_log(reader, "Script %s", (drecas_STM_script(usercmd, cmd_len)) ? "done" : "error"); + rdr_log(reader, "Script %s", ({drecas_STM_script_nb(usercmd, cmd_len)}) ? "done" : "error"); } } while(!feof(pFile)); @@ -637,7 +649,7 @@ static int32_t drecas_do_ecm(struct s_reader *reader, const ECM_REQUEST *er, str ecmcmd51[33] = csystem_data->provider; // no part of sig - if((drecas_MSP_cmd(ecmcmd51))) // ecm request + if(({drecas_MSP_cmd_nb(ecmcmd51)})) // ecm request { if((cta_res[2] != 0x09) || (cta_res[3] != 0xC0)) { return ERROR; } // exit if response is not 90 00 @@ -665,7 +677,7 @@ static int32_t drecas_do_ecm(struct s_reader *reader, const ECM_REQUEST *er, str return ERROR; } - if(!(drecas_STM_cmd(stm_keys_t.stmcmd34[er->ecm[5] + (er->ecm[6] == 0x3B ? 0 : 32)]))) + if(!({drecas_STM_cmd_nb(stm_keys_t.stmcmd34[er->ecm[5] + (er->ecm[6] == 0x3B ? 0 : 32)])})) { rdr_log_dbg(reader, D_READER, "Error STM set key: %s",cs_hexdump(0, cta_res, cta_lr, tmp_dbg, sizeof(tmp_dbg))); return ERROR; @@ -681,7 +693,7 @@ static int32_t drecas_do_ecm(struct s_reader *reader, const ECM_REQUEST *er, str stm_curkey[0] = er->ecm[5]; stm_curkey[1] = er->ecm[6]; - if(!(drecas_STM_cmd(ecmcmd33))) + if(!({drecas_STM_cmd_nb(ecmcmd33)})) { return ERROR; } if(cta_res[1] != 0x17 || cta_res[6] != 0xD2) @@ -745,7 +757,7 @@ static int32_t drecas_do_emm(struct s_reader *reader, EMM_PACKET *ep) memcpy(&emmcmd58[1], &ep->emm[40], 24); emmcmd58[25] = csystem_data->provider; - if((drecas_MSP_cmd(emmcmd58))) + if(({drecas_MSP_cmd_nb(emmcmd58)})) if((cta_res[2] != 0x09) || (cta_res[3] != 0xC0)) { return ERROR; } } @@ -765,7 +777,7 @@ static int32_t drecas_do_emm(struct s_reader *reader, EMM_PACKET *ep) emmcmd52[0x39] = csystem_data->provider; - if((drecas_MSP_cmd(emmcmd52))) + if(({drecas_MSP_cmd_nb(emmcmd52)})) if((cta_res[2] != 0x09) || (cta_res[3] != 0xC0)) { return ERROR; } // exit if response is not 90 00 } @@ -802,7 +814,7 @@ static int32_t drecas_do_emm(struct s_reader *reader, EMM_PACKET *ep) emmcmd52[0x39] = csystem_data->provider; - if((drecas_MSP_cmd(emmcmd52))) + if(({drecas_MSP_cmd_nb(emmcmd52)})) if((cta_res[2] != 0x09) || (cta_res[3] != 0xC0)) { return ERROR; } // exit if response is not 90 00 } diff --git a/reader-dre.c b/reader-dre.c index f9d922234..0cafe07e4 100644 --- a/reader-dre.c +++ b/reader-dre.c @@ -177,19 +177,28 @@ static int32_t dre_command(struct s_reader *reader, const uint8_t *cmd, int32_t return OK; } +#define dre_script_nb(cmd, len, cmd_type, crypted, keynum) \ + dre_command(reader, cmd, len, cta_res, &cta_lr, crypted, keynum, crypted, cmd_type); \ + #define dre_script(cmd, len, cmd_type, crypted, keynum) \ { \ - dre_command(reader, cmd, len, cta_res, &cta_lr, crypted, keynum, crypted, cmd_type); \ + dre_script_nb(cmd, len, cmd_type, crypted, keynum) \ } +#define dre_cmd_nb(cmd) \ + dre_command(reader, cmd, sizeof(cmd), cta_res, &cta_lr, 0, 0, 0, 0); \ + #define dre_cmd(cmd) \ { \ - dre_command(reader, cmd, sizeof(cmd), cta_res, &cta_lr, 0, 0, 0, 0); \ + dre_cmd_nb(cmd) \ } +#define dre_cmd_c_nb(cmd,crypted,keynum) \ + dre_command(reader, cmd, sizeof(cmd),cta_res,&cta_lr, crypted, keynum, 1, 0); \ + #define dre_cmd_c(cmd,crypted,keynum) \ { \ - dre_command(reader, cmd, sizeof(cmd),cta_res,&cta_lr, crypted, keynum, 1, 0); \ + dre_cmd_c_nb(cmd,crypted,keynum) \ } static int32_t dre_set_provider_info(struct s_reader *reader) @@ -236,7 +245,7 @@ static int32_t dre_set_provider_info(struct s_reader *reader) chk_subscr: - if((dre_script(subscr, subscr_cmd_len, 0, 0, 0))) // ask subscription packages, returns error on 0x11 card + if(({dre_script_nb(subscr, subscr_cmd_len, 0, 0, 0)})) // ask subscription packages, returns error on 0x11 card { uint8_t pbm[subscr_len]; char tmp_dbg[subscr_len*2+1]; @@ -411,7 +420,7 @@ static int32_t dre_card_init(struct s_reader *reader, ATR *newatr) switch(atr[6]) { case 0: - if(!(dre_cmd(cmd56))) { return ERROR; } + if(!({dre_cmd_nb(cmd56)})) { return ERROR; } if((cta_res[cta_lr - 2] != 0x90) || (cta_res[cta_lr - 1] != 0x00)) { return ERROR; } switch(cta_res[4]) @@ -483,11 +492,11 @@ static int32_t dre_card_init(struct s_reader *reader, ATR *newatr) cmd54[1] = csystem_data->provider; uint8_t geocode = 0; - if((dre_cmd(cmd54))) // error would not be fatal, like on 0x11 cards + if(({dre_cmd_nb(cmd54)})) // error would not be fatal, like on 0x11 cards { geocode = cta_res[3]; } providers[1] = csystem_data->provider; - if(!(dre_cmd(providers))) + if(!({dre_cmd_nb(providers)})) { return ERROR; } // fatal error if((cta_res[cta_lr - 2] != 0x90) || (cta_res[cta_lr - 1] != 0x00)) @@ -639,7 +648,7 @@ static int32_t dre_card_init(struct s_reader *reader, ATR *newatr) /*ret =*/ - rdr_log(reader, "Script %s", (dre_script(usercmd, cmd_len, ignoreProvid, crypted, cryptkey)) ? "done" : "error"); + rdr_log(reader, "Script %s", ({dre_script_nb(usercmd, cmd_len, ignoreProvid, crypted, cryptkey)}) ? "done" : "error"); } while(!feof(pFile)); } @@ -708,7 +717,7 @@ static int32_t dre_do_ecm(struct s_reader *reader, const ECM_REQUEST *er, struct rdr_log_dbg(reader, D_READER, "unused ECM info front:%s", cs_hexdump(0, er->ecm, 8, tmp_dbg, sizeof(tmp_dbg))); rdr_log_dbg(reader, D_READER, "unused ECM info back:%s", cs_hexdump(0, er->ecm + 24, er->ecm[2] + 2 - 24, tmp_dbg, sizeof(tmp_dbg))); - if((dre_cmd(ecmcmd41))) // ecm request + if(({dre_cmd_nb(ecmcmd41)})) // ecm request { if((cta_res[cta_lr - 2] != 0x90) || (cta_res[cta_lr - 1] != 0x00)) { return ERROR; } // exit if response is not 90 00 @@ -734,7 +743,7 @@ static int32_t dre_do_ecm(struct s_reader *reader, const ECM_REQUEST *er, struct rdr_log_dbg(reader, D_READER, "unused ECM info back:%s", cs_hexdump(0, er->ecm + 37, 4, tmp_dbg, sizeof(tmp_dbg))); ecmcmd51[33] = csystem_data->provider; // no part of sig - if((dre_cmd(ecmcmd51))) // ecm request + if(({dre_cmd_nb(ecmcmd51)})) // ecm request { if((cta_res[cta_lr - 2] != 0x90) || (cta_res[cta_lr - 1] != 0x00)) { return ERROR; } // exit if response is not 90 00 @@ -863,7 +872,7 @@ static int32_t dre_do_emm(struct s_reader *reader, EMM_PACKET *ep) memcpy(&emmcmd58[1], &ep->emm[40], 24); emmcmd58[25] = csystem_data->provider; - if((dre_cmd(emmcmd58))) + if(({dre_cmd_nb(emmcmd58)})) if((cta_res[cta_lr - 2] != 0x90) || (cta_res[cta_lr - 1] != 0x00)) { return ERROR; } } @@ -882,7 +891,7 @@ static int32_t dre_do_emm(struct s_reader *reader, EMM_PACKET *ep) emmcmd52[0x39] = csystem_data->provider; - if((dre_cmd(emmcmd52))) + if(({dre_cmd_nb(emmcmd52)})) if((cta_res[cta_lr - 2] != 0x90) || (cta_res[cta_lr - 1] != 0x00)) { return ERROR; } // exit if response is not 90 00 } @@ -918,7 +927,7 @@ static int32_t dre_do_emm(struct s_reader *reader, EMM_PACKET *ep) emmcmd52[0x39] = csystem_data->provider; - if((dre_cmd(emmcmd52))) + if(({dre_cmd_nb(emmcmd52)})) if((cta_res[cta_lr - 2] != 0x90) || (cta_res[cta_lr - 1] != 0x00)) { return ERROR; } // exit if response is not 90 00 } @@ -1031,7 +1040,7 @@ static int32_t dre_do_emm(struct s_reader *reader, EMM_PACKET *ep) memcpy(&emmcmd91[9], &ep->emm[keypos], 8); - if((dre_cmd(emmcmd91))) + if(({dre_cmd_nb(emmcmd91)})) if((cta_res[cta_lr - 2] != 0x90) || (cta_res[cta_lr - 1] != 0x00) || (cta_res[2] != 0xA2)) return ERROR; // exit if response is not 90 00 @@ -1188,7 +1197,7 @@ static int32_t dre_do_emm(struct s_reader *reader, EMM_PACKET *ep) emmcmd42[49] = ep->emm[i * 49 + 41]; // keynr emmcmd42[50] = 0x58 + ep->emm[40]; // package nr emmcmd42[51] = csystem_data->provider; - if((dre_cmd(emmcmd42))) + if(({dre_cmd_nb(emmcmd42)})) { if((cta_res[cta_lr - 2] != 0x90) || (cta_res[cta_lr - 1] != 0x00)) { return ERROR; } // exit if response is not 90 00 @@ -1208,7 +1217,7 @@ static int32_t dre_do_emm(struct s_reader *reader, EMM_PACKET *ep) 59 05 A2 02 05 01 5B 90 00 */ - if((dre_cmd(emmcmd42))) // first emm request + if(({dre_cmd_nb(emmcmd42)})) // first emm request { if((cta_res[cta_lr - 2] != 0x90) || (cta_res[cta_lr - 1] != 0x00)) { return ERROR; } // exit if response is not 90 00 @@ -1221,7 +1230,7 @@ static int32_t dre_do_emm(struct s_reader *reader, EMM_PACKET *ep) emmcmd42[50] = 0x58; emmcmd42[49] = ep->emm[54]; // keynr - if((dre_cmd(emmcmd42))) // second emm request + if(({dre_cmd_nb(emmcmd42)})) // second emm request { if((cta_res[cta_lr - 2] != 0x90) || (cta_res[cta_lr - 1] != 0x00)) { return ERROR; } // exit if response is not 90 00 From 641e271ed92e041750394af7f583f6fed57c52b2 Mon Sep 17 00:00:00 2001 From: bust3d Date: Sun, 4 Feb 2024 10:11:55 +0000 Subject: [PATCH 06/21] fix (unable to get PIN) for CAID 0913 thanks to @ohmza git-svn-id: http://www.streamboard.tv/svn/oscam/trunk@11732 4b0bc96b-bc66-0410-9d44-ebda105a78c1 --- reader-videoguard2.c | 51 ++++++++++++++++++++++---------------------- 1 file changed, 26 insertions(+), 25 deletions(-) diff --git a/reader-videoguard2.c b/reader-videoguard2.c index 6ad95bca6..890224e3e 100644 --- a/reader-videoguard2.c +++ b/reader-videoguard2.c @@ -894,17 +894,6 @@ static int32_t videoguard2_card_init(struct s_reader *reader, ATR *newatr) return ERROR; } - int d37423_ok = 0; - static const uint8_t ins7403[5] = { 0xD0, 0x74, 0x03, 0x00, 0x00 }; // taken from v13 boot log - if(do_cmd(reader, ins7403, NULL, NULL, cta_res) < 0) - { - rdr_log(reader, "classD0 ins7403: failed"); - } - else - { - d37423_ok = (cta_res[2] >> 5) & 1; - } - if(reader->ins7E11[0x01]) // the position of the ins7E is taken from v13 log { uint8_t ins742b[5] = { 0xD0, 0x74, 0x2b, 0x00, 0x00 }; @@ -1054,6 +1043,17 @@ static int32_t videoguard2_card_init(struct s_reader *reader, ATR *newatr) return ERROR; } + int d37423_ok = 0; + static const uint8_t ins7403[5] = { 0xD1, 0x74, 0x03, 0x00, 0x00 }; // taken from v13 boot log + if(do_cmd(reader, ins7403, NULL, NULL, cta_res) < 0) + { + rdr_log(reader, "classD1 ins7403: failed"); + } + else + { + d37423_ok = (cta_res[2] >> 5) & 1; + } + // new ins74 present at boot if(d37423_ok) // from ins7403 answer { @@ -1063,19 +1063,19 @@ static int32_t videoguard2_card_init(struct s_reader *reader, ATR *newatr) rdr_log(reader, "classD1 ins7423: failed"); } } -/* - static const uint8_t ins742A[5] = { 0xD1, 0x74, 0x2A, 0x00, 0x00 }; + + static const uint8_t ins742A[5] = { 0xD0, 0x74, 0x2A, 0x00, 0x00 }; if(do_cmd(reader, ins742A, NULL, NULL, cta_res) < 0) { - rdr_log(reader, "classD1 ins742A: failed"); + rdr_log(reader, "classD0 ins742A: failed"); } - static const uint8_t ins741C[5] = { 0xD1, 0x74, 0x1C, 0x00, 0x00 }; - if(do_cmd(reader, ins741C, NULL, NULL, cta_res) < 0) + static const uint8_t ins741B[5] = { 0xD1, 0x74, 0x1B, 0x00, 0x00 }; + if(do_cmd(reader, ins741B, NULL, NULL, cta_res) < 0) { - rdr_log(reader, "classD1 ins741C: failed"); + rdr_log(reader, "classD1 ins741B: failed"); } -*/ + static const uint8_t ins4Ca[5] = { 0xD1, 0x4C, 0x00, 0x00, 0x00 }; payload4C[4] = 0x83; @@ -1111,18 +1111,19 @@ static int32_t videoguard2_card_init(struct s_reader *reader, ATR *newatr) } // get PIN settings - static const uint8_t ins7411[5] = { 0xD1, 0x74, 0x11, 0x00, 0x00 }; + static const uint8_t ins7411[5] = { 0xD3, 0x74, 0x11, 0x00, 0x00 }; uint8_t payload2e4[4]; - if(do_cmd(reader, ins7411, NULL, NULL, cta_res) < 0) + uint8_t rbuff[264]; + if(do_cmd(reader, ins7411, NULL, rbuff, cta_res) < 0) { - rdr_log(reader, "classD1 ins7411: unable to get PIN"); + rdr_log(reader, "classD3 ins7411: unable to get PIN"); return ERROR; } else { memset(payload2e4, 0, 4); - memcpy(payload2e4, cta_res + 2, 4); - reader->VgPin = (cta_res[4] << 8) + cta_res[5]; + memcpy(payload2e4, rbuff + 7, 4); + reader->VgPin = (rbuff[9] << 8) + rbuff[10]; rdr_log(reader, "Pincode read: %04hu", reader->VgPin); } @@ -1284,7 +1285,7 @@ static int32_t videoguard2_do_ecm(struct s_reader *reader, const ECM_REQUEST *er memcpy(buff_55, t_body, 1 ); break; - case 0x56: // tag data for aes + case 0x56: // tag data for aes memcpy(buff_56, t_body, 8); break; @@ -1492,7 +1493,7 @@ static int32_t videoguard2_do_ecm(struct s_reader *reader, const ECM_REQUEST *er } } } - else //unknown pairing mode + else //unknown pairing mode { rdr_log_dbg(reader, D_READER, "classD3 ins54: CW is crypted, unknown pairing mode 0x%02X", buff_55[0]); if(er->ecm[0] & 1){ //log crypted CW From c2a70e94d4a5b7984c66baf9e6b71450dac9afb9 Mon Sep 17 00:00:00 2001 From: bust3d Date: Mon, 12 Feb 2024 17:20:22 +0000 Subject: [PATCH 07/21] Drop quickfixes for Providers that do not exist anymore thanks to @lpm11 Drop guessing CAID, this is really obsolete thanks to @lpm11 Update jquery to 3.7.1 thanks to @lpm11 Disable poll_status when READER_VIDEOGUARD is not enabled (no other CA uses it) thanks to @lpm11 Fix openssl dependency thanks to @lpm11 git-svn-id: http://www.streamboard.tv/svn/oscam/trunk@11733 4b0bc96b-bc66-0410-9d44-ebda105a78c1 --- Makefile | 1 - config.h | 1 - config.sh | 4 +- cscrypt/bn_exp.c | 258 ++++++++++++++++++++++++++++++++++++++++ cscrypt/mdc2.h | 18 ++- module-webif-tpl.c | 1 - oscam-config-global.c | 2 +- oscam-config.c | 43 ------- oscam-config.h | 1 - oscam-ecm.c | 55 --------- oscam-work.c | 2 + oscam.c | 7 -- webif/include/jquery.js | 7 +- 13 files changed, 277 insertions(+), 123 deletions(-) diff --git a/Makefile b/Makefile index ea18ffde8..4b35141ee 100644 --- a/Makefile +++ b/Makefile @@ -288,7 +288,6 @@ SRC-$(CONFIG_MODULE_GBOX) += module-gbox-sms.c SRC-$(CONFIG_MODULE_GBOX) += module-gbox-remm.c SRC-$(CONFIG_MODULE_GBOX) += module-gbox-cards.c SRC-$(CONFIG_MODULE_GBOX) += module-gbox.c -SRC-$(CONFIG_IRDETO_GUESSING) += module-ird-guess.c SRC-$(CONFIG_LCDSUPPORT) += module-lcd.c SRC-$(CONFIG_LEDSUPPORT) += module-led.c SRC-$(CONFIG_MODULE_MONITOR) += module-monitor.c diff --git a/config.h b/config.h index cf96dd234..f505ca32c 100644 --- a/config.h +++ b/config.h @@ -13,7 +13,6 @@ //#define WITH_NEUTRINO 1 #define READ_SDT_CHARSETS 1 //#define CLOCKFIX 1 -#define IRDETO_GUESSING 1 //#define CS_ANTICASC 1 #define WITH_DEBUG 1 #define WITH_LB 1 diff --git a/config.sh b/config.sh index 411c9fe07..a801d003b 100755 --- a/config.sh +++ b/config.sh @@ -1,6 +1,6 @@ #!/bin/sh -addons="WEBIF WEBIF_LIVELOG WEBIF_JQUERY TOUCH WITH_SSL HAVE_DVBAPI WITH_EXTENDED_CW WITH_NEUTRINO READ_SDT_CHARSETS IRDETO_GUESSING CS_ANTICASC WITH_DEBUG MODULE_MONITOR WITH_LB CS_CACHEEX CS_CACHEEX_AIO CW_CYCLE_CHECK LCDSUPPORT LEDSUPPORT CLOCKFIX IPV6SUPPORT" +addons="WEBIF WEBIF_LIVELOG WEBIF_JQUERY TOUCH WITH_SSL HAVE_DVBAPI WITH_EXTENDED_CW WITH_NEUTRINO READ_SDT_CHARSETS CS_ANTICASC WITH_DEBUG MODULE_MONITOR WITH_LB CS_CACHEEX CS_CACHEEX_AIO CW_CYCLE_CHECK LCDSUPPORT LEDSUPPORT CLOCKFIX IPV6SUPPORT" protocols="MODULE_CAMD33 MODULE_CAMD35 MODULE_CAMD35_TCP MODULE_NEWCAMD MODULE_CCCAM MODULE_CCCSHARE MODULE_GBOX MODULE_RADEGAST MODULE_SCAM MODULE_SERIAL MODULE_CONSTCW MODULE_PANDORA MODULE_GHTTP" readers="READER_NAGRA READER_NAGRA_MERLIN READER_IRDETO READER_CONAX READER_CRYPTOWORKS READER_SECA READER_VIACCESS READER_VIDEOGUARD READER_DRE READER_TONGFANG READER_BULCRYPT READER_GRIFFIN READER_DGCRYPT" card_readers="CARDREADER_PHOENIX CARDREADER_INTERNAL CARDREADER_SC8IN1 CARDREADER_MP35 CARDREADER_SMARGO CARDREADER_DB2COM CARDREADER_STAPI CARDREADER_STAPI5 CARDREADER_STINGER CARDREADER_DRECAS" @@ -15,7 +15,6 @@ CONFIG_HAVE_DVBAPI=y # CONFIG_WITH_EXTENDED_CW=n # CONFIG_WITH_NEUTRINO=n CONFIG_READ_SDT_CHARSETS=y -CONFIG_IRDETO_GUESSING=y # CONFIG_CS_ANTICASC=n CONFIG_WITH_DEBUG=y CONFIG_MODULE_MONITOR=y @@ -458,7 +457,6 @@ menu_addons() { WITH_EXTENDED_CW "DVB API EXTENDED CW API" $(check_test "WITH_EXTENDED_CW") \ WITH_NEUTRINO "Neutrino support" $(check_test "WITH_NEUTRINO") \ READ_SDT_CHARSETS "DVB API read-sdt charsets" $(check_test "READ_SDT_CHARSETS") \ - IRDETO_GUESSING "Irdeto guessing" $(check_test "IRDETO_GUESSING") \ CS_ANTICASC "Anti cascading" $(check_test "CS_ANTICASC") \ WITH_DEBUG "Debug messages" $(check_test "WITH_DEBUG") \ MODULE_MONITOR "Monitor" $(check_test "MODULE_MONITOR") \ diff --git a/cscrypt/bn_exp.c b/cscrypt/bn_exp.c index ec1d43f98..6c5d58518 100644 --- a/cscrypt/bn_exp.c +++ b/cscrypt/bn_exp.c @@ -268,4 +268,262 @@ int BN_mod_exp_simple(BIGNUM *r, BIGNUM *a, const BIGNUM *p, const BIGNUM *m, return (ret); } +int +BN_nnmod(BIGNUM *r, const BIGNUM *m, const BIGNUM *d, BN_CTX *ctx) +{ + /* like BN_mod, but returns non-negative remainder + * (i.e., 0 <= r < |d| always holds) + */ + + if (!(BN_mod(r, m, d, ctx))) + return 0; + if (!r->neg) + return 1; + /* now -|d| < r < 0, so we have to set r : = r + |d| */ + return (d->neg ? BN_sub : BN_add)(r, r, d); +} + +/* solves ax == 1 (mod n) */ +BIGNUM * +BN_mod_inverse(BIGNUM *ret, BIGNUM *a, const BIGNUM *n, BN_CTX *ctx) +{ + BIGNUM *A, *B, *X, *Y, *M, *D, *T = NULL; + int sign; + + bn_check_top(a); + bn_check_top(n); + + BN_CTX_start(ctx); + A = BN_CTX_get(ctx); + B = BN_CTX_get(ctx); + X = BN_CTX_get(ctx); + D = BN_CTX_get(ctx); + M = BN_CTX_get(ctx); + Y = BN_CTX_get(ctx); + T = BN_CTX_get(ctx); + if (T == NULL) goto err; + + if (ret == NULL) goto err; + + BN_one(X); + BN_zero(Y); + if (BN_copy(B, a) == NULL) goto err; + if (BN_copy(A, n) == NULL) goto err; + A->neg = 0; + if (B->neg || (BN_ucmp(B, A) >= 0)) { + if (!BN_nnmod(B, B, A, ctx)) goto err; + } + sign = -1; + /* From B = a mod |n|, A = |n| it follows that + * + * 0 <= B < A, + * -sign*X*a == B (mod |n|), + * sign*Y*a == A (mod |n|). + */ + + if (BN_is_odd(n) && (BN_num_bits(n) <= (BN_BITS <= 32 ? 450 : 2048))) { + /* Binary inversion algorithm; requires odd modulus. + * This is faster than the general algorithm if the modulus + * is sufficiently small (about 400 .. 500 bits on 32-bit + * sytems, but much more on 64-bit systems) + */ + int shift; + + while (!BN_is_zero(B)) { + /* + * 0 < B < |n|, + * 0 < A <= |n|, + * (1) -sign*X*a == B (mod |n|), + * (2) sign*Y*a == A (mod |n|) + */ + + /* Now divide B by the maximum possible power of two in the integers, + * and divide X by the same value mod |n|. + * When we're done, (1) still holds. + */ + shift = 0; + while (!BN_is_bit_set(B, shift)) /* note that 0 < B */ { + shift++; + + if (BN_is_odd(X)) { + if (!BN_uadd(X, X, n)) goto err; + } + /* now X is even, so we can easily divide it by two */ + if (!BN_rshift1(X, X)) goto err; + } + if (shift > 0) { + if (!BN_rshift(B, B, shift)) goto err; + } + + + /* Same for A and Y. Afterwards, (2) still holds. */ + shift = 0; + while (!BN_is_bit_set(A, shift)) /* note that 0 < A */ { + shift++; + + if (BN_is_odd(Y)) { + if (!BN_uadd(Y, Y, n)) goto err; + } + /* now Y is even */ + if (!BN_rshift1(Y, Y)) goto err; + } + if (shift > 0) { + if (!BN_rshift(A, A, shift)) goto err; + } + + /* We still have (1) and (2). + * Both A and B are odd. + * The following computations ensure that + * + * 0 <= B < |n|, + * 0 < A < |n|, + * (1) -sign*X*a == B (mod |n|), + * (2) sign*Y*a == A (mod |n|), + * + * and that either A or B is even in the next iteration. + */ + if (BN_ucmp(B, A) >= 0) { + /* -sign*(X + Y)*a == B - A (mod |n|) */ + if (!BN_uadd(X, X, Y)) goto err; + /* NB: we could use BN_mod_add_quick(X, X, Y, n), but that + * actually makes the algorithm slower + */ + if (!BN_usub(B, B, A)) goto err; + } else { + /* sign*(X + Y)*a == A - B (mod |n|) */ + if (!BN_uadd(Y, Y, X)) goto err; + /* as above, BN_mod_add_quick(Y, Y, X, n) would slow things down */ + if (!BN_usub(A, A, B)) goto err; + } + } + } else { + /* general inversion algorithm */ + + while (!BN_is_zero(B)) { + BIGNUM *tmp; + + /* + * 0 < B < A, + * (*) -sign*X*a == B (mod |n|), + * sign*Y*a == A (mod |n|) + */ + + /* (D, M) : = (A/B, A%B) ... */ + if (BN_num_bits(A) == BN_num_bits(B)) { + if (!BN_one(D)) goto err; + if (!BN_sub(M, A, B)) goto err; + } else if (BN_num_bits(A) == BN_num_bits(B) + 1) { + /* A/B is 1, 2, or 3 */ + if (!BN_lshift1(T, B)) goto err; + if (BN_ucmp(A, T) < 0) { + /* A < 2*B, so D = 1 */ + if (!BN_one(D)) goto err; + if (!BN_sub(M, A, B)) goto err; + } else { + /* A >= 2*B, so D = 2 or D = 3 */ + if (!BN_sub(M, A, T)) goto err; + if (!BN_add(D, T, B)) goto err; + /* use D ( := 3 * B) as temp */ + if (BN_ucmp(A, D) < 0) { + /* A < 3*B, so D = 2 */ + if (!BN_set_word(D, 2)) goto err; + /* M ( = A - 2*B) already has the correct value */ + } else { + /* only D = 3 remains */ + if (!BN_set_word(D, 3)) goto err; + /* currently M = A - 2 * B, + * but we need M = A - 3 * B + */ + if (!BN_sub(M, M, B)) goto err; + } + } + } else { + if (!BN_div(D, M, A, B, ctx)) goto err; + } + + /* Now + * A = D*B + M; + * thus we have + * (**) sign*Y*a == D*B + M (mod |n|). + */ + + tmp = A; /* keep the BIGNUM object, the value does not matter */ + + /* (A, B) : = (B, A mod B) ... */ + A = B; + B = M; + /* ... so we have 0 <= B < A again */ + + /* Since the former M is now B and the former B is now A, + * (**) translates into + * sign*Y*a == D*A + B (mod |n|), + * i.e. + * sign*Y*a - D*A == B (mod |n|). + * Similarly, (*) translates into + * -sign*X*a == A (mod |n|). + * + * Thus, + * sign*Y*a + D*sign*X*a == B (mod |n|), + * i.e. + * sign*(Y + D*X)*a == B (mod |n|). + * + * So if we set (X, Y, sign) : = (Y + D*X, X, -sign), we arrive back at + * -sign*X*a == B (mod |n|), + * sign*Y*a == A (mod |n|). + * Note that X and Y stay non-negative all the time. + */ + + /* most of the time D is very small, so we can optimize tmp : = D*X+Y */ + if (BN_is_one(D)) { + if (!BN_add(tmp, X, Y)) goto err; + } else { + if (BN_is_word(D, 2)) { + if (!BN_lshift1(tmp, X)) goto err; + } else if (BN_is_word(D, 4)) { + if (!BN_lshift(tmp, X, 2)) goto err; + } else if (D->top == 1) { + if (!BN_copy(tmp, X)) goto err; + if (!BN_mul_word(tmp, D->d[0])) goto err; + } else { + if (!BN_mul(tmp, D, X, ctx)) goto err; + } + if (!BN_add(tmp, tmp, Y)) goto err; + } + + M = Y; /* keep the BIGNUM object, the value does not matter */ + Y = X; + X = tmp; + sign = -sign; + } + } + + /* + * The while loop (Euclid's algorithm) ends when + * A == gcd(a, n); + * we have + * sign*Y*a == A (mod |n|), + * where Y is non-negative. + */ + + if (sign < 0) { + if (!BN_sub(Y, n, Y)) goto err; + } + /* Now Y*a == A (mod |n|). */ + + + if (BN_is_one(A)) { + /* Y*a == 1 (mod |n|) */ + if (!Y->neg && BN_ucmp(Y, n) < 0) { + if (!BN_copy(ret, Y)) goto err; + } else { + if (!BN_nnmod(ret, Y, n, ctx)) goto err; + } + } else { + goto err; + } +err: + BN_CTX_end(ctx); + return (ret); +} + #endif diff --git a/cscrypt/mdc2.h b/cscrypt/mdc2.h index 8476b376d..e57c3ed35 100644 --- a/cscrypt/mdc2.h +++ b/cscrypt/mdc2.h @@ -59,12 +59,20 @@ #ifndef HEADER_MDC2_H #define HEADER_MDC2_H -/* To everybody who want to fix this external openssl dependency bug - * read this starting at page 5 https://board.streamboard.tv/forum/thread/47678-oscam-bug-report/?pageNo=5 - * Don't touch this if you have no real fix. Right now resolution is can't fix - */ - +#if defined(WITH_SSL) || defined(WITH_LIBCRYPTO) #include +#else +#define DES_KEY_SZ (sizeof(DES_cblock)) +typedef unsigned int DES_LONG; +typedef unsigned char DES_cblock[8]; +typedef unsigned char const_DES_cblock[8]; +typedef struct DES_ks { + union { + DES_cblock cblock; + DES_LONG deslong[2]; + } ks[16]; +} DES_key_schedule; +#endif #ifdef __cplusplus extern "C" { diff --git a/module-webif-tpl.c b/module-webif-tpl.c index e94d693b1..32e793f78 100644 --- a/module-webif-tpl.c +++ b/module-webif-tpl.c @@ -423,7 +423,6 @@ char *tpl_getUnparsedTpl(const char *name, int8_t removeHeader, const char *subd check_conf(READ_SDT_CHARSETS, ptr2); check_conf(CLOCKFIX, ptr2); check_conf(IPV6SUPPORT, ptr2); - check_conf(IRDETO_GUESSING, ptr2); check_conf(LCDSUPPORT, ptr2); check_conf(LEDSUPPORT, ptr2); check_conf(MODULE_CAMD33, ptr2); diff --git a/oscam-config-global.c b/oscam-config-global.c index 164601c3a..3df1e16e9 100644 --- a/oscam-config-global.c +++ b/oscam-config-global.c @@ -591,7 +591,7 @@ static const struct config_list webif_opts[] = DEF_OPT_INT8("http_status_log" , OFS(http_status_log) , 1), #endif #ifndef WEBIF_JQUERY - DEF_OPT_STR("http_extern_jquery" , OFS(http_extern_jquery) , "//code.jquery.com/jquery-1.12.4.min.js"), + DEF_OPT_STR("http_extern_jquery" , OFS(http_extern_jquery) , "//code.jquery.com/jquery-3.7.1.min.js"), #endif DEF_LAST_OPT }; diff --git a/oscam-config.c b/oscam-config.c index 530a7e629..f4bdfeb89 100644 --- a/oscam-config.c +++ b/oscam-config.c @@ -13,12 +13,9 @@ #include "oscam-string.h" #include "oscam-time.h" -extern uint16_t len4caid[256]; - #define cs_srid "oscam.srvid" #define cs_ratelimit "oscam.ratelimit" #define cs_trid "oscam.tiers" -#define cs_l4ca "oscam.guess" #define cs_sidt "oscam.services" #define cs_whitelist "oscam.whitelist" #define cs_provid "oscam.provid" @@ -1391,46 +1388,6 @@ void global_whitelist_read(void) } } -void init_len4caid(void) -{ - FILE *fp = open_config_file(cs_l4ca); - if(!fp) - { return; } - - int32_t nr; - char *value, *token; - - if(!cs_malloc(&token, MAXLINESIZE)) - { return; } - - memset(len4caid, 0, sizeof(uint16_t) << 8); - for(nr = 0; fgets(token, MAXLINESIZE, fp);) - { - int32_t i, c; - char *ptr; - if(!(value = strchr(token, ':'))) - { continue; } - *value++ = '\0'; - if((ptr = strchr(value, '#'))) - { * ptr = '\0'; } - if(cs_strlen(trim(token)) != 2) - { continue; } - if(cs_strlen(trim(value)) != 4) - { continue; } - if((i = byte_atob(token)) < 0) - { continue; } - if((c = word_atob(value)) < 0) - { continue; } - len4caid[i] = c; - nr++; - } - NULLFREE(token); - fclose(fp); - if(nr) - { cs_log("%d lengths for caid guessing loaded", nr); } - return; -} - #ifdef MODULE_SERIAL static struct s_twin *twin_read_int(void) { diff --git a/oscam-config.h b/oscam-config.h index a430ce360..e66a1aa1c 100644 --- a/oscam-config.h +++ b/oscam-config.h @@ -38,7 +38,6 @@ int32_t init_provid(void); int32_t init_srvid(void); int32_t init_tierid(void); int32_t init_fakecws(void); -void init_len4caid(void); #ifdef MODULE_SERIAL struct ecmtw get_twin(ECM_REQUEST *er); // get twin channel diff --git a/oscam-ecm.c b/oscam-ecm.c index 489fb380c..4bccafcff 100644 --- a/oscam-ecm.c +++ b/oscam-ecm.c @@ -7,7 +7,6 @@ #include "module-led.h" #include "module-stat.h" #include "module-webif.h" -#include "module-ird-guess.h" #include "module-cw-cycle-check.h" #include "module-gbox.h" #include "oscam-cache.h" @@ -30,7 +29,6 @@ extern CS_MUTEX_LOCK ecmcache_lock; extern struct ecm_request_t *ecmcwcache; -extern uint16_t len4caid[256]; extern uint32_t ecmcwcache_size; extern int32_t exit_oscam; @@ -2142,41 +2140,6 @@ int32_t write_ecm_answer(struct s_reader *reader, ECM_REQUEST *er, int8_t rc, ui return res; } -static void guess_cardsystem(ECM_REQUEST *er) -{ - uint16_t last_hope = 0; - - // viaccess - check by provid-search - if((er->prid = chk_provid(er->ecm, 0x500))) - { er->caid = 0x500; } - - // nagra - // is ecm[1] always 0x30 ? - // is ecm[3] always 0x07 ? - if((er->ecm[6] == 1) && (er->ecm[4] == er->ecm[2] - 2)) - { er->caid = 0x1801; } - - // seca2 - very poor - if((er->ecm[8] == 0x10) && ((er->ecm[9] & 0xF1) == 1)) - { last_hope = 0x100; } - - // is cryptoworks, but which caid ? - if((er->ecm[3] == 0x81) && (er->ecm[4] == 0xFF) && - (!er->ecm[5]) && (!er->ecm[6]) && (er->ecm[7] == er->ecm[2] - 5)) - { - last_hope = 0xd00; - } - - if(!er->caid && er->ecm[2] == 0x31 && er->ecm[0x0b] == 0x28) - { guess_irdeto(er); } - - if(!er->caid) // guess by len... - { er->caid = len4caid[er->ecm[2] + 3]; } - - if(!er->caid) - { er->caid = last_hope; } -} - // chid calculation from module stat to here // to improve the quickfix concerning ecm chid info and extend it // to all client requests wereby the chid is known in module stat @@ -2474,27 +2437,9 @@ void get_cw(struct s_client *client, ECM_REQUEST *er) snprintf(er->msglog, sizeof(er->msglog), "invalid user group %s", username(client)); } - if(!er->caid) - { guess_cardsystem(er); } - - /* Quickfix Area */ - // add chid for all client requests as in module stat update_chid(er); - // quickfix for 0100:000065 - if(er->caid == 0x100 && er->prid == 0x65 && er->srvid == 0) - { er->srvid = 0x0642; } - - // Quickfixes for Opticum/Globo HD9500 - // Quickfix for 0500:030300 - if(er->caid == 0x500 && er->prid == 0x030300) - { er->prid = 0x030600; } - - // Quickfix for 0500:D20200 - if(er->caid == 0x500 && er->prid == 0xD20200) - { er->prid = 0x030600; } - // betacrypt ecm with nagra header if(chk_is_betatunnel_caid(er->caid) == 1 && (er->ecmlen == 0x89 || er->ecmlen == 0x4A) && er->ecm[3] == 0x07 && (er->ecm[4] == 0x84 || er->ecm[4] == 0x45)) { diff --git a/oscam-work.c b/oscam-work.c index b7a02affe..85f212400 100644 --- a/oscam-work.c +++ b/oscam-work.c @@ -333,7 +333,9 @@ void *work_thread(void *ptr) break; case ACTION_READER_POLL_STATUS: +#ifdef READER_VIDEOGUARD cardreader_poll_status(reader); +#endif break; #ifdef READER_NAGRA_MERLIN diff --git a/oscam.c b/oscam.c index d16f2bae6..d07310728 100644 --- a/oscam.c +++ b/oscam.c @@ -16,7 +16,6 @@ #include "module-dvbapi-mca.h" #include "module-dvbapi-chancache.h" #include "module-gbox-sms.h" -#include "module-ird-guess.h" #include "module-lcd.h" #include "module-led.h" #include "module-stat.h" @@ -85,7 +84,6 @@ struct s_client *first_client = NULL; // Pointer to clients list, first client i struct s_reader *first_active_reader = NULL; // list of active readers (enable=1 deleted = 0) LLIST *configured_readers = NULL; // list of all (configured) readers -uint16_t len4caid[256]; // table for guessing caid (by len) char cs_confdir[128]; uint16_t cs_dblevel = 0; // Debug Level int32_t thread_pipe[2] = {0, 0}; @@ -420,7 +418,6 @@ static void write_versionfile(bool use_stdout) write_conf(WITH_NEUTRINO, "DVB API with NEUTRINO support"); write_conf(READ_SDT_CHARSETS, "DVB API read-sdt charsets"); } - write_conf(IRDETO_GUESSING, "Irdeto guessing"); write_conf(CS_ANTICASC, "Anti-cascading support"); write_conf(WITH_DEBUG, "Debug mode"); write_conf(MODULE_MONITOR, "Monitor"); @@ -1847,9 +1844,6 @@ int32_t main(int32_t argc, char *argv[]) cacheex_init(); - init_len4caid(); - init_irdeto_guess_tab(); - write_versionfile(false); led_init(); @@ -1980,7 +1974,6 @@ int32_t main(int32_t argc, char *argv[]) cfg.account = NULL; init_free_sidtab(); free_readerdb(); - free_irdeto_guess_tab(); config_free(); ssl_done(); diff --git a/webif/include/jquery.js b/webif/include/jquery.js index e83647587..7f37b5d99 100644 --- a/webif/include/jquery.js +++ b/webif/include/jquery.js @@ -1,5 +1,2 @@ -/*! jQuery v1.12.4 | (c) jQuery Foundation | jquery.org/license */ -!function(a,b){"object"==typeof module&&"object"==typeof module.exports?module.exports=a.document?b(a,!0):function(a){if(!a.document)throw new Error("jQuery requires a window with a document");return b(a)}:b(a)}("undefined"!=typeof window?window:this,function(a,b){var c=[],d=a.document,e=c.slice,f=c.concat,g=c.push,h=c.indexOf,i={},j=i.toString,k=i.hasOwnProperty,l={},m="1.12.4",n=function(a,b){return new n.fn.init(a,b)},o=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,p=/^-ms-/,q=/-([\da-z])/gi,r=function(a,b){return b.toUpperCase()};n.fn=n.prototype={jquery:m,constructor:n,selector:"",length:0,toArray:function(){return e.call(this)},get:function(a){return null!=a?0>a?this[a+this.length]:this[a]:e.call(this)},pushStack:function(a){var b=n.merge(this.constructor(),a);return b.prevObject=this,b.context=this.context,b},each:function(a){return n.each(this,a)},map:function(a){return this.pushStack(n.map(this,function(b,c){return a.call(b,c,b)}))},slice:function(){return this.pushStack(e.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(a){var b=this.length,c=+a+(0>a?b:0);return this.pushStack(c>=0&&b>c?[this[c]]:[])},end:function(){return this.prevObject||this.constructor()},push:g,sort:c.sort,splice:c.splice},n.extend=n.fn.extend=function(){var a,b,c,d,e,f,g=arguments[0]||{},h=1,i=arguments.length,j=!1;for("boolean"==typeof g&&(j=g,g=arguments[h]||{},h++),"object"==typeof g||n.isFunction(g)||(g={}),h===i&&(g=this,h--);i>h;h++)if(null!=(e=arguments[h]))for(d in e)a=g[d],c=e[d],g!==c&&(j&&c&&(n.isPlainObject(c)||(b=n.isArray(c)))?(b?(b=!1,f=a&&n.isArray(a)?a:[]):f=a&&n.isPlainObject(a)?a:{},g[d]=n.extend(j,f,c)):void 0!==c&&(g[d]=c));return g},n.extend({expando:"jQuery"+(m+Math.random()).replace(/\D/g,""),isReady:!0,error:function(a){throw new Error(a)},noop:function(){},isFunction:function(a){return"function"===n.type(a)},isArray:Array.isArray||function(a){return"array"===n.type(a)},isWindow:function(a){return null!=a&&a==a.window},isNumeric:function(a){var b=a&&a.toString();return!n.isArray(a)&&b-parseFloat(b)+1>=0},isEmptyObject:function(a){var b;for(b in a)return!1;return!0},isPlainObject:function(a){var b;if(!a||"object"!==n.type(a)||a.nodeType||n.isWindow(a))return!1;try{if(a.constructor&&!k.call(a,"constructor")&&!k.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}if(!l.ownFirst)for(b in a)return k.call(a,b);for(b in a);return void 0===b||k.call(a,b)},type:function(a){return null==a?a+"":"object"==typeof a||"function"==typeof a?i[j.call(a)]||"object":typeof a},globalEval:function(b){b&&n.trim(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(p,"ms-").replace(q,r)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toLowerCase()===b.toLowerCase()},each:function(a,b){var c,d=0;if(s(a)){for(c=a.length;c>d;d++)if(b.call(a[d],d,a[d])===!1)break}else for(d in a)if(b.call(a[d],d,a[d])===!1)break;return a},trim:function(a){return null==a?"":(a+"").replace(o,"")},makeArray:function(a,b){var c=b||[];return null!=a&&(s(Object(a))?n.merge(c,"string"==typeof a?[a]:a):g.call(c,a)),c},inArray:function(a,b,c){var d;if(b){if(h)return h.call(b,a,c);for(d=b.length,c=c?0>c?Math.max(0,d+c):c:0;d>c;c++)if(c in b&&b[c]===a)return c}return-1},merge:function(a,b){var c=+b.length,d=0,e=a.length;while(c>d)a[e++]=b[d++];if(c!==c)while(void 0!==b[d])a[e++]=b[d++];return a.length=e,a},grep:function(a,b,c){for(var d,e=[],f=0,g=a.length,h=!c;g>f;f++)d=!b(a[f],f),d!==h&&e.push(a[f]);return e},map:function(a,b,c){var d,e,g=0,h=[];if(s(a))for(d=a.length;d>g;g++)e=b(a[g],g,c),null!=e&&h.push(e);else for(g in a)e=b(a[g],g,c),null!=e&&h.push(e);return f.apply([],h)},guid:1,proxy:function(a,b){var c,d,f;return"string"==typeof b&&(f=a[b],b=a,a=f),n.isFunction(a)?(c=e.call(arguments,2),d=function(){return a.apply(b||this,c.concat(e.call(arguments)))},d.guid=a.guid=a.guid||n.guid++,d):void 0},now:function(){return+new Date},support:l}),"function"==typeof Symbol&&(n.fn[Symbol.iterator]=c[Symbol.iterator]),n.each("Boolean Number String Function Array Date RegExp Object Error Symbol".split(" "),function(a,b){i["[object "+b+"]"]=b.toLowerCase()});function s(a){var b=!!a&&"length"in a&&a.length,c=n.type(a);return"function"===c||n.isWindow(a)?!1:"array"===c||0===b||"number"==typeof b&&b>0&&b-1 in a}var t=function(a){var b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u="sizzle"+1*new Date,v=a.document,w=0,x=0,y=ga(),z=ga(),A=ga(),B=function(a,b){return a===b&&(l=!0),0},C=1<<31,D={}.hasOwnProperty,E=[],F=E.pop,G=E.push,H=E.push,I=E.slice,J=function(a,b){for(var c=0,d=a.length;d>c;c++)if(a[c]===b)return c;return-1},K="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",L="[\\x20\\t\\r\\n\\f]",M="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",N="\\["+L+"*("+M+")(?:"+L+"*([*^$|!~]?=)"+L+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+M+"))|)"+L+"*\\]",O=":("+M+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+N+")*)|.*)\\)|)",P=new RegExp(L+"+","g"),Q=new RegExp("^"+L+"+|((?:^|[^\\\\])(?:\\\\.)*)"+L+"+$","g"),R=new RegExp("^"+L+"*,"+L+"*"),S=new RegExp("^"+L+"*([>+~]|"+L+")"+L+"*"),T=new RegExp("="+L+"*([^\\]'\"]*?)"+L+"*\\]","g"),U=new RegExp(O),V=new RegExp("^"+M+"$"),W={ID:new RegExp("^#("+M+")"),CLASS:new RegExp("^\\.("+M+")"),TAG:new RegExp("^("+M+"|[*])"),ATTR:new RegExp("^"+N),PSEUDO:new RegExp("^"+O),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+L+"*(even|odd|(([+-]|)(\\d*)n|)"+L+"*(?:([+-]|)"+L+"*(\\d+)|))"+L+"*\\)|)","i"),bool:new RegExp("^(?:"+K+")$","i"),needsContext:new RegExp("^"+L+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+L+"*((?:-\\d)?\\d*)"+L+"*\\)|)(?=[^-]|$)","i")},X=/^(?:input|select|textarea|button)$/i,Y=/^h\d$/i,Z=/^[^{]+\{\s*\[native \w/,$=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,_=/[+~]/,aa=/'|\\/g,ba=new RegExp("\\\\([\\da-f]{1,6}"+L+"?|("+L+")|.)","ig"),ca=function(a,b,c){var d="0x"+b-65536;return d!==d||c?b:0>d?String.fromCharCode(d+65536):String.fromCharCode(d>>10|55296,1023&d|56320)},da=function(){m()};try{H.apply(E=I.call(v.childNodes),v.childNodes),E[v.childNodes.length].nodeType}catch(ea){H={apply:E.length?function(a,b){G.apply(a,I.call(b))}:function(a,b){var c=a.length,d=0;while(a[c++]=b[d++]);a.length=c-1}}}function fa(a,b,d,e){var f,h,j,k,l,o,r,s,w=b&&b.ownerDocument,x=b?b.nodeType:9;if(d=d||[],"string"!=typeof a||!a||1!==x&&9!==x&&11!==x)return d;if(!e&&((b?b.ownerDocument||b:v)!==n&&m(b),b=b||n,p)){if(11!==x&&(o=$.exec(a)))if(f=o[1]){if(9===x){if(!(j=b.getElementById(f)))return d;if(j.id===f)return d.push(j),d}else if(w&&(j=w.getElementById(f))&&t(b,j)&&j.id===f)return d.push(j),d}else{if(o[2])return H.apply(d,b.getElementsByTagName(a)),d;if((f=o[3])&&c.getElementsByClassName&&b.getElementsByClassName)return H.apply(d,b.getElementsByClassName(f)),d}if(c.qsa&&!A[a+" "]&&(!q||!q.test(a))){if(1!==x)w=b,s=a;else if("object"!==b.nodeName.toLowerCase()){(k=b.getAttribute("id"))?k=k.replace(aa,"\\$&"):b.setAttribute("id",k=u),r=g(a),h=r.length,l=V.test(k)?"#"+k:"[id='"+k+"']";while(h--)r[h]=l+" "+qa(r[h]);s=r.join(","),w=_.test(a)&&oa(b.parentNode)||b}if(s)try{return H.apply(d,w.querySelectorAll(s)),d}catch(y){}finally{k===u&&b.removeAttribute("id")}}}return i(a.replace(Q,"$1"),b,d,e)}function ga(){var a=[];function b(c,e){return a.push(c+" ")>d.cacheLength&&delete b[a.shift()],b[c+" "]=e}return b}function ha(a){return a[u]=!0,a}function ia(a){var b=n.createElement("div");try{return!!a(b)}catch(c){return!1}finally{b.parentNode&&b.parentNode.removeChild(b),b=null}}function ja(a,b){var c=a.split("|"),e=c.length;while(e--)d.attrHandle[c[e]]=b}function ka(a,b){var c=b&&a,d=c&&1===a.nodeType&&1===b.nodeType&&(~b.sourceIndex||C)-(~a.sourceIndex||C);if(d)return d;if(c)while(c=c.nextSibling)if(c===b)return-1;return a?1:-1}function la(a){return function(b){var c=b.nodeName.toLowerCase();return"input"===c&&b.type===a}}function ma(a){return function(b){var c=b.nodeName.toLowerCase();return("input"===c||"button"===c)&&b.type===a}}function na(a){return ha(function(b){return b=+b,ha(function(c,d){var e,f=a([],c.length,b),g=f.length;while(g--)c[e=f[g]]&&(c[e]=!(d[e]=c[e]))})})}function oa(a){return a&&"undefined"!=typeof a.getElementsByTagName&&a}c=fa.support={},f=fa.isXML=function(a){var b=a&&(a.ownerDocument||a).documentElement;return b?"HTML"!==b.nodeName:!1},m=fa.setDocument=function(a){var b,e,g=a?a.ownerDocument||a:v;return g!==n&&9===g.nodeType&&g.documentElement?(n=g,o=n.documentElement,p=!f(n),(e=n.defaultView)&&e.top!==e&&(e.addEventListener?e.addEventListener("unload",da,!1):e.attachEvent&&e.attachEvent("onunload",da)),c.attributes=ia(function(a){return a.className="i",!a.getAttribute("className")}),c.getElementsByTagName=ia(function(a){return a.appendChild(n.createComment("")),!a.getElementsByTagName("*").length}),c.getElementsByClassName=Z.test(n.getElementsByClassName),c.getById=ia(function(a){return o.appendChild(a).id=u,!n.getElementsByName||!n.getElementsByName(u).length}),c.getById?(d.find.ID=function(a,b){if("undefined"!=typeof b.getElementById&&p){var c=b.getElementById(a);return c?[c]:[]}},d.filter.ID=function(a){var b=a.replace(ba,ca);return function(a){return a.getAttribute("id")===b}}):(delete d.find.ID,d.filter.ID=function(a){var b=a.replace(ba,ca);return function(a){var c="undefined"!=typeof a.getAttributeNode&&a.getAttributeNode("id");return c&&c.value===b}}),d.find.TAG=c.getElementsByTagName?function(a,b){return"undefined"!=typeof b.getElementsByTagName?b.getElementsByTagName(a):c.qsa?b.querySelectorAll(a):void 0}:function(a,b){var c,d=[],e=0,f=b.getElementsByTagName(a);if("*"===a){while(c=f[e++])1===c.nodeType&&d.push(c);return d}return f},d.find.CLASS=c.getElementsByClassName&&function(a,b){return"undefined"!=typeof b.getElementsByClassName&&p?b.getElementsByClassName(a):void 0},r=[],q=[],(c.qsa=Z.test(n.querySelectorAll))&&(ia(function(a){o.appendChild(a).innerHTML="",a.querySelectorAll("[msallowcapture^='']").length&&q.push("[*^$]="+L+"*(?:''|\"\")"),a.querySelectorAll("[selected]").length||q.push("\\["+L+"*(?:value|"+K+")"),a.querySelectorAll("[id~="+u+"-]").length||q.push("~="),a.querySelectorAll(":checked").length||q.push(":checked"),a.querySelectorAll("a#"+u+"+*").length||q.push(".#.+[+~]")}),ia(function(a){var b=n.createElement("input");b.setAttribute("type","hidden"),a.appendChild(b).setAttribute("name","D"),a.querySelectorAll("[name=d]").length&&q.push("name"+L+"*[*^$|!~]?="),a.querySelectorAll(":enabled").length||q.push(":enabled",":disabled"),a.querySelectorAll("*,:x"),q.push(",.*:")})),(c.matchesSelector=Z.test(s=o.matches||o.webkitMatchesSelector||o.mozMatchesSelector||o.oMatchesSelector||o.msMatchesSelector))&&ia(function(a){c.disconnectedMatch=s.call(a,"div"),s.call(a,"[s!='']:x"),r.push("!=",O)}),q=q.length&&new RegExp(q.join("|")),r=r.length&&new RegExp(r.join("|")),b=Z.test(o.compareDocumentPosition),t=b||Z.test(o.contains)?function(a,b){var c=9===a.nodeType?a.documentElement:a,d=b&&b.parentNode;return a===d||!(!d||1!==d.nodeType||!(c.contains?c.contains(d):a.compareDocumentPosition&&16&a.compareDocumentPosition(d)))}:function(a,b){if(b)while(b=b.parentNode)if(b===a)return!0;return!1},B=b?function(a,b){if(a===b)return l=!0,0;var d=!a.compareDocumentPosition-!b.compareDocumentPosition;return d?d:(d=(a.ownerDocument||a)===(b.ownerDocument||b)?a.compareDocumentPosition(b):1,1&d||!c.sortDetached&&b.compareDocumentPosition(a)===d?a===n||a.ownerDocument===v&&t(v,a)?-1:b===n||b.ownerDocument===v&&t(v,b)?1:k?J(k,a)-J(k,b):0:4&d?-1:1)}:function(a,b){if(a===b)return l=!0,0;var c,d=0,e=a.parentNode,f=b.parentNode,g=[a],h=[b];if(!e||!f)return a===n?-1:b===n?1:e?-1:f?1:k?J(k,a)-J(k,b):0;if(e===f)return ka(a,b);c=a;while(c=c.parentNode)g.unshift(c);c=b;while(c=c.parentNode)h.unshift(c);while(g[d]===h[d])d++;return d?ka(g[d],h[d]):g[d]===v?-1:h[d]===v?1:0},n):n},fa.matches=function(a,b){return fa(a,null,null,b)},fa.matchesSelector=function(a,b){if((a.ownerDocument||a)!==n&&m(a),b=b.replace(T,"='$1']"),c.matchesSelector&&p&&!A[b+" "]&&(!r||!r.test(b))&&(!q||!q.test(b)))try{var d=s.call(a,b);if(d||c.disconnectedMatch||a.document&&11!==a.document.nodeType)return d}catch(e){}return fa(b,n,null,[a]).length>0},fa.contains=function(a,b){return(a.ownerDocument||a)!==n&&m(a),t(a,b)},fa.attr=function(a,b){(a.ownerDocument||a)!==n&&m(a);var e=d.attrHandle[b.toLowerCase()],f=e&&D.call(d.attrHandle,b.toLowerCase())?e(a,b,!p):void 0;return void 0!==f?f:c.attributes||!p?a.getAttribute(b):(f=a.getAttributeNode(b))&&f.specified?f.value:null},fa.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)},fa.uniqueSort=function(a){var b,d=[],e=0,f=0;if(l=!c.detectDuplicates,k=!c.sortStable&&a.slice(0),a.sort(B),l){while(b=a[f++])b===a[f]&&(e=d.push(f));while(e--)a.splice(d[e],1)}return k=null,a},e=fa.getText=function(a){var b,c="",d=0,f=a.nodeType;if(f){if(1===f||9===f||11===f){if("string"==typeof a.textContent)return a.textContent;for(a=a.firstChild;a;a=a.nextSibling)c+=e(a)}else if(3===f||4===f)return a.nodeValue}else while(b=a[d++])c+=e(b);return c},d=fa.selectors={cacheLength:50,createPseudo:ha,match:W,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(a){return a[1]=a[1].replace(ba,ca),a[3]=(a[3]||a[4]||a[5]||"").replace(ba,ca),"~="===a[2]&&(a[3]=" "+a[3]+" "),a.slice(0,4)},CHILD:function(a){return a[1]=a[1].toLowerCase(),"nth"===a[1].slice(0,3)?(a[3]||fa.error(a[0]),a[4]=+(a[4]?a[5]+(a[6]||1):2*("even"===a[3]||"odd"===a[3])),a[5]=+(a[7]+a[8]||"odd"===a[3])):a[3]&&fa.error(a[0]),a},PSEUDO:function(a){var b,c=!a[6]&&a[2];return W.CHILD.test(a[0])?null:(a[3]?a[2]=a[4]||a[5]||"":c&&U.test(c)&&(b=g(c,!0))&&(b=c.indexOf(")",c.length-b)-c.length)&&(a[0]=a[0].slice(0,b),a[2]=c.slice(0,b)),a.slice(0,3))}},filter:{TAG:function(a){var b=a.replace(ba,ca).toLowerCase();return"*"===a?function(){return!0}:function(a){return a.nodeName&&a.nodeName.toLowerCase()===b}},CLASS:function(a){var b=y[a+" "];return b||(b=new RegExp("(^|"+L+")"+a+"("+L+"|$)"))&&y(a,function(a){return b.test("string"==typeof a.className&&a.className||"undefined"!=typeof a.getAttribute&&a.getAttribute("class")||"")})},ATTR:function(a,b,c){return function(d){var e=fa.attr(d,a);return null==e?"!="===b:b?(e+="","="===b?e===c:"!="===b?e!==c:"^="===b?c&&0===e.indexOf(c):"*="===b?c&&e.indexOf(c)>-1:"$="===b?c&&e.slice(-c.length)===c:"~="===b?(" "+e.replace(P," ")+" ").indexOf(c)>-1:"|="===b?e===c||e.slice(0,c.length+1)===c+"-":!1):!0}},CHILD:function(a,b,c,d,e){var f="nth"!==a.slice(0,3),g="last"!==a.slice(-4),h="of-type"===b;return 1===d&&0===e?function(a){return!!a.parentNode}:function(b,c,i){var j,k,l,m,n,o,p=f!==g?"nextSibling":"previousSibling",q=b.parentNode,r=h&&b.nodeName.toLowerCase(),s=!i&&!h,t=!1;if(q){if(f){while(p){m=b;while(m=m[p])if(h?m.nodeName.toLowerCase()===r:1===m.nodeType)return!1;o=p="only"===a&&!o&&"nextSibling"}return!0}if(o=[g?q.firstChild:q.lastChild],g&&s){m=q,l=m[u]||(m[u]={}),k=l[m.uniqueID]||(l[m.uniqueID]={}),j=k[a]||[],n=j[0]===w&&j[1],t=n&&j[2],m=n&&q.childNodes[n];while(m=++n&&m&&m[p]||(t=n=0)||o.pop())if(1===m.nodeType&&++t&&m===b){k[a]=[w,n,t];break}}else if(s&&(m=b,l=m[u]||(m[u]={}),k=l[m.uniqueID]||(l[m.uniqueID]={}),j=k[a]||[],n=j[0]===w&&j[1],t=n),t===!1)while(m=++n&&m&&m[p]||(t=n=0)||o.pop())if((h?m.nodeName.toLowerCase()===r:1===m.nodeType)&&++t&&(s&&(l=m[u]||(m[u]={}),k=l[m.uniqueID]||(l[m.uniqueID]={}),k[a]=[w,t]),m===b))break;return t-=e,t===d||t%d===0&&t/d>=0}}},PSEUDO:function(a,b){var c,e=d.pseudos[a]||d.setFilters[a.toLowerCase()]||fa.error("unsupported pseudo: "+a);return e[u]?e(b):e.length>1?(c=[a,a,"",b],d.setFilters.hasOwnProperty(a.toLowerCase())?ha(function(a,c){var d,f=e(a,b),g=f.length;while(g--)d=J(a,f[g]),a[d]=!(c[d]=f[g])}):function(a){return e(a,0,c)}):e}},pseudos:{not:ha(function(a){var b=[],c=[],d=h(a.replace(Q,"$1"));return d[u]?ha(function(a,b,c,e){var f,g=d(a,null,e,[]),h=a.length;while(h--)(f=g[h])&&(a[h]=!(b[h]=f))}):function(a,e,f){return b[0]=a,d(b,null,f,c),b[0]=null,!c.pop()}}),has:ha(function(a){return function(b){return fa(a,b).length>0}}),contains:ha(function(a){return a=a.replace(ba,ca),function(b){return(b.textContent||b.innerText||e(b)).indexOf(a)>-1}}),lang:ha(function(a){return V.test(a||"")||fa.error("unsupported lang: "+a),a=a.replace(ba,ca).toLowerCase(),function(b){var c;do if(c=p?b.lang:b.getAttribute("xml:lang")||b.getAttribute("lang"))return c=c.toLowerCase(),c===a||0===c.indexOf(a+"-");while((b=b.parentNode)&&1===b.nodeType);return!1}}),target:function(b){var c=a.location&&a.location.hash;return c&&c.slice(1)===b.id},root:function(a){return a===o},focus:function(a){return a===n.activeElement&&(!n.hasFocus||n.hasFocus())&&!!(a.type||a.href||~a.tabIndex)},enabled:function(a){return a.disabled===!1},disabled:function(a){return a.disabled===!0},checked:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&!!a.checked||"option"===b&&!!a.selected},selected:function(a){return a.parentNode&&a.parentNode.selectedIndex,a.selected===!0},empty:function(a){for(a=a.firstChild;a;a=a.nextSibling)if(a.nodeType<6)return!1;return!0},parent:function(a){return!d.pseudos.empty(a)},header:function(a){return Y.test(a.nodeName)},input:function(a){return X.test(a.nodeName)},button:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&"button"===a.type||"button"===b},text:function(a){var b;return"input"===a.nodeName.toLowerCase()&&"text"===a.type&&(null==(b=a.getAttribute("type"))||"text"===b.toLowerCase())},first:na(function(){return[0]}),last:na(function(a,b){return[b-1]}),eq:na(function(a,b,c){return[0>c?c+b:c]}),even:na(function(a,b){for(var c=0;b>c;c+=2)a.push(c);return a}),odd:na(function(a,b){for(var c=1;b>c;c+=2)a.push(c);return a}),lt:na(function(a,b,c){for(var d=0>c?c+b:c;--d>=0;)a.push(d);return a}),gt:na(function(a,b,c){for(var d=0>c?c+b:c;++db;b++)d+=a[b].value;return d}function ra(a,b,c){var d=b.dir,e=c&&"parentNode"===d,f=x++;return b.first?function(b,c,f){while(b=b[d])if(1===b.nodeType||e)return a(b,c,f)}:function(b,c,g){var h,i,j,k=[w,f];if(g){while(b=b[d])if((1===b.nodeType||e)&&a(b,c,g))return!0}else while(b=b[d])if(1===b.nodeType||e){if(j=b[u]||(b[u]={}),i=j[b.uniqueID]||(j[b.uniqueID]={}),(h=i[d])&&h[0]===w&&h[1]===f)return k[2]=h[2];if(i[d]=k,k[2]=a(b,c,g))return!0}}}function sa(a){return a.length>1?function(b,c,d){var e=a.length;while(e--)if(!a[e](b,c,d))return!1;return!0}:a[0]}function ta(a,b,c){for(var d=0,e=b.length;e>d;d++)fa(a,b[d],c);return c}function ua(a,b,c,d,e){for(var f,g=[],h=0,i=a.length,j=null!=b;i>h;h++)(f=a[h])&&(c&&!c(f,d,e)||(g.push(f),j&&b.push(h)));return g}function va(a,b,c,d,e,f){return d&&!d[u]&&(d=va(d)),e&&!e[u]&&(e=va(e,f)),ha(function(f,g,h,i){var j,k,l,m=[],n=[],o=g.length,p=f||ta(b||"*",h.nodeType?[h]:h,[]),q=!a||!f&&b?p:ua(p,m,a,h,i),r=c?e||(f?a:o||d)?[]:g:q;if(c&&c(q,r,h,i),d){j=ua(r,n),d(j,[],h,i),k=j.length;while(k--)(l=j[k])&&(r[n[k]]=!(q[n[k]]=l))}if(f){if(e||a){if(e){j=[],k=r.length;while(k--)(l=r[k])&&j.push(q[k]=l);e(null,r=[],j,i)}k=r.length;while(k--)(l=r[k])&&(j=e?J(f,l):m[k])>-1&&(f[j]=!(g[j]=l))}}else r=ua(r===g?r.splice(o,r.length):r),e?e(null,g,r,i):H.apply(g,r)})}function wa(a){for(var b,c,e,f=a.length,g=d.relative[a[0].type],h=g||d.relative[" "],i=g?1:0,k=ra(function(a){return a===b},h,!0),l=ra(function(a){return J(b,a)>-1},h,!0),m=[function(a,c,d){var e=!g&&(d||c!==j)||((b=c).nodeType?k(a,c,d):l(a,c,d));return b=null,e}];f>i;i++)if(c=d.relative[a[i].type])m=[ra(sa(m),c)];else{if(c=d.filter[a[i].type].apply(null,a[i].matches),c[u]){for(e=++i;f>e;e++)if(d.relative[a[e].type])break;return va(i>1&&sa(m),i>1&&qa(a.slice(0,i-1).concat({value:" "===a[i-2].type?"*":""})).replace(Q,"$1"),c,e>i&&wa(a.slice(i,e)),f>e&&wa(a=a.slice(e)),f>e&&qa(a))}m.push(c)}return sa(m)}function xa(a,b){var c=b.length>0,e=a.length>0,f=function(f,g,h,i,k){var l,o,q,r=0,s="0",t=f&&[],u=[],v=j,x=f||e&&d.find.TAG("*",k),y=w+=null==v?1:Math.random()||.1,z=x.length;for(k&&(j=g===n||g||k);s!==z&&null!=(l=x[s]);s++){if(e&&l){o=0,g||l.ownerDocument===n||(m(l),h=!p);while(q=a[o++])if(q(l,g||n,h)){i.push(l);break}k&&(w=y)}c&&((l=!q&&l)&&r--,f&&t.push(l))}if(r+=s,c&&s!==r){o=0;while(q=b[o++])q(t,u,g,h);if(f){if(r>0)while(s--)t[s]||u[s]||(u[s]=F.call(i));u=ua(u)}H.apply(i,u),k&&!f&&u.length>0&&r+b.length>1&&fa.uniqueSort(i)}return k&&(w=y,j=v),t};return c?ha(f):f}return h=fa.compile=function(a,b){var c,d=[],e=[],f=A[a+" "];if(!f){b||(b=g(a)),c=b.length;while(c--)f=wa(b[c]),f[u]?d.push(f):e.push(f);f=A(a,xa(e,d)),f.selector=a}return f},i=fa.select=function(a,b,e,f){var i,j,k,l,m,n="function"==typeof a&&a,o=!f&&g(a=n.selector||a);if(e=e||[],1===o.length){if(j=o[0]=o[0].slice(0),j.length>2&&"ID"===(k=j[0]).type&&c.getById&&9===b.nodeType&&p&&d.relative[j[1].type]){if(b=(d.find.ID(k.matches[0].replace(ba,ca),b)||[])[0],!b)return e;n&&(b=b.parentNode),a=a.slice(j.shift().value.length)}i=W.needsContext.test(a)?0:j.length;while(i--){if(k=j[i],d.relative[l=k.type])break;if((m=d.find[l])&&(f=m(k.matches[0].replace(ba,ca),_.test(j[0].type)&&oa(b.parentNode)||b))){if(j.splice(i,1),a=f.length&&qa(j),!a)return H.apply(e,f),e;break}}}return(n||h(a,o))(f,b,!p,e,!b||_.test(a)&&oa(b.parentNode)||b),e},c.sortStable=u.split("").sort(B).join("")===u,c.detectDuplicates=!!l,m(),c.sortDetached=ia(function(a){return 1&a.compareDocumentPosition(n.createElement("div"))}),ia(function(a){return a.innerHTML="","#"===a.firstChild.getAttribute("href")})||ja("type|href|height|width",function(a,b,c){return c?void 0:a.getAttribute(b,"type"===b.toLowerCase()?1:2)}),c.attributes&&ia(function(a){return a.innerHTML="",a.firstChild.setAttribute("value",""),""===a.firstChild.getAttribute("value")})||ja("value",function(a,b,c){return c||"input"!==a.nodeName.toLowerCase()?void 0:a.defaultValue}),ia(function(a){return null==a.getAttribute("disabled")})||ja(K,function(a,b,c){var d;return c?void 0:a[b]===!0?b.toLowerCase():(d=a.getAttributeNode(b))&&d.specified?d.value:null}),fa}(a);n.find=t,n.expr=t.selectors,n.expr[":"]=n.expr.pseudos,n.uniqueSort=n.unique=t.uniqueSort,n.text=t.getText,n.isXMLDoc=t.isXML,n.contains=t.contains;var u=function(a,b,c){var d=[],e=void 0!==c;while((a=a[b])&&9!==a.nodeType)if(1===a.nodeType){if(e&&n(a).is(c))break;d.push(a)}return d},v=function(a,b){for(var c=[];a;a=a.nextSibling)1===a.nodeType&&a!==b&&c.push(a);return c},w=n.expr.match.needsContext,x=/^<([\w-]+)\s*\/?>(?:<\/\1>|)$/,y=/^.[^:#\[\.,]*$/;function z(a,b,c){if(n.isFunction(b))return n.grep(a,function(a,d){return!!b.call(a,d,a)!==c});if(b.nodeType)return n.grep(a,function(a){return a===b!==c});if("string"==typeof b){if(y.test(b))return n.filter(b,a,c);b=n.filter(b,a)}return n.grep(a,function(a){return n.inArray(a,b)>-1!==c})}n.filter=function(a,b,c){var d=b[0];return c&&(a=":not("+a+")"),1===b.length&&1===d.nodeType?n.find.matchesSelector(d,a)?[d]:[]:n.find.matches(a,n.grep(b,function(a){return 1===a.nodeType}))},n.fn.extend({find:function(a){var b,c=[],d=this,e=d.length;if("string"!=typeof a)return this.pushStack(n(a).filter(function(){for(b=0;e>b;b++)if(n.contains(d[b],this))return!0}));for(b=0;e>b;b++)n.find(a,d[b],c);return c=this.pushStack(e>1?n.unique(c):c),c.selector=this.selector?this.selector+" "+a:a,c},filter:function(a){return this.pushStack(z(this,a||[],!1))},not:function(a){return this.pushStack(z(this,a||[],!0))},is:function(a){return!!z(this,"string"==typeof a&&w.test(a)?n(a):a||[],!1).length}});var A,B=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,C=n.fn.init=function(a,b,c){var e,f;if(!a)return this;if(c=c||A,"string"==typeof a){if(e="<"===a.charAt(0)&&">"===a.charAt(a.length-1)&&a.length>=3?[null,a,null]:B.exec(a),!e||!e[1]&&b)return!b||b.jquery?(b||c).find(a):this.constructor(b).find(a);if(e[1]){if(b=b instanceof n?b[0]:b,n.merge(this,n.parseHTML(e[1],b&&b.nodeType?b.ownerDocument||b:d,!0)),x.test(e[1])&&n.isPlainObject(b))for(e in b)n.isFunction(this[e])?this[e](b[e]):this.attr(e,b[e]);return this}if(f=d.getElementById(e[2]),f&&f.parentNode){if(f.id!==e[2])return A.find(a);this.length=1,this[0]=f}return this.context=d,this.selector=a,this}return a.nodeType?(this.context=this[0]=a,this.length=1,this):n.isFunction(a)?"undefined"!=typeof c.ready?c.ready(a):a(n):(void 0!==a.selector&&(this.selector=a.selector,this.context=a.context),n.makeArray(a,this))};C.prototype=n.fn,A=n(d);var D=/^(?:parents|prev(?:Until|All))/,E={children:!0,contents:!0,next:!0,prev:!0};n.fn.extend({has:function(a){var b,c=n(a,this),d=c.length;return this.filter(function(){for(b=0;d>b;b++)if(n.contains(this,c[b]))return!0})},closest:function(a,b){for(var c,d=0,e=this.length,f=[],g=w.test(a)||"string"!=typeof a?n(a,b||this.context):0;e>d;d++)for(c=this[d];c&&c!==b;c=c.parentNode)if(c.nodeType<11&&(g?g.index(c)>-1:1===c.nodeType&&n.find.matchesSelector(c,a))){f.push(c);break}return this.pushStack(f.length>1?n.uniqueSort(f):f)},index:function(a){return a?"string"==typeof a?n.inArray(this[0],n(a)):n.inArray(a.jquery?a[0]:a,this):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(a,b){return this.pushStack(n.uniqueSort(n.merge(this.get(),n(a,b))))},addBack:function(a){return this.add(null==a?this.prevObject:this.prevObject.filter(a))}});function F(a,b){do a=a[b];while(a&&1!==a.nodeType);return a}n.each({parent:function(a){var b=a.parentNode;return b&&11!==b.nodeType?b:null},parents:function(a){return u(a,"parentNode")},parentsUntil:function(a,b,c){return u(a,"parentNode",c)},next:function(a){return F(a,"nextSibling")},prev:function(a){return F(a,"previousSibling")},nextAll:function(a){return u(a,"nextSibling")},prevAll:function(a){return u(a,"previousSibling")},nextUntil:function(a,b,c){return u(a,"nextSibling",c)},prevUntil:function(a,b,c){return u(a,"previousSibling",c)},siblings:function(a){return v((a.parentNode||{}).firstChild,a)},children:function(a){return v(a.firstChild)},contents:function(a){return n.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:n.merge([],a.childNodes)}},function(a,b){n.fn[a]=function(c,d){var e=n.map(this,b,c);return"Until"!==a.slice(-5)&&(d=c),d&&"string"==typeof d&&(e=n.filter(d,e)),this.length>1&&(E[a]||(e=n.uniqueSort(e)),D.test(a)&&(e=e.reverse())),this.pushStack(e)}});var G=/\S+/g;function H(a){var b={};return n.each(a.match(G)||[],function(a,c){b[c]=!0}),b}n.Callbacks=function(a){a="string"==typeof a?H(a):n.extend({},a);var b,c,d,e,f=[],g=[],h=-1,i=function(){for(e=a.once,d=b=!0;g.length;h=-1){c=g.shift();while(++h-1)f.splice(c,1),h>=c&&h--}),this},has:function(a){return a?n.inArray(a,f)>-1:f.length>0},empty:function(){return f&&(f=[]),this},disable:function(){return e=g=[],f=c="",this},disabled:function(){return!f},lock:function(){return e=!0,c||j.disable(),this},locked:function(){return!!e},fireWith:function(a,c){return e||(c=c||[],c=[a,c.slice?c.slice():c],g.push(c),b||i()),this},fire:function(){return j.fireWith(this,arguments),this},fired:function(){return!!d}};return j},n.extend({Deferred:function(a){var b=[["resolve","done",n.Callbacks("once memory"),"resolved"],["reject","fail",n.Callbacks("once memory"),"rejected"],["notify","progress",n.Callbacks("memory")]],c="pending",d={state:function(){return c},always:function(){return e.done(arguments).fail(arguments),this},then:function(){var a=arguments;return n.Deferred(function(c){n.each(b,function(b,f){var g=n.isFunction(a[b])&&a[b];e[f[1]](function(){var a=g&&g.apply(this,arguments);a&&n.isFunction(a.promise)?a.promise().progress(c.notify).done(c.resolve).fail(c.reject):c[f[0]+"With"](this===d?c.promise():this,g?[a]:arguments)})}),a=null}).promise()},promise:function(a){return null!=a?n.extend(a,d):d}},e={};return d.pipe=d.then,n.each(b,function(a,f){var g=f[2],h=f[3];d[f[1]]=g.add,h&&g.add(function(){c=h},b[1^a][2].disable,b[2][2].lock),e[f[0]]=function(){return e[f[0]+"With"](this===e?d:this,arguments),this},e[f[0]+"With"]=g.fireWith}),d.promise(e),a&&a.call(e,e),e},when:function(a){var b=0,c=e.call(arguments),d=c.length,f=1!==d||a&&n.isFunction(a.promise)?d:0,g=1===f?a:n.Deferred(),h=function(a,b,c){return function(d){b[a]=this,c[a]=arguments.length>1?e.call(arguments):d,c===i?g.notifyWith(b,c):--f||g.resolveWith(b,c)}},i,j,k;if(d>1)for(i=new Array(d),j=new Array(d),k=new Array(d);d>b;b++)c[b]&&n.isFunction(c[b].promise)?c[b].promise().progress(h(b,j,i)).done(h(b,k,c)).fail(g.reject):--f;return f||g.resolveWith(k,c),g.promise()}});var I;n.fn.ready=function(a){return n.ready.promise().done(a),this},n.extend({isReady:!1,readyWait:1,holdReady:function(a){a?n.readyWait++:n.ready(!0)},ready:function(a){(a===!0?--n.readyWait:n.isReady)||(n.isReady=!0,a!==!0&&--n.readyWait>0||(I.resolveWith(d,[n]),n.fn.triggerHandler&&(n(d).triggerHandler("ready"),n(d).off("ready"))))}});function J(){d.addEventListener?(d.removeEventListener("DOMContentLoaded",K),a.removeEventListener("load",K)):(d.detachEvent("onreadystatechange",K),a.detachEvent("onload",K))}function K(){(d.addEventListener||"load"===a.event.type||"complete"===d.readyState)&&(J(),n.ready())}n.ready.promise=function(b){if(!I)if(I=n.Deferred(),"complete"===d.readyState||"loading"!==d.readyState&&!d.documentElement.doScroll)a.setTimeout(n.ready);else if(d.addEventListener)d.addEventListener("DOMContentLoaded",K),a.addEventListener("load",K);else{d.attachEvent("onreadystatechange",K),a.attachEvent("onload",K);var c=!1;try{c=null==a.frameElement&&d.documentElement}catch(e){}c&&c.doScroll&&!function f(){if(!n.isReady){try{c.doScroll("left")}catch(b){return a.setTimeout(f,50)}J(),n.ready()}}()}return I.promise(b)},n.ready.promise();var L;for(L in n(l))break;l.ownFirst="0"===L,l.inlineBlockNeedsLayout=!1,n(function(){var a,b,c,e;c=d.getElementsByTagName("body")[0],c&&c.style&&(b=d.createElement("div"),e=d.createElement("div"),e.style.cssText="position:absolute;border:0;width:0;height:0;top:0;left:-9999px",c.appendChild(e).appendChild(b),"undefined"!=typeof b.style.zoom&&(b.style.cssText="display:inline;margin:0;border:0;padding:1px;width:1px;zoom:1",l.inlineBlockNeedsLayout=a=3===b.offsetWidth,a&&(c.style.zoom=1)),c.removeChild(e))}),function(){var a=d.createElement("div");l.deleteExpando=!0;try{delete a.test}catch(b){l.deleteExpando=!1}a=null}();var M=function(a){var b=n.noData[(a.nodeName+" ").toLowerCase()],c=+a.nodeType||1;return 1!==c&&9!==c?!1:!b||b!==!0&&a.getAttribute("classid")===b},N=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,O=/([A-Z])/g;function P(a,b,c){if(void 0===c&&1===a.nodeType){var d="data-"+b.replace(O,"-$1").toLowerCase();if(c=a.getAttribute(d),"string"==typeof c){try{c="true"===c?!0:"false"===c?!1:"null"===c?null:+c+""===c?+c:N.test(c)?n.parseJSON(c):c}catch(e){}n.data(a,b,c)}else c=void 0; -}return c}function Q(a){var b;for(b in a)if(("data"!==b||!n.isEmptyObject(a[b]))&&"toJSON"!==b)return!1;return!0}function R(a,b,d,e){if(M(a)){var f,g,h=n.expando,i=a.nodeType,j=i?n.cache:a,k=i?a[h]:a[h]&&h;if(k&&j[k]&&(e||j[k].data)||void 0!==d||"string"!=typeof b)return k||(k=i?a[h]=c.pop()||n.guid++:h),j[k]||(j[k]=i?{}:{toJSON:n.noop}),"object"!=typeof b&&"function"!=typeof b||(e?j[k]=n.extend(j[k],b):j[k].data=n.extend(j[k].data,b)),g=j[k],e||(g.data||(g.data={}),g=g.data),void 0!==d&&(g[n.camelCase(b)]=d),"string"==typeof b?(f=g[b],null==f&&(f=g[n.camelCase(b)])):f=g,f}}function S(a,b,c){if(M(a)){var d,e,f=a.nodeType,g=f?n.cache:a,h=f?a[n.expando]:n.expando;if(g[h]){if(b&&(d=c?g[h]:g[h].data)){n.isArray(b)?b=b.concat(n.map(b,n.camelCase)):b in d?b=[b]:(b=n.camelCase(b),b=b in d?[b]:b.split(" ")),e=b.length;while(e--)delete d[b[e]];if(c?!Q(d):!n.isEmptyObject(d))return}(c||(delete g[h].data,Q(g[h])))&&(f?n.cleanData([a],!0):l.deleteExpando||g!=g.window?delete g[h]:g[h]=void 0)}}}n.extend({cache:{},noData:{"applet ":!0,"embed ":!0,"object ":"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"},hasData:function(a){return a=a.nodeType?n.cache[a[n.expando]]:a[n.expando],!!a&&!Q(a)},data:function(a,b,c){return R(a,b,c)},removeData:function(a,b){return S(a,b)},_data:function(a,b,c){return R(a,b,c,!0)},_removeData:function(a,b){return S(a,b,!0)}}),n.fn.extend({data:function(a,b){var c,d,e,f=this[0],g=f&&f.attributes;if(void 0===a){if(this.length&&(e=n.data(f),1===f.nodeType&&!n._data(f,"parsedAttrs"))){c=g.length;while(c--)g[c]&&(d=g[c].name,0===d.indexOf("data-")&&(d=n.camelCase(d.slice(5)),P(f,d,e[d])));n._data(f,"parsedAttrs",!0)}return e}return"object"==typeof a?this.each(function(){n.data(this,a)}):arguments.length>1?this.each(function(){n.data(this,a,b)}):f?P(f,a,n.data(f,a)):void 0},removeData:function(a){return this.each(function(){n.removeData(this,a)})}}),n.extend({queue:function(a,b,c){var d;return a?(b=(b||"fx")+"queue",d=n._data(a,b),c&&(!d||n.isArray(c)?d=n._data(a,b,n.makeArray(c)):d.push(c)),d||[]):void 0},dequeue:function(a,b){b=b||"fx";var c=n.queue(a,b),d=c.length,e=c.shift(),f=n._queueHooks(a,b),g=function(){n.dequeue(a,b)};"inprogress"===e&&(e=c.shift(),d--),e&&("fx"===b&&c.unshift("inprogress"),delete f.stop,e.call(a,g,f)),!d&&f&&f.empty.fire()},_queueHooks:function(a,b){var c=b+"queueHooks";return n._data(a,c)||n._data(a,c,{empty:n.Callbacks("once memory").add(function(){n._removeData(a,b+"queue"),n._removeData(a,c)})})}}),n.fn.extend({queue:function(a,b){var c=2;return"string"!=typeof a&&(b=a,a="fx",c--),arguments.lengthh;h++)b(a[h],c,g?d:d.call(a[h],h,b(a[h],c)));return e?a:j?b.call(a):i?b(a[0],c):f},Z=/^(?:checkbox|radio)$/i,$=/<([\w:-]+)/,_=/^$|\/(?:java|ecma)script/i,aa=/^\s+/,ba="abbr|article|aside|audio|bdi|canvas|data|datalist|details|dialog|figcaption|figure|footer|header|hgroup|main|mark|meter|nav|output|picture|progress|section|summary|template|time|video";function ca(a){var b=ba.split("|"),c=a.createDocumentFragment();if(c.createElement)while(b.length)c.createElement(b.pop());return c}!function(){var a=d.createElement("div"),b=d.createDocumentFragment(),c=d.createElement("input");a.innerHTML="
a",l.leadingWhitespace=3===a.firstChild.nodeType,l.tbody=!a.getElementsByTagName("tbody").length,l.htmlSerialize=!!a.getElementsByTagName("link").length,l.html5Clone="<:nav>"!==d.createElement("nav").cloneNode(!0).outerHTML,c.type="checkbox",c.checked=!0,b.appendChild(c),l.appendChecked=c.checked,a.innerHTML="",l.noCloneChecked=!!a.cloneNode(!0).lastChild.defaultValue,b.appendChild(a),c=d.createElement("input"),c.setAttribute("type","radio"),c.setAttribute("checked","checked"),c.setAttribute("name","t"),a.appendChild(c),l.checkClone=a.cloneNode(!0).cloneNode(!0).lastChild.checked,l.noCloneEvent=!!a.addEventListener,a[n.expando]=1,l.attributes=!a.getAttribute(n.expando)}();var da={option:[1,""],legend:[1,"
","
"],area:[1,"",""],param:[1,"",""],thead:[1,"","
"],tr:[2,"","
"],col:[2,"","
"],td:[3,"","
"],_default:l.htmlSerialize?[0,"",""]:[1,"X
","
"]};da.optgroup=da.option,da.tbody=da.tfoot=da.colgroup=da.caption=da.thead,da.th=da.td;function ea(a,b){var c,d,e=0,f="undefined"!=typeof a.getElementsByTagName?a.getElementsByTagName(b||"*"):"undefined"!=typeof a.querySelectorAll?a.querySelectorAll(b||"*"):void 0;if(!f)for(f=[],c=a.childNodes||a;null!=(d=c[e]);e++)!b||n.nodeName(d,b)?f.push(d):n.merge(f,ea(d,b));return void 0===b||b&&n.nodeName(a,b)?n.merge([a],f):f}function fa(a,b){for(var c,d=0;null!=(c=a[d]);d++)n._data(c,"globalEval",!b||n._data(b[d],"globalEval"))}var ga=/<|&#?\w+;/,ha=/r;r++)if(g=a[r],g||0===g)if("object"===n.type(g))n.merge(q,g.nodeType?[g]:g);else if(ga.test(g)){i=i||p.appendChild(b.createElement("div")),j=($.exec(g)||["",""])[1].toLowerCase(),m=da[j]||da._default,i.innerHTML=m[1]+n.htmlPrefilter(g)+m[2],f=m[0];while(f--)i=i.lastChild;if(!l.leadingWhitespace&&aa.test(g)&&q.push(b.createTextNode(aa.exec(g)[0])),!l.tbody){g="table"!==j||ha.test(g)?""!==m[1]||ha.test(g)?0:i:i.firstChild,f=g&&g.childNodes.length;while(f--)n.nodeName(k=g.childNodes[f],"tbody")&&!k.childNodes.length&&g.removeChild(k)}n.merge(q,i.childNodes),i.textContent="";while(i.firstChild)i.removeChild(i.firstChild);i=p.lastChild}else q.push(b.createTextNode(g));i&&p.removeChild(i),l.appendChecked||n.grep(ea(q,"input"),ia),r=0;while(g=q[r++])if(d&&n.inArray(g,d)>-1)e&&e.push(g);else if(h=n.contains(g.ownerDocument,g),i=ea(p.appendChild(g),"script"),h&&fa(i),c){f=0;while(g=i[f++])_.test(g.type||"")&&c.push(g)}return i=null,p}!function(){var b,c,e=d.createElement("div");for(b in{submit:!0,change:!0,focusin:!0})c="on"+b,(l[b]=c in a)||(e.setAttribute(c,"t"),l[b]=e.attributes[c].expando===!1);e=null}();var ka=/^(?:input|select|textarea)$/i,la=/^key/,ma=/^(?:mouse|pointer|contextmenu|drag|drop)|click/,na=/^(?:focusinfocus|focusoutblur)$/,oa=/^([^.]*)(?:\.(.+)|)/;function pa(){return!0}function qa(){return!1}function ra(){try{return d.activeElement}catch(a){}}function sa(a,b,c,d,e,f){var g,h;if("object"==typeof b){"string"!=typeof c&&(d=d||c,c=void 0);for(h in b)sa(a,h,c,d,b[h],f);return a}if(null==d&&null==e?(e=c,d=c=void 0):null==e&&("string"==typeof c?(e=d,d=void 0):(e=d,d=c,c=void 0)),e===!1)e=qa;else if(!e)return a;return 1===f&&(g=e,e=function(a){return n().off(a),g.apply(this,arguments)},e.guid=g.guid||(g.guid=n.guid++)),a.each(function(){n.event.add(this,b,e,d,c)})}n.event={global:{},add:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,o,p,q,r=n._data(a);if(r){c.handler&&(i=c,c=i.handler,e=i.selector),c.guid||(c.guid=n.guid++),(g=r.events)||(g=r.events={}),(k=r.handle)||(k=r.handle=function(a){return"undefined"==typeof n||a&&n.event.triggered===a.type?void 0:n.event.dispatch.apply(k.elem,arguments)},k.elem=a),b=(b||"").match(G)||[""],h=b.length;while(h--)f=oa.exec(b[h])||[],o=q=f[1],p=(f[2]||"").split(".").sort(),o&&(j=n.event.special[o]||{},o=(e?j.delegateType:j.bindType)||o,j=n.event.special[o]||{},l=n.extend({type:o,origType:q,data:d,handler:c,guid:c.guid,selector:e,needsContext:e&&n.expr.match.needsContext.test(e),namespace:p.join(".")},i),(m=g[o])||(m=g[o]=[],m.delegateCount=0,j.setup&&j.setup.call(a,d,p,k)!==!1||(a.addEventListener?a.addEventListener(o,k,!1):a.attachEvent&&a.attachEvent("on"+o,k))),j.add&&(j.add.call(a,l),l.handler.guid||(l.handler.guid=c.guid)),e?m.splice(m.delegateCount++,0,l):m.push(l),n.event.global[o]=!0);a=null}},remove:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,o,p,q,r=n.hasData(a)&&n._data(a);if(r&&(k=r.events)){b=(b||"").match(G)||[""],j=b.length;while(j--)if(h=oa.exec(b[j])||[],o=q=h[1],p=(h[2]||"").split(".").sort(),o){l=n.event.special[o]||{},o=(d?l.delegateType:l.bindType)||o,m=k[o]||[],h=h[2]&&new RegExp("(^|\\.)"+p.join("\\.(?:.*\\.|)")+"(\\.|$)"),i=f=m.length;while(f--)g=m[f],!e&&q!==g.origType||c&&c.guid!==g.guid||h&&!h.test(g.namespace)||d&&d!==g.selector&&("**"!==d||!g.selector)||(m.splice(f,1),g.selector&&m.delegateCount--,l.remove&&l.remove.call(a,g));i&&!m.length&&(l.teardown&&l.teardown.call(a,p,r.handle)!==!1||n.removeEvent(a,o,r.handle),delete k[o])}else for(o in k)n.event.remove(a,o+b[j],c,d,!0);n.isEmptyObject(k)&&(delete r.handle,n._removeData(a,"events"))}},trigger:function(b,c,e,f){var g,h,i,j,l,m,o,p=[e||d],q=k.call(b,"type")?b.type:b,r=k.call(b,"namespace")?b.namespace.split("."):[];if(i=m=e=e||d,3!==e.nodeType&&8!==e.nodeType&&!na.test(q+n.event.triggered)&&(q.indexOf(".")>-1&&(r=q.split("."),q=r.shift(),r.sort()),h=q.indexOf(":")<0&&"on"+q,b=b[n.expando]?b:new n.Event(q,"object"==typeof b&&b),b.isTrigger=f?2:3,b.namespace=r.join("."),b.rnamespace=b.namespace?new RegExp("(^|\\.)"+r.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,b.result=void 0,b.target||(b.target=e),c=null==c?[b]:n.makeArray(c,[b]),l=n.event.special[q]||{},f||!l.trigger||l.trigger.apply(e,c)!==!1)){if(!f&&!l.noBubble&&!n.isWindow(e)){for(j=l.delegateType||q,na.test(j+q)||(i=i.parentNode);i;i=i.parentNode)p.push(i),m=i;m===(e.ownerDocument||d)&&p.push(m.defaultView||m.parentWindow||a)}o=0;while((i=p[o++])&&!b.isPropagationStopped())b.type=o>1?j:l.bindType||q,g=(n._data(i,"events")||{})[b.type]&&n._data(i,"handle"),g&&g.apply(i,c),g=h&&i[h],g&&g.apply&&M(i)&&(b.result=g.apply(i,c),b.result===!1&&b.preventDefault());if(b.type=q,!f&&!b.isDefaultPrevented()&&(!l._default||l._default.apply(p.pop(),c)===!1)&&M(e)&&h&&e[q]&&!n.isWindow(e)){m=e[h],m&&(e[h]=null),n.event.triggered=q;try{e[q]()}catch(s){}n.event.triggered=void 0,m&&(e[h]=m)}return b.result}},dispatch:function(a){a=n.event.fix(a);var b,c,d,f,g,h=[],i=e.call(arguments),j=(n._data(this,"events")||{})[a.type]||[],k=n.event.special[a.type]||{};if(i[0]=a,a.delegateTarget=this,!k.preDispatch||k.preDispatch.call(this,a)!==!1){h=n.event.handlers.call(this,a,j),b=0;while((f=h[b++])&&!a.isPropagationStopped()){a.currentTarget=f.elem,c=0;while((g=f.handlers[c++])&&!a.isImmediatePropagationStopped())a.rnamespace&&!a.rnamespace.test(g.namespace)||(a.handleObj=g,a.data=g.data,d=((n.event.special[g.origType]||{}).handle||g.handler).apply(f.elem,i),void 0!==d&&(a.result=d)===!1&&(a.preventDefault(),a.stopPropagation()))}return k.postDispatch&&k.postDispatch.call(this,a),a.result}},handlers:function(a,b){var c,d,e,f,g=[],h=b.delegateCount,i=a.target;if(h&&i.nodeType&&("click"!==a.type||isNaN(a.button)||a.button<1))for(;i!=this;i=i.parentNode||this)if(1===i.nodeType&&(i.disabled!==!0||"click"!==a.type)){for(d=[],c=0;h>c;c++)f=b[c],e=f.selector+" ",void 0===d[e]&&(d[e]=f.needsContext?n(e,this).index(i)>-1:n.find(e,this,null,[i]).length),d[e]&&d.push(f);d.length&&g.push({elem:i,handlers:d})}return h]","i"),va=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:-]+)[^>]*)\/>/gi,wa=/\s*$/g,Aa=ca(d),Ba=Aa.appendChild(d.createElement("div"));function Ca(a,b){return n.nodeName(a,"table")&&n.nodeName(11!==b.nodeType?b:b.firstChild,"tr")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function Da(a){return a.type=(null!==n.find.attr(a,"type"))+"/"+a.type,a}function Ea(a){var b=ya.exec(a.type);return b?a.type=b[1]:a.removeAttribute("type"),a}function Fa(a,b){if(1===b.nodeType&&n.hasData(a)){var c,d,e,f=n._data(a),g=n._data(b,f),h=f.events;if(h){delete g.handle,g.events={};for(c in h)for(d=0,e=h[c].length;e>d;d++)n.event.add(b,c,h[c][d])}g.data&&(g.data=n.extend({},g.data))}}function Ga(a,b){var c,d,e;if(1===b.nodeType){if(c=b.nodeName.toLowerCase(),!l.noCloneEvent&&b[n.expando]){e=n._data(b);for(d in e.events)n.removeEvent(b,d,e.handle);b.removeAttribute(n.expando)}"script"===c&&b.text!==a.text?(Da(b).text=a.text,Ea(b)):"object"===c?(b.parentNode&&(b.outerHTML=a.outerHTML),l.html5Clone&&a.innerHTML&&!n.trim(b.innerHTML)&&(b.innerHTML=a.innerHTML)):"input"===c&&Z.test(a.type)?(b.defaultChecked=b.checked=a.checked,b.value!==a.value&&(b.value=a.value)):"option"===c?b.defaultSelected=b.selected=a.defaultSelected:"input"!==c&&"textarea"!==c||(b.defaultValue=a.defaultValue)}}function Ha(a,b,c,d){b=f.apply([],b);var e,g,h,i,j,k,m=0,o=a.length,p=o-1,q=b[0],r=n.isFunction(q);if(r||o>1&&"string"==typeof q&&!l.checkClone&&xa.test(q))return a.each(function(e){var f=a.eq(e);r&&(b[0]=q.call(this,e,f.html())),Ha(f,b,c,d)});if(o&&(k=ja(b,a[0].ownerDocument,!1,a,d),e=k.firstChild,1===k.childNodes.length&&(k=e),e||d)){for(i=n.map(ea(k,"script"),Da),h=i.length;o>m;m++)g=k,m!==p&&(g=n.clone(g,!0,!0),h&&n.merge(i,ea(g,"script"))),c.call(a[m],g,m);if(h)for(j=i[i.length-1].ownerDocument,n.map(i,Ea),m=0;h>m;m++)g=i[m],_.test(g.type||"")&&!n._data(g,"globalEval")&&n.contains(j,g)&&(g.src?n._evalUrl&&n._evalUrl(g.src):n.globalEval((g.text||g.textContent||g.innerHTML||"").replace(za,"")));k=e=null}return a}function Ia(a,b,c){for(var d,e=b?n.filter(b,a):a,f=0;null!=(d=e[f]);f++)c||1!==d.nodeType||n.cleanData(ea(d)),d.parentNode&&(c&&n.contains(d.ownerDocument,d)&&fa(ea(d,"script")),d.parentNode.removeChild(d));return a}n.extend({htmlPrefilter:function(a){return a.replace(va,"<$1>")},clone:function(a,b,c){var d,e,f,g,h,i=n.contains(a.ownerDocument,a);if(l.html5Clone||n.isXMLDoc(a)||!ua.test("<"+a.nodeName+">")?f=a.cloneNode(!0):(Ba.innerHTML=a.outerHTML,Ba.removeChild(f=Ba.firstChild)),!(l.noCloneEvent&&l.noCloneChecked||1!==a.nodeType&&11!==a.nodeType||n.isXMLDoc(a)))for(d=ea(f),h=ea(a),g=0;null!=(e=h[g]);++g)d[g]&&Ga(e,d[g]);if(b)if(c)for(h=h||ea(a),d=d||ea(f),g=0;null!=(e=h[g]);g++)Fa(e,d[g]);else Fa(a,f);return d=ea(f,"script"),d.length>0&&fa(d,!i&&ea(a,"script")),d=h=e=null,f},cleanData:function(a,b){for(var d,e,f,g,h=0,i=n.expando,j=n.cache,k=l.attributes,m=n.event.special;null!=(d=a[h]);h++)if((b||M(d))&&(f=d[i],g=f&&j[f])){if(g.events)for(e in g.events)m[e]?n.event.remove(d,e):n.removeEvent(d,e,g.handle);j[f]&&(delete j[f],k||"undefined"==typeof d.removeAttribute?d[i]=void 0:d.removeAttribute(i),c.push(f))}}}),n.fn.extend({domManip:Ha,detach:function(a){return Ia(this,a,!0)},remove:function(a){return Ia(this,a)},text:function(a){return Y(this,function(a){return void 0===a?n.text(this):this.empty().append((this[0]&&this[0].ownerDocument||d).createTextNode(a))},null,a,arguments.length)},append:function(){return Ha(this,arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=Ca(this,a);b.appendChild(a)}})},prepend:function(){return Ha(this,arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=Ca(this,a);b.insertBefore(a,b.firstChild)}})},before:function(){return Ha(this,arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this)})},after:function(){return Ha(this,arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this.nextSibling)})},empty:function(){for(var a,b=0;null!=(a=this[b]);b++){1===a.nodeType&&n.cleanData(ea(a,!1));while(a.firstChild)a.removeChild(a.firstChild);a.options&&n.nodeName(a,"select")&&(a.options.length=0)}return this},clone:function(a,b){return a=null==a?!1:a,b=null==b?a:b,this.map(function(){return n.clone(this,a,b)})},html:function(a){return Y(this,function(a){var b=this[0]||{},c=0,d=this.length;if(void 0===a)return 1===b.nodeType?b.innerHTML.replace(ta,""):void 0;if("string"==typeof a&&!wa.test(a)&&(l.htmlSerialize||!ua.test(a))&&(l.leadingWhitespace||!aa.test(a))&&!da[($.exec(a)||["",""])[1].toLowerCase()]){a=n.htmlPrefilter(a);try{for(;d>c;c++)b=this[c]||{},1===b.nodeType&&(n.cleanData(ea(b,!1)),b.innerHTML=a);b=0}catch(e){}}b&&this.empty().append(a)},null,a,arguments.length)},replaceWith:function(){var a=[];return Ha(this,arguments,function(b){var c=this.parentNode;n.inArray(this,a)<0&&(n.cleanData(ea(this)),c&&c.replaceChild(b,this))},a)}}),n.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){n.fn[a]=function(a){for(var c,d=0,e=[],f=n(a),h=f.length-1;h>=d;d++)c=d===h?this:this.clone(!0),n(f[d])[b](c),g.apply(e,c.get());return this.pushStack(e)}});var Ja,Ka={HTML:"block",BODY:"block"};function La(a,b){var c=n(b.createElement(a)).appendTo(b.body),d=n.css(c[0],"display");return c.detach(),d}function Ma(a){var b=d,c=Ka[a];return c||(c=La(a,b),"none"!==c&&c||(Ja=(Ja||n("