Packman Build Service PMBS

makemkv.changes Changed

makemkv.spec Changed

makemkv-bin-1.10.3.tar.xz/bin/amd64/makemkvcon -> makemkv-bin-1.10.4.tar.xz/bin/amd64/makemkvcon Changed

makemkv-bin-1.10.3.tar.xz/bin/i386/makemkvcon -> makemkv-bin-1.10.4.tar.xz/bin/i386/makemkvcon Changed

makemkv-bin-1.10.3.tar.xz/bin/i386/mmdtsdec -> makemkv-bin-1.10.4.tar.xz/bin/i386/mmdtsdec Changed

makemkv-bin-1.10.3.tar.xz/src/share/blues.jar -> makemkv-bin-1.10.4.tar.xz/src/share/blues.jar Changed

makemkv-oss-1.10.3.tar.xz/libabi/pssl/ecdsa.h -> makemkv-oss-1.10.4.tar.xz/libabi/pssl/ecdsa.h Changed

makemkv-oss-1.10.3.tar.xz/libabi/src/ossl_ec.c -> makemkv-oss-1.10.4.tar.xz/libabi/src/ossl_ec.c Changed

@@ -20,7 +20,9 @@
 */
 #include <lgpl/osslabi.h>
 #include <openssl/opensslconf.h>
+#include <openssl/bn.h>
 #include <openssl/crypto.h>
+#include <openssl/opensslv.h>
 
 #if defined(OPENSSL_FIPS) && defined(OPENSSL_HAVE_INIT)
 #define UGLY_FEDORA // always disables EC with key size < 256 bits
@@ -199,32 +201,76 @@
 
 /* ECDSA */
 
+#ifdef PSSL_ECDSA_SIG_DEFINED
+typedef struct ECDSA_SIG_st OSSL_ECDSA_SIG_ACCESS;
+#else
+typedef struct OSSL_ECDSA_SIG_access
+{
+    BIGNUM *r;
+    BIGNUM *s;
+} OSSL_ECDSA_SIG_ACCESS;
+#endif
+
 int OSSL_ECDSA_do_verify_rs(const unsigned char *dgst, int dgst_len,const OSSL_BIGNUM *sig_r,const OSSL_BIGNUM *sig_s,OSSL_EC_KEY* eckey)
 {
-    ECDSA_SIG sig;
-    sig.r = (BIGNUM *)sig_r;
-    sig.s = (BIGNUM *)sig_s;
-    return ECDSA_do_verify(dgst,dgst_len,&sig,(EC_KEY*) eckey);
+    int r = -1;
+
+#if (OPENSSL_VERSION_NUMBER >= 0x10100006L)
+    {
+        ECDSA_SIG *sig = ECDSA_SIG_new();
+        if (!sig) return -1;
+        if (ECDSA_SIG_set0(sig,BN_dup((const BIGNUM*)sig_r),BN_dup((const BIGNUM*)sig_s))>0)
+        {
+            r = ECDSA_do_verify(dgst,dgst_len,sig,(EC_KEY*) eckey);
+        }
+        ECDSA_SIG_free(sig);
+    }
+#else
+    {
+        OSSL_ECDSA_SIG_ACCESS sig;
+        sig.r = (BIGNUM *)sig_r;
+        sig.s = (BIGNUM *)sig_s;
+        r = ECDSA_do_verify(dgst,dgst_len,(ECDSA_SIG*)&sig,(EC_KEY*) eckey);
+    }
+#endif
+
+    return r;
 }
 
-int OSSL_ECDSA_sign_setup(OSSL_EC_KEY *eckey, OSSL_BIGNUM **kinv, OSSL_BIGNUM **rp)
+const OSSL_BIGNUM* OSSL_ecdsa_sig_get_r(const OSSL_ECDSA_SIG* sig)
 {
-    return ECDSA_sign_setup( (EC_KEY *)eckey , NULL, (BIGNUM**) kinv, (BIGNUM**) rp);
+#if (OPENSSL_VERSION_NUMBER >= 0x10100006L)
+    {
+        const BIGNUM* r;
+        ECDSA_SIG_get0((const ECDSA_SIG*)sig,&r,NULL);
+        return (const OSSL_BIGNUM*)r;
+    }
+#else
+    return (const OSSL_BIGNUM*) ((const OSSL_ECDSA_SIG_ACCESS*)sig)->r;
+#endif
 }
 
