[libbdplus-devel] Enable experimental code

anonymous git at videolan.org
Thu Mar 16 13:24:52 CET 2017


libbdplus | branch: master | anonymous <anonymous at anonymous.org> | Thu Mar 16 14:14:53 2017 +0200| [8cbc747432c0472676954d36d49a198abceddca7] | committer: anonymous

Enable experimental code

> http://git.videolan.org/gitweb.cgi/libbdplus.git/?a=commit;h=8cbc747432c0472676954d36d49a198abceddca7
---

 src/libbdplus/bdsvm/trap.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/libbdplus/bdsvm/trap.c b/src/libbdplus/bdsvm/trap.c
index 047d165..58d9177 100644
--- a/src/libbdplus/bdsvm/trap.c
+++ b/src/libbdplus/bdsvm/trap.c
@@ -139,10 +139,12 @@ uint32_t TRAP_Aes(bdplus_config_t *config, uint8_t *dst, uint8_t *src, uint32_t
 
     BD_DEBUG(DBG_BDPLUS_TRAP,"[TRAP] TRAP_Aes(KeyID %08X)\n", opOrKeyID);
 
+#if 0
     if (opOrKeyID == 0xFFF10002) {
         BD_DEBUG(DBG_BDPLUS_TRAP | DBG_CRIT, "[TRAP] TRAP_Aes(AES_ECB_DECRYPT_MEDIA_KEY) not implemented\n");
         return STATUS_INVALID_PARAMETER;
     }
+#endif
 
     if (opOrKeyID > 0xFFF10002)
         return STATUS_INVALID_PARAMETER;
@@ -178,9 +180,12 @@ uint32_t TRAP_Aes(bdplus_config_t *config, uint8_t *dst, uint8_t *src, uint32_t
         break;
 
     case 0xFFF10002: // AES_DECRYPT_MEDIA_KEY
+        BD_DEBUG(DBG_BDPLUS_TRAP | DBG_CRIT, "[TRAP] TRAP_Aes(AES_ECB_DECRYPT_MEDIA_KEY) not implemented\n");
         key = mk;
         // TODO
 
+        /* fall thru */
+
     case 0xFFF10001: // AES_DECRYPT
         BD_DEBUG(DBG_BDPLUS,"[TRAP] TRAP_Aes(AES_DECRYPT): %p->%p (%d)\n", src, dst, len);
         gcry_err = gcry_cipher_setkey(gcry_h, key, AES_BLOCK_SIZE);



More information about the libbdplus-devel mailing list