Petri Hintukainen pushed to branch master at VideoLAN / libaacs
Commits:
e954f05f by John Doe at 2020-06-20T15:20:12+03:00
Fix mkb_type() return value
- - - - -
aa3141b4 by John Doe at 2020-06-20T23:53:47+03:00
Cache MEDIA KEY when it's loaded from config file
Libbdplus needs MK so it should be cached even when it's loaded from a
config file.
- - - - -
3 changed files:
- src/libaacs/aacs.c
- src/libaacs/mkb.c
- src/libaacs/mkb.h
Changes:
=====================================
src/libaacs/aacs.c
=====================================
@@ -764,6 +764,7 @@ static void _find_config_entry(AACS *aacs, title_entry_list
*ce,
if (ce->entry.mek) {
hexstring_to_hex_array(mk, 16, ce->entry.mek);
+ memcpy(aacs->mk, mk, 16);
BD_DEBUG(DBG_AACS, "Found media key for %s: %s\n",
str_print_hex(str2, ce->entry.discid, 20), str_print_hex(str,
mk, 16));
=====================================
src/libaacs/mkb.c
=====================================
@@ -110,7 +110,7 @@ size_t mkb_data_size(MKB *mkb)
}
-uint8_t mkb_type(MKB *mkb)
+uint32_t mkb_type(MKB *mkb)
{
const uint8_t *rec = mkb_type_and_version_record(mkb);
=====================================
src/libaacs/mkb.h
=====================================
@@ -36,7 +36,7 @@ BD_PRIVATE const uint8_t *mkb_data(MKB *mkb);
BD_PRIVATE size_t mkb_data_size(MKB *mkb);
// returns type
-BD_PRIVATE uint8_t mkb_type(MKB *mkb);
+BD_PRIVATE uint32_t mkb_type(MKB *mkb);
// returns version
BD_PRIVATE uint32_t mkb_version(MKB *mkb);
// returns type and version record (required to verify signatures)
View it on GitLab:
https://code.videolan.org/videolan/libaacs/-/compare/2ed84a0bb4c23e1c2d0a0312be14a4775d0fd56c...aa3141b4965b9793ece3bde054abf304618faf70
--
View it on GitLab:
https://code.videolan.org/videolan/libaacs/-/compare/2ed84a0bb4c23e1c2d0a0312be14a4775d0fd56c...aa3141b4965b9793ece3bde054abf304618faf70
You're receiving this email because of your account on code.videolan.org.
_______________________________________________
libaacs-devel mailing list
libaacs-devel@videolan.org
https://mailman.videolan.org/listinfo/libaacs-devel