-OSSL_ECDSA_SIG *OSSL_ECDSA_do_sign_ex(const unsigned char *dgst, int dgstlen,const OSSL_BIGNUM *kinv, const OSSL_BIGNUM *rp, OSSL_EC_KEY *eckey)
+const OSSL_BIGNUM* OSSL_ecdsa_sig_get_s(const OSSL_ECDSA_SIG* sig)
 {
-    return (OSSL_ECDSA_SIG *)ECDSA_do_sign_ex(dgst,dgstlen,(const BIGNUM *)kinv, (const BIGNUM *)rp, (EC_KEY *)eckey);
+#if (OPENSSL_VERSION_NUMBER >= 0x10100006L)
+    {
+        const BIGNUM* s;
+        ECDSA_SIG_get0((const ECDSA_SIG*)sig,NULL,&s);
+        return (const OSSL_BIGNUM*)s;
+    }
+#else
+    return (const OSSL_BIGNUM*) ((const OSSL_ECDSA_SIG_ACCESS*)sig)->s;
+#endif
 }
 
-const OSSL_BIGNUM* OSSL_ecdsa_sig_get_r(const OSSL_ECDSA_SIG* sig)
+int OSSL_ECDSA_sign_setup(OSSL_EC_KEY *eckey, OSSL_BIGNUM **kinv, OSSL_BIGNUM **rp)
 {
-    return (const OSSL_BIGNUM*) ((const ECDSA_SIG*)sig)->r;
+    return ECDSA_sign_setup( (EC_KEY *)eckey , NULL, (BIGNUM**) kinv, (BIGNUM**) rp);
 }
 
-const OSSL_BIGNUM* OSSL_ecdsa_sig_get_s(const OSSL_ECDSA_SIG* sig)
+OSSL_ECDSA_SIG *OSSL_ECDSA_do_sign_ex(const unsigned char *dgst, int dgstlen,const OSSL_BIGNUM *kinv, const OSSL_BIGNUM *rp, OSSL_EC_KEY *eckey)
 {
-    return (const OSSL_BIGNUM*) ((const ECDSA_SIG*)sig)->s;
+    return (OSSL_ECDSA_SIG *)ECDSA_do_sign_ex(dgst,dgstlen,(const BIGNUM *)kinv, (const BIGNUM *)rp, (EC_KEY *)eckey);
 }
 
 void OSSL_ECDSA_SIG_free(OSSL_ECDSA_SIG *a)

makemkv-oss-1.10.3.tar.xz/libmmbd/inc/libmmbd/mmbd.h -> makemkv-oss-1.10.4.tar.xz/libmmbd/inc/libmmbd/mmbd.h Changed

makemkv-oss-1.10.3.tar.xz/libmmbd/src/aacs.cpp -> makemkv-oss-1.10.4.tar.xz/libmmbd/src/aacs.cpp Changed

@@ -44,6 +44,21 @@
     fflush(stderr);
 }
 
+static mmbd_output_proc_t get_output_proc()
+{
+    if (getenv("MMBD_TRACE")) {
+        return stderr_print;
+    } else {
+        return NULL;
+    }
+}
+
+AACS_PUBLIC AACS * __cdecl aacs_init(void)
+{
+    MMBD* mmbd = mmbd_create_context(NULL,get_output_proc(),NULL);
+    return (AACS*)mmbd;
+}
+
 AACS_PUBLIC AACS * __cdecl aacs_open(const char *path, const char *keyfile_path)
 {
     return aacs_open2(path,keyfile_path,NULL);
@@ -64,11 +79,7 @@
         p_args = NULL;
     }
 
