Changeset 3724ca76ddffbf77b3ede9805a9a0f9f8cabe661

Timestamp:

26/01/04 18:15:40 (5 years ago)

Author:

Jon Lech Johansen <jlj@videolan.org>

git-committer:

Jon Lech Johansen <jlj@videolan.org> 1075137340 +0000

git-parent:

[b3e689d0e60cffe1d8c4406e2a280d8c0ba83c1a]

git-author:

Jon Lech Johansen <jlj@videolan.org> 1075137340 +0000

Message:

• drms: bugfixes in sci handling, GetiPodID darwin support.
  

Files:

• modules/demux/mp4/drms.c (modified) (13 diffs)

modules/demux/mp4/drms.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2004 VideoLAN
-1 2004/01/23 20:58:52
+2 2004/01/26 17:15:40
- *
- * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
@@ -55 +55 @@
-#endif
-
+#ifdef SYS_DARWIN
+#   include <mach/mach.h>
+#   include <IOKit/IOKitLib.h>
+#   include <CoreFoundation/CFNumber.h>
+#endif
+
-#ifdef HAVE_SYSFS_LIBSYSFS_H
- 
+
-#endif
-
@@ -131 +137 @@
-
-static void InitShuffle   ( struct shuffle_s *, uint32_t * );
-
+, uint32_t
-
-static int GetSystemKey   ( uint32_t *, vlc_bool_t );
@@ -678 +684 @@
-
-/*****************************************************************************
-16 byte 
+
- *****************************************************************************
- * This is so ugly and uses so many MD5 checksums that it is most certainly
- * one-way, though why it needs to be so complicated is beyond me.
- *****************************************************************************/
-
+
+
-{
-    struct md5_s md5;
@@ -734 +741 @@
-
-    /* XOR our buffer with the computed checksum */
-4
+i_size
-    {
-        p_buffer[ i ] ^= md5.p_digest[ i ];
@@ -876 +883 @@
-    uint32_t i, y;
-    uint32_t *p_sci_data;
+    uint32_t i_user, i_key;
-    uint32_t p_sys_key[ 4 ];
-
+, i_remaining
-    uint32_t *p_sci0, *p_sci1, *p_buffer;
-    uint32_t p_sci_key[ 4 ];
@@ -906 +914 @@
-    /* Skip the first 4 bytes (some sort of header). Decrypt the rest. */
-    i_blocks = (i_sci_size - 4) / 16;
+    i_remaining = (i_sci_size - 4) - (i_blocks * 16);
-    p_buffer = p_sci_data + 1;
-
@@ -928 +937 @@
-
-        /* Shuffle the decrypted data using a custom routine */
-
+, 4
-
-        /* Copy this block back to p_buffer */
@@ -934 +943 @@
-
-        p_buffer += 4;
+    }
+
+    if( i_remaining >= 4 )
+    {
+        i_remaining /= 4;
+        REVERSE( p_buffer, i_remaining );
+        DoShuffle( &shuffle, p_buffer, i_remaining );
-    }
-
@@ -971 +987 @@
-        }
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-            REVERSE( p_sci1 + 1, 4 );
-
-
+
-            i_ret = 0;
-            break;
@@ -1185 +1202 @@
-    int i_ret = -1;
-
+#define PROD_NAME   "iPod"
+#define VENDOR_NAME "Apple Computer, Inc."
+
-    char *psz_ipod_id = getenv( "IPODID" );
-    if( psz_ipod_id != NULL )
@@ -1192 +1212 @@
-    }
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    struct sysfs_bus *bus = NULL;
-    struct dlist *devlist = NULL;
@@ -1214 +1287 @@
-                    {
-                        if( ( strcmp( curattr->name, "model_name" ) == 0 ) &&
-
+
+
-                        {
-                            *p_ipod_id = strtoll( curdev->name, NULL, 16 );