libaacs | branch: master | npzacs <npz...@gmail.com> | Tue Feb  9 12:30:34 2016 
+0200| [69e289a6206d8cd3b41926033a43e2354c12670c] | committer: npzacs

aacs_get_mk(): do not return garbage if calculation failed

> http://git.videolan.org/gitweb.cgi/libaacs.git/?a=commit;h=69e289a6206d8cd3b41926033a43e2354c12670c
---

 src/libaacs/aacs.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/libaacs/aacs.c b/src/libaacs/aacs.c
index ef97035..76fa6f6 100644
--- a/src/libaacs/aacs.c
+++ b/src/libaacs/aacs.c
@@ -1317,7 +1317,10 @@ const uint8_t *aacs_get_mk(AACS *aacs)
     if (!memcmp(aacs->mk, empty_key, sizeof(aacs->mk))) {
         config_file *cf = keydbcfg_config_load(NULL);
         if (cf) {
-            _calc_mk(aacs, aacs->mk, cf->pkl, cf->dkl);
+            uint8_t mk[16] = {0};
+            if (_calc_mk(aacs, mk, cf->pkl, cf->dkl) == AACS_SUCCESS) {
+                memcpy(aacs->mk, mk, 16);
+            }
 
             keydbcfg_config_file_close(cf);
         }

_______________________________________________
libaacs-devel mailing list
libaacs-devel@videolan.org
https://mailman.videolan.org/listinfo/libaacs-devel

Reply via email to