-    if (getenv("MMBD_TRACE")) {
-        mmbd = mmbd_create_context(NULL,stderr_print,p_args);
-    } else {
-        mmbd = mmbd_create_context(NULL,NULL,p_args);
-    }
+    mmbd = mmbd_create_context(NULL,get_output_proc(),p_args);
     if (mmbd) {
         if (error_code) *error_code=AACS_SUCCESS;
     } else {
@@ -86,6 +97,26 @@
     return (AACS*)mmbd;
 }
 
+AACS_PUBLIC int __cdecl aacs_open_device(AACS *aacs, const char *path, const char *keyfile_path)
+{
+    if (keyfile_path) {
+        const char* args[3];
+
+        args[0]="--libaacs-keyfile";
+        args[1]=keyfile_path;
+        args[2]=NULL;
+        if (mmbd_reinit((MMBD*)aacs,args)) {
+            return AACS_ERROR_NO_CONFIG;
+        }
+    }
+
+    if (mmbd_open((MMBD*)aacs,path)) {
+        return AACS_ERROR_CORRUPTED_DISC;
+    }
+
+    return AACS_SUCCESS;
+}
+
 AACS_PUBLIC void __cdecl aacs_close(AACS *aacs)
 {
     mmbd_destroy_context((MMBD*)aacs);
@@ -101,6 +132,11 @@
     return mmbd_decrypt_unit((MMBD*)aacs,MMBD_FLAG_AUTO_CPSID|MMBD_FLAG_AACS_ONLY,0,buf)?0:1;
 }
 
+AACS_PUBLIC int  __cdecl aacs_decrypt_bus(AACS *aacs, uint8_t *buf)
+{
+    return mmbd_decrypt_unit((MMBD*)aacs,MMBD_FLAG_BUS_ONLY,0,buf)?0:1;
+}
+
 AACS_PUBLIC int __cdecl aacs_get_mkb_version(AACS *aacs)
 {
     return mmbd_get_mkb_version((MMBD*)aacs);
@@ -143,6 +179,33 @@
     return (const uint8_t*)"mmbd_devicenonce";
 }
 
+AACS_PUBLIC const uint8_t * __cdecl aacs_get_content_cert_id(AACS *aacs)
+{
+    return (const uint8_t *)"mmbd_fake_aacs_get_content_cert_id";
+}
+
+AACS_PUBLIC const uint8_t * __cdecl aacs_get_bdj_root_cert_hash(AACS *aacs)
+{
+    return (const uint8_t *)"mmbd_fake_aacs_get_bdj_root_cert_hash";
+}
+
+AACS_PUBLIC void __cdecl aacs_set_fopen(AACS *aacs, void *handle, void* p)
+{
+}
+
+static void* file_open = NULL;
+AACS_PUBLIC void* __cdecl aacs_register_file(void* p)
+{
+    void* old = file_open;
+    file_open = p;
+    return old;
+}
+
+AACS_PUBLIC struct aacs_basic_cci * __cdecl aacs_get_basic_cci(AACS *, uint32_t title)
+{
+    return NULL;
+}
+
 static AACS_RL_ENTRY fake_rl_entry = { 0,{0} };
 
 AACS_PUBLIC AACS_RL_ENTRY * __cdecl aacs_get_hrl(int *num_entries, int *mkb_version)
@@ -174,4 +237,3 @@
     p=strchr(p,'.')+1;
     *micro = (int)strtoul(p,NULL,10);
 }
-

makemkv-oss-1.10.3.tar.xz/libmmbd/src/aacs.h -> makemkv-oss-1.10.4.tar.xz/libmmbd/src/aacs.h Changed

