From 7aeaceb420e40ca30bf514d85f1aee178e03de34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C3=ABl=20Carr=C3=A9?= Date: Wed, 16 Jan 2019 17:46:13 +0100 Subject: [PATCH] biss: fix help and validate EMM with table_id > 0x81 --- ebu/biss.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ebu/biss.h b/ebu/biss.h index 9f6366d..4f67ddc 100644 --- a/ebu/biss.h +++ b/ebu/biss.h @@ -43,9 +43,10 @@ extern "C" #endif /***************************************************************************** - * Conditional Access Table + * Entitlement Management Message Table *****************************************************************************/ #define BISSCA_EMM_TABLE_ID 0x81 +#define BISSCA_EMM_TABLE_ID_LAST 0x8f #define BISSCA_EMM_HEADER_SIZE PSI_HEADER_SIZE_SYNTAX1 #define BISSCA_EMM_CIPHER_RSA_2048_OAEP 0 @@ -188,7 +189,8 @@ static inline bool bissca_emm_validate(const uint8_t *p_emm) if (!psi_get_syntax(p_emm) || psi_get_section(p_emm) || psi_get_lastsection(p_emm) - || psi_get_tableid(p_emm) != BISSCA_EMM_TABLE_ID) + || psi_get_tableid(p_emm) < BISSCA_EMM_TABLE_ID + || psi_get_tableid(p_emm) > BISSCA_EMM_TABLE_ID_LAST) return false; if (i_section_size < BISSCA_EMM_HEADER_SIZE + 6