ref: e3a18cd7c55a261796bfab29845852481f7a08e5
parent: eeaf7ef062e799d49c8d56db3c7938acfa81e8ce
author: Sam Hocevar <sam@videolan.org>
date: Mon Sep 15 13:12:46 EDT 2003
* libdvdcss.c: Added more debug messages.
--- a/src/css.c
+++ b/src/css.c
@@ -1,16 +1,17 @@
/*****************************************************************************
* css.c: Functions for DVD authentication and descrambling
*****************************************************************************
- * Copyright (C) 1999-2001 VideoLAN
- * $Id: css.c,v 1.28 2003/09/09 13:17:24 sam Exp $
+ * Copyright (C) 1999-2003 VideoLAN
+ * $Id: css.c,v 1.29 2003/09/15 17:12:46 sam Exp $
*
- * Author: St�phane Borel <stef@via.ecp.fr>
- * H�kan Hjort <d95hjort@dtek.chalmers.se>
+ * Authors: St�phane Borel <stef@via.ecp.fr>
+ * H�kan Hjort <d95hjort@dtek.chalmers.se>
*
* based on:
* - css-auth by Derek Fawcus <derek@spider.com>
* - DVD CSS ioctls example program by Andrew T. Veliath <andrewtv@usa.net>
* - The Divide and conquer attack by Frank A. Stevenson <frank@funcom.com>
+ * (see http://www-2.cs.cmu.edu/~dst/DeCSS/FrankStevenson/index.html)
* - DeCSSPlus by Ethan Hawke
* - DecVOB
* see http://www.lemuria.org/DeCSS/ by Tom Vogt for more information.
@@ -64,6 +65,8 @@
/*****************************************************************************
* Local prototypes
*****************************************************************************/
+static void PrintKey ( dvdcss_t, char *, uint8_t const * );
+
static int GetBusKey ( dvdcss_t );
static int GetASF ( dvdcss_t );
@@ -71,7 +74,7 @@
static void DecryptKey ( uint8_t,
uint8_t const *, uint8_t const *, uint8_t * );
-static int DecryptDiscKey ( uint8_t const *, dvd_key_t );
+static int DecryptDiscKey ( dvdcss_t, uint8_t const *, dvd_key_t );
static int CrackDiscKey ( dvdcss_t, uint8_t * );
static void DecryptTitleKey ( dvd_key_t, dvd_key_t );
@@ -96,15 +99,16 @@
#ifdef WIN32
if( i_ret < 0 )
{- /* Maybe we didn't have enough priviledges to read the copyright
+ /* Maybe we didn't have enough privileges to read the copyright
* (see ioctl_ReadCopyright comments).
* Apparently, on unencrypted DVDs _dvdcss_disckey() always fails, so
- * we can check this as a work-around. */
+ * we can check this as a workaround. */
i_ret = 0;
+ i_copyright = 1;
if( _dvdcss_disckey( dvdcss ) < 0 )
+ {i_copyright = 0;
- else
- i_copyright = 1;
+ }
}
#endif
@@ -122,161 +126,6 @@
}
/*****************************************************************************
- * GetBusKey : Go through the CSS Authentication process
- *****************************************************************************
- * It simulates the mutual authentication between logical unit and host,
- * and stops when a session key (called bus key) has been established.
- * Always do the full auth sequence. Some drives seem to lie and always
- * respond with ASF=1. For instance the old DVD roms on Compaq Armada says
- * that ASF=1 from the start and then later fail with a 'read of scrambled
- * block without authentication' error.
- *****************************************************************************/
-static int GetBusKey( dvdcss_t dvdcss )
-{- uint8_t p_buffer[10];
- uint8_t p_challenge[2*KEY_SIZE];
- dvd_key_t p_key1;
- dvd_key_t p_key2;
- dvd_key_t p_key_check;
- uint8_t i_variant = 0;
- char psz_warning[80];
- int i_ret = -1;
- int i;
-
- print_debug( dvdcss, "requesting AGID" );
- i_ret = ioctl_ReportAgid( dvdcss->i_fd, &dvdcss->css.i_agid );
-
- /* We might have to reset hung authentication processes in the drive
- * by invalidating the corresponding AGID'. As long as we haven't got
- * an AGID, invalidate one (in sequence) and try again. */
- for( i = 0; i_ret == -1 && i < 4 ; ++i )
- {- print_debug( dvdcss, "ioctl ReportAgid failed, "
- "invalidating AGID %d", i );
-
- /* This is really _not good_, should be handled by the OS.
- * Invalidating an AGID could make another process fail somewhere
- * in its authentication process. */
- dvdcss->css.i_agid = i;
- ioctl_InvalidateAgid( dvdcss->i_fd, &dvdcss->css.i_agid );
-
- print_debug( dvdcss, "requesting AGID" );
- i_ret = ioctl_ReportAgid( dvdcss->i_fd, &dvdcss->css.i_agid );
- }
-
- /* Unable to authenticate without AGID */
- if( i_ret == -1 )
- {- print_error( dvdcss, "ioctl ReportAgid failed, fatal" );
- return -1;
- }
-
- /* Setup a challenge, any values should work */
- for( i = 0 ; i < 10; ++i )
- {- p_challenge[i] = i;
- }
-
- /* Get challenge from host */
- for( i = 0 ; i < 10 ; ++i )
- {- p_buffer[9-i] = p_challenge[i];
- }
-
- /* Send challenge to LU */
- if( ioctl_SendChallenge( dvdcss->i_fd,
- &dvdcss->css.i_agid, p_buffer ) < 0 )
- {- print_error( dvdcss, "ioctl SendChallenge failed" );
- ioctl_InvalidateAgid( dvdcss->i_fd, &dvdcss->css.i_agid );
- return -1;
- }
-
- /* Get key1 from LU */
- if( ioctl_ReportKey1( dvdcss->i_fd, &dvdcss->css.i_agid, p_buffer ) < 0)
- {- print_error( dvdcss, "ioctl ReportKey1 failed" );
- ioctl_InvalidateAgid( dvdcss->i_fd, &dvdcss->css.i_agid );
- return -1;
- }
-
- /* Send key1 to host */
- for( i = 0 ; i < KEY_SIZE ; i++ )
- {- p_key1[i] = p_buffer[4-i];
- }
-
- for( i = 0 ; i < 32 ; ++i )
- {- CryptKey( 0, i, p_challenge, p_key_check );
-
- if( memcmp( p_key_check, p_key1, KEY_SIZE ) == 0 )
- {- print_debug( dvdcss, "drive authenticated, using variant %d", i );
- i_variant = i;
- break;
- }
- }
-
- if( i == 32 )
- {- print_error( dvdcss, "drive would not authenticate" );
- ioctl_InvalidateAgid( dvdcss->i_fd, &dvdcss->css.i_agid );
- return -1;
- }
-
- /* Get challenge from LU */
- if( ioctl_ReportChallenge( dvdcss->i_fd,
- &dvdcss->css.i_agid, p_buffer ) < 0 )
- {- print_error( dvdcss, "ioctl ReportKeyChallenge failed" );
- ioctl_InvalidateAgid( dvdcss->i_fd, &dvdcss->css.i_agid );
- return -1;
- }
-
- /* Send challenge to host */
- for( i = 0 ; i < 10 ; ++i )
- {- p_challenge[i] = p_buffer[9-i];
- }
-
- CryptKey( 1, i_variant, p_challenge, p_key2 );
-
- /* Get key2 from host */
- for( i = 0 ; i < KEY_SIZE ; ++i )
- {- p_buffer[4-i] = p_key2[i];
- }
-
- /* Send key2 to LU */
- if( ioctl_SendKey2( dvdcss->i_fd, &dvdcss->css.i_agid, p_buffer ) < 0 )
- {- print_error( dvdcss, "ioctl SendKey2 failed" );
- ioctl_InvalidateAgid( dvdcss->i_fd, &dvdcss->css.i_agid );
- return -1;
- }
-
- /* The drive has accepted us as authentic. */
- print_debug( dvdcss, "authentication established" );
-
- memcpy( p_challenge, p_key1, KEY_SIZE );
- memcpy( p_challenge + KEY_SIZE, p_key2, KEY_SIZE );
-
- CryptKey( 2, i_variant, p_challenge, dvdcss->css.p_bus_key );
-
- return 0;
-}
-
-/*****************************************************************************
- * PrintKey : debug function that dumps a key value
- *****************************************************************************/
-static void PrintKey( dvdcss_t dvdcss, char *prefix, uint8_t const *data )
-{- print_debug( dvdcss, "%s%02x:%02x:%02x:%02x:%02x", prefix,
- data[0], data[1], data[2], data[3], data[4] );
-}
-
-/*****************************************************************************
* _dvdcss_title: crack or decrypt the current title key if needed
*****************************************************************************
* This function should only be called by dvdcss->pf_seek and should eventually
@@ -445,7 +294,7 @@
/* Decrypt disc key with player key. */
print_debug( dvdcss, "decrypting disc key with player keys" );
- if( ! DecryptDiscKey( p_buffer, p_disc_key ) )
+ if( ! DecryptDiscKey( dvdcss, p_buffer, p_disc_key ) )
{PrintKey( dvdcss, "decrypted disc key is ", p_disc_key );
break;
@@ -612,39 +461,195 @@
uint8_t *p_end = p_sec + DVDCSS_BLOCK_SIZE;
/* PES_scrambling_control */
- if( p_sec[0x14] & 0x30)
+ if( !(p_sec[0x14] & 0x30) )
{- i_t1 = (p_key[0] ^ p_sec[0x54]) | 0x100;
- i_t2 = p_key[1] ^ p_sec[0x55];
- i_t3 = (p_key[2] | (p_key[3] << 8) |
- (p_key[4] << 16)) ^ (p_sec[0x56] |
- (p_sec[0x57] << 8) | (p_sec[0x58] << 16));
- i_t4 = i_t3 & 7;
- i_t3 = i_t3 * 2 + 8 - i_t4;
- p_sec += 0x80;
- i_t5 = 0;
+ return 0;
+ }
- while( p_sec != p_end )
+ i_t1 = (p_key[0] ^ p_sec[0x54]) | 0x100;
+ i_t2 = p_key[1] ^ p_sec[0x55];
+ i_t3 = (p_key[2] | (p_key[3] << 8) |
+ (p_key[4] << 16)) ^ (p_sec[0x56] |
+ (p_sec[0x57] << 8) | (p_sec[0x58] << 16));
+ i_t4 = i_t3 & 7;
+ i_t3 = i_t3 * 2 + 8 - i_t4;
+ p_sec += 0x80;
+ i_t5 = 0;
+
+ while( p_sec != p_end )
+ {+ i_t4 = p_css_tab2[i_t2] ^ p_css_tab3[i_t1];
+ i_t2 = i_t1>>1;
+ i_t1 = ( ( i_t1 & 1 ) << 8 ) ^ i_t4;
+ i_t4 = p_css_tab5[i_t4];
+ i_t6 = ((((((( i_t3 >> 3 ) ^ i_t3 ) >> 1 ) ^
+ i_t3 ) >> 8 ) ^ i_t3 ) >> 5 ) & 0xff;
+ i_t3 = (i_t3 << 8 ) | i_t6;
+ i_t6 = p_css_tab4[i_t6];
+ i_t5 += i_t6 + i_t4;
+ *p_sec = p_css_tab1[*p_sec] ^ ( i_t5 & 0xff );
+ p_sec++;
+ i_t5 >>= 8;
+ }
+
+ return 0;
+}
+
+/* Following functions are local */
+
+/*****************************************************************************
+ * GetBusKey : Go through the CSS Authentication process
+ *****************************************************************************
+ * It simulates the mutual authentication between logical unit and host,
+ * and stops when a session key (called bus key) has been established.
+ * Always do the full auth sequence. Some drives seem to lie and always
+ * respond with ASF=1. For instance the old DVD roms on Compaq Armada says
+ * that ASF=1 from the start and then later fail with a 'read of scrambled
+ * block without authentication' error.
+ *****************************************************************************/
+static int GetBusKey( dvdcss_t dvdcss )
+{+ uint8_t p_buffer[10];
+ uint8_t p_challenge[2*KEY_SIZE];
+ dvd_key_t p_key1;
+ dvd_key_t p_key2;
+ dvd_key_t p_key_check;
+ uint8_t i_variant = 0;
+ int i_ret = -1;
+ int i;
+
+ print_debug( dvdcss, "requesting AGID" );
+ i_ret = ioctl_ReportAgid( dvdcss->i_fd, &dvdcss->css.i_agid );
+
+ /* We might have to reset hung authentication processes in the drive
+ * by invalidating the corresponding AGID'. As long as we haven't got
+ * an AGID, invalidate one (in sequence) and try again. */
+ for( i = 0; i_ret == -1 && i < 4 ; ++i )
+ {+ print_debug( dvdcss, "ioctl ReportAgid failed, "
+ "invalidating AGID %d", i );
+
+ /* This is really _not good_, should be handled by the OS.
+ * Invalidating an AGID could make another process fail somewhere
+ * in its authentication process. */
+ dvdcss->css.i_agid = i;
+ ioctl_InvalidateAgid( dvdcss->i_fd, &dvdcss->css.i_agid );
+
+ print_debug( dvdcss, "requesting AGID" );
+ i_ret = ioctl_ReportAgid( dvdcss->i_fd, &dvdcss->css.i_agid );
+ }
+
+ /* Unable to authenticate without AGID */
+ if( i_ret == -1 )
+ {+ print_error( dvdcss, "ioctl ReportAgid failed, fatal" );
+ return -1;
+ }
+
+ /* Setup a challenge, any values should work */
+ for( i = 0 ; i < 10; ++i )
+ {+ p_challenge[i] = i;
+ }
+
+ /* Get challenge from host */
+ for( i = 0 ; i < 10 ; ++i )
+ {+ p_buffer[9-i] = p_challenge[i];
+ }
+
+ /* Send challenge to LU */
+ if( ioctl_SendChallenge( dvdcss->i_fd,
+ &dvdcss->css.i_agid, p_buffer ) < 0 )
+ {+ print_error( dvdcss, "ioctl SendChallenge failed" );
+ ioctl_InvalidateAgid( dvdcss->i_fd, &dvdcss->css.i_agid );
+ return -1;
+ }
+
+ /* Get key1 from LU */
+ if( ioctl_ReportKey1( dvdcss->i_fd, &dvdcss->css.i_agid, p_buffer ) < 0)
+ {+ print_error( dvdcss, "ioctl ReportKey1 failed" );
+ ioctl_InvalidateAgid( dvdcss->i_fd, &dvdcss->css.i_agid );
+ return -1;
+ }
+
+ /* Send key1 to host */
+ for( i = 0 ; i < KEY_SIZE ; i++ )
+ {+ p_key1[i] = p_buffer[4-i];
+ }
+
+ for( i = 0 ; i < 32 ; ++i )
+ {+ CryptKey( 0, i, p_challenge, p_key_check );
+
+ if( memcmp( p_key_check, p_key1, KEY_SIZE ) == 0 )
{- i_t4 = p_css_tab2[i_t2] ^ p_css_tab3[i_t1];
- i_t2 = i_t1>>1;
- i_t1 = ( ( i_t1 & 1 ) << 8 ) ^ i_t4;
- i_t4 = p_css_tab5[i_t4];
- i_t6 = ((((((( i_t3 >> 3 ) ^ i_t3 ) >> 1 ) ^
- i_t3 ) >> 8 ) ^ i_t3 ) >> 5 ) & 0xff;
- i_t3 = (i_t3 << 8 ) | i_t6;
- i_t6 = p_css_tab4[i_t6];
- i_t5 += i_t6 + i_t4;
- *p_sec = p_css_tab1[*p_sec] ^ ( i_t5 & 0xff );
- p_sec++;
- i_t5 >>= 8;
+ print_debug( dvdcss, "drive authenticated, using variant %d", i );
+ i_variant = i;
+ break;
}
}
+ if( i == 32 )
+ {+ print_error( dvdcss, "drive would not authenticate" );
+ ioctl_InvalidateAgid( dvdcss->i_fd, &dvdcss->css.i_agid );
+ return -1;
+ }
+
+ /* Get challenge from LU */
+ if( ioctl_ReportChallenge( dvdcss->i_fd,
+ &dvdcss->css.i_agid, p_buffer ) < 0 )
+ {+ print_error( dvdcss, "ioctl ReportKeyChallenge failed" );
+ ioctl_InvalidateAgid( dvdcss->i_fd, &dvdcss->css.i_agid );
+ return -1;
+ }
+
+ /* Send challenge to host */
+ for( i = 0 ; i < 10 ; ++i )
+ {+ p_challenge[i] = p_buffer[9-i];
+ }
+
+ CryptKey( 1, i_variant, p_challenge, p_key2 );
+
+ /* Get key2 from host */
+ for( i = 0 ; i < KEY_SIZE ; ++i )
+ {+ p_buffer[4-i] = p_key2[i];
+ }
+
+ /* Send key2 to LU */
+ if( ioctl_SendKey2( dvdcss->i_fd, &dvdcss->css.i_agid, p_buffer ) < 0 )
+ {+ print_error( dvdcss, "ioctl SendKey2 failed" );
+ ioctl_InvalidateAgid( dvdcss->i_fd, &dvdcss->css.i_agid );
+ return -1;
+ }
+
+ /* The drive has accepted us as authentic. */
+ print_debug( dvdcss, "authentication established" );
+
+ memcpy( p_challenge, p_key1, KEY_SIZE );
+ memcpy( p_challenge + KEY_SIZE, p_key2, KEY_SIZE );
+
+ CryptKey( 2, i_variant, p_challenge, dvdcss->css.p_bus_key );
+
return 0;
}
-/* Following functions are local */
+/*****************************************************************************
+ * PrintKey : debug function that dumps a key value
+ *****************************************************************************/
+static void PrintKey( dvdcss_t dvdcss, char *prefix, uint8_t const *data )
+{+ print_debug( dvdcss, "%s%02x:%02x:%02x:%02x:%02x", prefix,
+ data[0], data[1], data[2], data[3], data[4] );
+}
/*****************************************************************************
* GetASF : Get Authentication success flag
@@ -945,57 +950,66 @@
}
/*****************************************************************************
+ * player_keys: alternate DVD player keys
+ *****************************************************************************
+ * These player keys were generated using Frank A. Stevenson's PlayerKey
+ * cracker. A copy of his article can be found here:
+ * http://www-2.cs.cmu.edu/~dst/DeCSS/FrankStevenson/mail2.txt
+ *****************************************************************************/
+static const dvd_key_t player_keys[] =
+{+ { 0x01, 0xaf, 0xe3, 0x12, 0x80 },+ { 0x12, 0x11, 0xca, 0x04, 0x3b },+ { 0x14, 0x0c, 0x9e, 0xd0, 0x09 },+ { 0x14, 0x71, 0x35, 0xba, 0xe2 },+ { 0x1a, 0xa4, 0x33, 0x21, 0xa6 },+ { 0x26, 0xec, 0xc4, 0xa7, 0x4e },+ { 0x2c, 0xb2, 0xc1, 0x09, 0xee },+ { 0x2f, 0x25, 0x9e, 0x96, 0xdd },+ { 0x33, 0x2f, 0x49, 0x6c, 0xe0 },+ { 0x35, 0x5b, 0xc1, 0x31, 0x0f },+ { 0x36, 0x67, 0xb2, 0xe3, 0x85 },+ { 0x39, 0x3d, 0xf1, 0xf1, 0xbd },+ { 0x3b, 0x31, 0x34, 0x0d, 0x91 },+ { 0x45, 0xed, 0x28, 0xeb, 0xd3 },+ { 0x48, 0xb7, 0x6c, 0xce, 0x69 },+ { 0x4b, 0x65, 0x0d, 0xc1, 0xee },+ { 0x4c, 0xbb, 0xf5, 0x5b, 0x23 },+ { 0x51, 0x67, 0x67, 0xc5, 0xe0 },+ { 0x53, 0x94, 0xe1, 0x75, 0xbf },+ { 0x57, 0x2c, 0x8b, 0x31, 0xae },+ { 0x63, 0xdb, 0x4c, 0x5b, 0x4a },+ { 0x7b, 0x1e, 0x5e, 0x2b, 0x57 },+ { 0x85, 0xf3, 0x85, 0xa0, 0xe0 },+ { 0xab, 0x1e, 0xe7, 0x7b, 0x72 },+ { 0xab, 0x36, 0xe3, 0xeb, 0x76 },+ { 0xb1, 0xb8, 0xf9, 0x38, 0x03 },+ { 0xb8, 0x5d, 0xd8, 0x53, 0xbd },+ { 0xbf, 0x92, 0xc3, 0xb0, 0xe2 },+ { 0xcf, 0x1a, 0xb2, 0xf8, 0x0a },+ { 0xec, 0xa0, 0xcf, 0xb3, 0xff },+ { 0xfc, 0x95, 0xa9, 0x87, 0x35 }+};
+
+/*****************************************************************************
* DecryptDiscKey
*****************************************************************************
- * Decryption of the disc key with player keys if they are available.
- * Try to decrypt the disc key from every position with every player key.
+ * Decryption of the disc key with player keys: try to decrypt the disc key
+ * from every position with every player key.
* p_struct_disckey: the 2048 byte DVD_STRUCT_DISCKEY data
* p_disc_key: result, the 5 byte disc key
*****************************************************************************/
-static int DecryptDiscKey( uint8_t const *p_struct_disckey,
+static int DecryptDiscKey( dvdcss_t dvdcss, uint8_t const *p_struct_disckey,
dvd_key_t p_disc_key )
{uint8_t p_verify[KEY_SIZE];
unsigned int i, n = 0;
- static const dvd_key_t player_keys[] =
- {- { 0x01, 0xaf, 0xe3, 0x12, 0x80 },- { 0x12, 0x11, 0xca, 0x04, 0x3b },- { 0x14, 0x0c, 0x9e, 0xd0, 0x09 },- { 0x14, 0x71, 0x35, 0xba, 0xe2 },- { 0x1a, 0xa4, 0x33, 0x21, 0xa6 },- { 0x26, 0xec, 0xc4, 0xa7, 0x4e },- { 0x2c, 0xb2, 0xc1, 0x09, 0xee },- { 0x2f, 0x25, 0x9e, 0x96, 0xdd },- { 0x33, 0x2f, 0x49, 0x6c, 0xe0 },- { 0x35, 0x5b, 0xc1, 0x31, 0x0f },- { 0x36, 0x67, 0xb2, 0xe3, 0x85 },- { 0x39, 0x3d, 0xf1, 0xf1, 0xbd },- { 0x3b, 0x31, 0x34, 0x0d, 0x91 },- { 0x45, 0xed, 0x28, 0xeb, 0xd3 },- { 0x48, 0xb7, 0x6c, 0xce, 0x69 },- { 0x4b, 0x65, 0x0d, 0xc1, 0xee },- { 0x4c, 0xbb, 0xf5, 0x5b, 0x23 },- { 0x51, 0x67, 0x67, 0xc5, 0xe0 },- { 0x53, 0x94, 0xe1, 0x75, 0xbf },- { 0x57, 0x2c, 0x8b, 0x31, 0xae },- { 0x63, 0xdb, 0x4c, 0x5b, 0x4a },- { 0x7b, 0x1e, 0x5e, 0x2b, 0x57 },- { 0x85, 0xf3, 0x85, 0xa0, 0xe0 },- { 0xab, 0x1e, 0xe7, 0x7b, 0x72 },- { 0xab, 0x36, 0xe3, 0xeb, 0x76 },- { 0xb1, 0xb8, 0xf9, 0x38, 0x03 },- { 0xb8, 0x5d, 0xd8, 0x53, 0xbd },- { 0xbf, 0x92, 0xc3, 0xb0, 0xe2 },- { 0xcf, 0x1a, 0xb2, 0xf8, 0x0a },- { 0xec, 0xa0, 0xcf, 0xb3, 0xff },- { 0xfc, 0x95, 0xa9, 0x87, 0x35 }- };
-
/* Decrypt disc key with the above player keys */
- while( n < sizeof(player_keys) / sizeof(dvd_key_t) )
+ for( n = 0; n < sizeof(player_keys) / sizeof(dvd_key_t); n++ )
{+ PrintKey( dvdcss, "trying player key ", player_keys[n] );
+
for( i = 1; i < 409; i++ )
{/* Check if player key n is the right key for position i. */
@@ -1013,7 +1027,6 @@
return 0;
}
}
- n++;
}
/* Have tried all combinations of positions and keys,
@@ -1376,7 +1389,7 @@
/******************************************************************************
- * Various pices for the title crack engine.
+ * Various pieces for the title crack engine.
******************************************************************************
* The length of the PES packet is located at 0x12-0x13.
* The the copyrigth protection bits are located at 0x14 (bits 0x20 and 0x10).
@@ -1500,13 +1513,9 @@
print_debug( dvdcss, "end of title reached" );
}
- { /* Print some statistics. */- char psz_info[128];
- snprintf( psz_info, sizeof(psz_info),
- "%d of %d attempts successful, %d of %d blocks scrambled",
- i_success, i_tries, i_encrypted, i_reads );
- print_debug( dvdcss, psz_info );
- }
+ /* Print some statistics. */
+ print_debug( dvdcss, "successful attempts %d/%d, scrambled blocks %d/%d",
+ i_success, i_tries, i_encrypted, i_reads );
if( i_success > 0 /* b_stop_scanning */ )
{@@ -1517,7 +1526,7 @@
if( i_encrypted == 0 && i_reads > 0 )
{memset( p_titlekey, 0, KEY_SIZE );
- print_debug( dvdcss, "file was unscrambled" );
+ print_debug( dvdcss, "no scrambled sectors found" );
return 0;
}
--- a/src/libdvdcss.c
+++ b/src/libdvdcss.c
@@ -5,7 +5,7 @@
* H�kan Hjort <d95hjort@dtek.chalmers.se>
*
* Copyright (C) 1998-2002 VideoLAN
- * $Id: libdvdcss.c,v 1.34 2003/09/09 10:03:48 sam Exp $
+ * $Id: libdvdcss.c,v 1.35 2003/09/15 17:12:46 sam Exp $
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -202,7 +202,7 @@
{int i = atoi( psz_verbose );
- if( i >= 2 ) dvdcss->b_debug = 1;
+ if( i >= 2 ) dvdcss->b_debug = i;
if( i >= 1 ) dvdcss->b_errors = 1;
}