@@ -35,7 +35,9 @@
 extern "C" {
 #endif
 
-/* aacs_open2() error codes */
+/**
+ * aacs_open_device() error codes
+ */
 #define AACS_SUCCESS               0 /* no errors */
 #define AACS_ERROR_CORRUPTED_DISC -1 /* opening or reading of AACS files failed */
 #define AACS_ERROR_NO_CONFIG      -2 /* missing config file */
@@ -46,28 +48,129 @@
 #define AACS_ERROR_MMC_FAILURE    -7 /* MMC failed */
 #define AACS_ERROR_NO_DK          -8 /* no matching device key */
 
+/**
+ * Opaque type for AACS object
+ */
 typedef struct aacs AACS;
 
+/**
+ * Get version of AACS library.
+ *
+ * @param major  where to store libaacs major version
+ * @param minor  where to store libaacs minor version
+ * @param micro  where to store libaacs micro version
+ */
 AACS_PUBLIC void __cdecl aacs_get_version(int *major, int *minor, int *micro);
 
+/*
+ * open / close a disc
+ */
+
+/**
+ * Initialize an AACS object.
+ *
+ * Disc must be opened with aacs_open_device().
+ *
+ * @return  AACS object, NULL on error
+ */
+AACS_PUBLIC AACS * __cdecl aacs_init(void);
+
+/**
+ * Open AACS disc / device.
+ *
+ * If device is not accessible (reading from .iso file or network stream),
+ * path can be NULL.
+ *
+ * If files stored in AACS/ are not accessible from the file system (ex. unmounted disc),
+ * application should provide file system access for libaacs (see aacs_set_fopen()).
+ *
+ * @param  aacs  AACS object
+ * @param  path  path to device or disc root or NULL
+ * @param  keyfile_path  optional path to AACS key file
+ * @return  AACS_SUCCESS or ACS_ERROR_* error code
+ */
+AACS_PUBLIC int __cdecl aacs_open_device(AACS *, const char *path, const char *keyfile_path);
+
+/* deprecated */
 AACS_PUBLIC AACS * __cdecl aacs_open(const char *path, const char *keyfile_path);
+
+/* deprecated */
 AACS_PUBLIC AACS * __cdecl aacs_open2(const char *path, const char *keyfile_path, int *error_code);
+
+/**
+ * Closes and cleans up the AACS object.
+ *
+ * @param aacs  AACS object
+ */
 AACS_PUBLIC void __cdecl aacs_close(AACS *aacs);
-AACS_PUBLIC void __cdecl aacs_select_title(AACS *aacs, uint32_t title); /* 0 - top menu, 0xffff - first play */
-AACS_PUBLIC int  __cdecl aacs_decrypt_unit(AACS *aacs, uint8_t *buf);
 
-/* Disc information */
+/*
+ * decryption
+ */
+
+#define AACS_TITLE_FIRST_PLAY  0
+#define AACS_TITLE_TOP_MENU    0xffff
+
+/**
+ * Select title (optional).
+ *
+ * Titles can be stored in different CPS units and use different encryption key.
+ *
+ * If current title is not set, CPS unit is autodetected (with minor performance cost).
+ * If application does not provide current title to libaacs, current CPS unit
+ * should be reset by selecting First Play title (0xffff) when a new playlist is
+ * started.
+ *
+ * @param aacs  AACS object
+ * @param title  Current title from disc index
+ */
+AACS_PUBLIC void __cdecl aacs_select_title(AACS *aacs, uint32_t title_number);
+
+/**
+ * Decrypt data unit
+ *
+ * Remove possible bus encryption and AACS encryption.
+ *
+ * NOTE: only units from the same CPS unit may be decrypted in paraller.
+ *
+ * @param aacs  AACS object
+ * @param buf  unit to decrypt
+ * @return  1 on success, 0 on error
+ */
+AACS_PUBLIC int __cdecl aacs_decrypt_unit(AACS *aacs, uint8_t *buf);
+
+/**
+ * Remove bus encryption.
+ *
+ * If bus encryption is used, remove bus encryption.
+ * Like aacs_decrypt_unit(), but does not perform AACS decryption.
+ *
+ * @param aacs  AACS object
+ * @param buf  unit to decrypt
+ * @return  1 on success, 0 on error
+ */
+AACS_PUBLIC int __cdecl aacs_decrypt_bus(AACS *aacs, uint8_t *buf);
+
+/*
+ * Disc information
+ */
 AACS_PUBLIC int __cdecl aacs_get_mkb_version(AACS *aacs);
 AACS_PUBLIC const uint8_t * __cdecl aacs_get_disc_id(AACS *aacs);
 AACS_PUBLIC const uint8_t * __cdecl aacs_get_vid(AACS *aacs);  /* may fail even if disc can be decrypted */
 AACS_PUBLIC const uint8_t * __cdecl aacs_get_pmsn(AACS *aacs); /* may fail even if disc can be decrypted */
 AACS_PUBLIC const uint8_t * __cdecl aacs_get_mk(AACS *aacs);   /* may fail even if disc can be decrypted */
+AACS_PUBLIC const uint8_t * __cdecl aacs_get_content_cert_id(AACS *aacs);
+AACS_PUBLIC const uint8_t * __cdecl aacs_get_bdj_root_cert_hash(AACS *aacs);
 
-/* AACS Online */
+/*
+ * AACS Online
+ */
 AACS_PUBLIC const uint8_t * __cdecl aacs_get_device_binding_id(AACS *aacs);
 AACS_PUBLIC const uint8_t * __cdecl aacs_get_device_nonce(AACS *aacs);
 
-/* revocation lists */
+/*
+ * Revocation lists
+ */
 typedef struct {
     uint16_t  range;
     uint8_t   id[6];
@@ -77,13 +180,26 @@
 AACS_PUBLIC AACS_RL_ENTRY * __cdecl aacs_get_drl(int *num_entries, int *mkb_version);
 AACS_PUBLIC void            __cdecl aacs_free_rl(AACS_RL_ENTRY **rl);
 
-/* bus encryption info */
+/*
+ * Bus encryption information
+ */
 
 #define AACS_BUS_ENCRYPTION_ENABLED  0x01  /* Bus encryption enabled in the media */
 #define AACS_BUS_ENCRYPTION_CAPABLE  0x02  /* Bus encryption capable drive */
 
 AACS_PUBLIC uint32_t __cdecl aacs_get_bus_encryption(AACS *);
 
+/*
+ * Copy Control Information
+ */
+
+struct aacs_basic_cci;
+
+AACS_PUBLIC struct aacs_basic_cci * __cdecl aacs_get_basic_cci(AACS *, uint32_t title);
+
+AACS_PUBLIC void __cdecl aacs_set_fopen(AACS *aacs, void *handle, void* p);
+AACS_PUBLIC void* __cdecl aacs_register_file(void* p);
+
 #ifdef __cplusplus
 }
 #endif

makemkv-oss-1.10.3.tar.xz/libmmbd/src/libmmbd.def -> makemkv-oss-1.10.4.tar.xz/libmmbd/src/libmmbd.def Changed

makemkv-oss-1.10.3.tar.xz/libmmbd/src/libmmbd.vers -> makemkv-oss-1.10.4.tar.xz/libmmbd/src/libmmbd.vers Changed

makemkv-oss-1.10.3.tar.xz/libmmbd/src/mmbd.cpp -> makemkv-oss-1.10.4.tar.xz/libmmbd/src/mmbd.cpp Changed

makemkv-oss-1.10.3.tar.xz/libmmbd/src/mmconn.cpp -> makemkv-oss-1.10.4.tar.xz/libmmbd/src/mmconn.cpp Changed

@@ -75,25 +75,32 @@
     return pd+len;
 }
 
-bool CMMBDConn::initialize(const char* argp[])
+bool CMMBDConn::convertArg(const char* argp[],CMMBDConn::argp_proc_t Proc)
 {
     const uint16_t* argu[30];
     unsigned int count=0;
 
-    if (!argp) return initializeU(NULL);
-
-    while((argp[count]!=NULL) && (count<29)) {
-        size_t      len;
-        uint16_t*   p;
-
-        len = utf8toutf16len(argp[count])+2;
-        p=(uint16_t*)alloca(len*sizeof(uint16_t));
-        utf8toutf16(p,len,argp[count],strlen(argp[count])+1);
-        argu[count]=p;
-        count++;
+    if (!argp) {
+        return (this->*Proc)(NULL);
+    } else {
+        while((argp[count]!=NULL) && (count<29)) {
+            size_t      len;
+            uint16_t*   p;
+
+            len = utf8toutf16len(argp[count])+2;
+            p=(uint16_t*)alloca(len*sizeof(uint16_t));
+            utf8toutf16(p,len,argp[count],strlen(argp[count])+1);
+            argu[count]=p;
+            count++;
+        }
+        argu[count]=NULL;
+        return (this->*Proc)(argu);
     }
-    argu[count]=NULL;
-    return initializeU(argu);
+}
+
+bool CMMBDConn::initialize(const char* argp[])
+{
+    return convertArg(argp,&CMMBDConn::initializeU);
 }
 
 bool CMMBDConn::initializeU(const uint16_t* argp[])
@@ -167,18 +174,41 @@
     return true;
 }
 
+bool CMMBDConn::reinitialize(const char* argp[])
+{
+    return convertArg(argp,&CMMBDConn::reinitializeU);
+}
+
+bool CMMBDConn::reinitializeU(const uint16_t* argp[])
+{
+    if (!m_active) return false;
+
+    if (!m_apc.InitMMBD(argp)) {
+        error_message(20,"MakeMKV initialization failed");
+        return false;
+    }
+
+    WaitJob();
+
+    return true;
+}
+
 const char* CMMBDConn::get_version_string()
 {
     return m_version;
 }
 
-int CMMBDConn::open(const char *locator)
+int CMMBDConn::open(const char *prefix,const char *locator)
 {
+    size_t plen = (prefix)?utf8toutf16len(prefix):0;
     size_t len = utf8toutf16len(locator);
 
-    uint16_t* p = (uint16_t*)alloca((len+2)*sizeof(uint16_t));
+    uint16_t* p = (uint16_t*)alloca((plen+len+2)*sizeof(uint16_t));
 
-    utf8toutf16(p,len+2,locator,strlen(locator)+1);
+    if (prefix) {
+        utf8toutf16(p,plen,prefix,strlen(prefix));
+    }
+    utf8toutf16(p+plen,len+2,locator,strlen(locator)+1);
 
     return openU(p);
 }
@@ -380,6 +410,16 @@
     if ((!m_active) || (!m_disc_flags)) return -2;
     if (buf[4]!=0x47) return -3;
 
+
+    if ((name_flags&MMBD_FLAG_BUS_ONLY)!=0) {
+        if ( ((buf[0]&0xC0)!=0x00) && ((m_disc_flags&AP_MMBD_DISC_FLAG_BUSENC)!=0) ) {
+            (*m_aes_cbcd)(m_bus_key,iv,buf+16+0*BD_SECTOR_SIZE,BD_SECTOR_SIZE-16);
+            (*m_aes_cbcd)(m_bus_key,iv,buf+16+1*BD_SECTOR_SIZE,BD_SECTOR_SIZE-16);
+            (*m_aes_cbcd)(m_bus_key,iv,buf+16+2*BD_SECTOR_SIZE,BD_SECTOR_SIZE-16);
+        }
+        return 0;
+    }
+
     if ((name_flags&MMBD_FLAG_BDPLUS_ONLY)==0) {
         size=16;
     } else {
@@ -420,9 +460,8 @@
 
 
         if (dbuf[0]&1) {
-            (*m_aes_cbcd)(dbuf+1,iv,buf+16,6128);
+             (*m_aes_cbcd)(dbuf+1,iv,buf+16,6128);
         }
-
         buf[0]&=0x3f;
     }

makemkv-oss-1.10.3.tar.xz/libmmbd/src/mmconn.h -> makemkv-oss-1.10.4.tar.xz/libmmbd/src/mmconn.h Changed

makemkv-oss-1.10.3.tar.xz/makemkvgui/inc/lgpl/aproxy.h -> makemkv-oss-1.10.4.tar.xz/makemkvgui/inc/lgpl/aproxy.h Changed

makemkv-oss-1.10.3.tar.xz/makemkvgui/inc/ver_num.h -> makemkv-oss-1.10.4.tar.xz/makemkvgui/inc/ver_num.h Changed

Changes of Revision 37