August 2010 - MPlayer-cvslog - lists.mplayerhq.hu

r31996 - trunk/stream/stream_bd.c
by reimar 21 Aug '10

21 Aug '10

Author: reimar Date: Sat Aug 21 11:58:02 2010 New Revision: 31996 Log: Avoid another unnecessary intermediate variable. Modified: trunk/stream/stream_bd.c Modified: trunk/stream/stream_bd.c ============================================================================== --- trunk/stream/stream_bd.c Sat Aug 21 11:55:30 2010 (r31995) +++ trunk/stream/stream_bd.c Sat Aug 21 11:58:02 2010 (r31996) @@ -163,7 +163,6 @@ static int find_vuk(struct bd_priv *bd, int i; char line[1024]; char *vst; - unsigned int byte; stream_read_line(file, line, sizeof(line), 0); // file is built up this way: @@ -188,9 +187,8 @@ static int find_vuk(struct bd_priv *bd, if (strlen(vst) < 32) continue; for (i = 0; i < 16; i++) { - if (sscanf(&vst[i*2], "%2x", &byte) != 1) + if (sscanf(&vst[i*2], "%2"SCNx8, &bd->vuk.u8[i]) != 1) break; - bd->vuk.u8[i] = byte; } vukfound = 1; }

1 0

r31995 - trunk/stream/stream_bd.c
by reimar 21 Aug '10

21 Aug '10

Author: reimar Date: Sat Aug 21 11:55:30 2010 New Revision: 31995 Log: Avoid a pointless extra variable. Modified: trunk/stream/stream_bd.c Modified: trunk/stream/stream_bd.c ============================================================================== --- trunk/stream/stream_bd.c Sat Aug 21 11:47:08 2010 (r31994) +++ trunk/stream/stream_bd.c Sat Aug 21 11:55:30 2010 (r31995) @@ -21,6 +21,7 @@ #include <stdio.h> #include <limits.h> +#include <ctype.h> #include "libavutil/common.h" #include "libavutil/aes.h" #include "libavutil/sha.h" @@ -161,7 +162,6 @@ static int find_vuk(struct bd_priv *bd, while (!stream_eof(file)) { int i; char line[1024]; - char d[200]; char *vst; unsigned int byte; @@ -183,9 +183,12 @@ static int find_vuk(struct bd_priv *bd, vst = strstr(line, "| V |"); if (!vst) break; - sscanf(&vst[6], "%32s", d); + vst += 6; + while (isspace(*vst)) vst++; + if (strlen(vst) < 32) + continue; for (i = 0; i < 16; i++) { - if (sscanf(&d[i*2], "%2x", &byte) != 1) + if (sscanf(&vst[i*2], "%2x", &byte) != 1) break; bd->vuk.u8[i] = byte; }

1 0

r31994 - trunk/stream/stream_bd.c
by reimar 21 Aug '10

21 Aug '10

Author: reimar Date: Sat Aug 21 11:47:08 2010 New Revision: 31994 Log: Format NULL-pointer check consistently. Modified: trunk/stream/stream_bd.c Modified: trunk/stream/stream_bd.c ============================================================================== --- trunk/stream/stream_bd.c Sat Aug 21 11:46:06 2010 (r31993) +++ trunk/stream/stream_bd.c Sat Aug 21 11:47:08 2010 (r31994) @@ -181,7 +181,7 @@ static int find_vuk(struct bd_priv *bd, mp_msg(MSGT_OPEN, MSGL_V, "KeyDB found Entry for DiscID:\n%s\n", line); vst = strstr(line, "| V |"); - if (vst == 0) + if (!vst) break; sscanf(&vst[6], "%32s", d); for (i = 0; i < 16; i++) {

1 0

r31993 - trunk/stream/stream_bd.c
by reimar 21 Aug '10

21 Aug '10

Author: reimar Date: Sat Aug 21 11:46:06 2010 New Revision: 31993 Log: Simplify searching for discid by comparing the string representations. Modified: trunk/stream/stream_bd.c Modified: trunk/stream/stream_bd.c ============================================================================== --- trunk/stream/stream_bd.c Sat Aug 21 11:41:15 2010 (r31992) +++ trunk/stream/stream_bd.c Sat Aug 21 11:46:06 2010 (r31993) @@ -146,6 +146,7 @@ static int find_vuk(struct bd_priv *bd, const char *home; int vukfound = 0; stream_t *file; + char idstr[ID_STR_LEN]; // look up discid in KEYDB.cfg to get VUK home = getenv("HOME"); @@ -156,10 +157,10 @@ static int find_vuk(struct bd_priv *bd, "Cannot open VUK database file %s\n", filename); return 0; } + id2str(discid, 20, idstr); while (!stream_eof(file)) { int i; char line[1024]; - uint8_t id[20]; char d[200]; char *vst; unsigned int byte; @@ -175,14 +176,7 @@ static int find_vuk(struct bd_priv *bd, // or I | I-Key // can be followed by ; and comment - //This means: first string up to whitespace is discid - sscanf(line, "%40s", d); - for (i = 0; i < 20; ++i) { - if (sscanf(&d[i*2], "%2x", &byte) != 1) - break; - id[i] = byte; - } - if (memcmp(id, discid, 20) != 0) + if (strncasecmp(line, idstr, 40)) continue; mp_msg(MSGT_OPEN, MSGL_V, "KeyDB found Entry for DiscID:\n%s\n", line);

1 0

r31992 - trunk/stream/stream_bd.c
by reimar 21 Aug '10

21 Aug '10

Author: reimar Date: Sat Aug 21 11:41:15 2010 New Revision: 31992 Log: Switch to uppercase hex. Modified: trunk/stream/stream_bd.c Modified: trunk/stream/stream_bd.c ============================================================================== --- trunk/stream/stream_bd.c Sat Aug 21 11:40:16 2010 (r31991) +++ trunk/stream/stream_bd.c Sat Aug 21 11:41:15 2010 (r31992) @@ -137,7 +137,7 @@ static void id2str(const uint8_t *id, in int i; idlen = FFMIN(idlen, 20); for (i = 0; i < idlen; i++) - snprintf(dst + 2*i, 3, "%02"PRIx8, id[i]); + snprintf(dst + 2*i, 3, "%02"PRIX8, id[i]); } static int find_vuk(struct bd_priv *bd, const uint8_t discid[20])

1 0

r31991 - trunk/stream/stream_bd.c
by reimar 21 Aug '10

21 Aug '10

Author: reimar Date: Sat Aug 21 11:40:16 2010 New Revision: 31991 Log: Simplify/fix printing of disc id/VUK Modified: trunk/stream/stream_bd.c Modified: trunk/stream/stream_bd.c ============================================================================== --- trunk/stream/stream_bd.c Sat Aug 21 11:27:15 2010 (r31990) +++ trunk/stream/stream_bd.c Sat Aug 21 11:40:16 2010 (r31991) @@ -131,6 +131,15 @@ static int bd_stream_seek(stream_t *s, o return 1; } +#define ID_STR_LEN 41 +static void id2str(const uint8_t *id, int idlen, char dst[ID_STR_LEN]) +{ + int i; + idlen = FFMIN(idlen, 20); + for (i = 0; i < idlen; i++) + snprintf(dst + 2*i, 3, "%02"PRIx8, id[i]); +} + static int find_vuk(struct bd_priv *bd, const uint8_t discid[20]) { char filename[PATH_MAX]; @@ -197,12 +206,13 @@ static int bd_get_uks(struct bd_priv *bd unsigned char *buf; size_t file_size; int pos; - int i, j; + int i; struct AVAES *a; struct AVSHA *asha; stream_t *file; char filename[PATH_MAX]; uint8_t discid[20]; + char idstr[ID_STR_LEN]; snprintf(filename, sizeof(filename), BD_UKF_PATH, bd->device); file = open_stream(filename, NULL, NULL); @@ -229,10 +239,9 @@ static int bd_get_uks(struct bd_priv *bd av_free(asha); if (!find_vuk(bd, discid)) { + id2str(discid, 20, idstr); mp_msg(MSGT_OPEN, MSGL_ERR, - "No Volume Unique Key (VUK) found for this Disc: "); - for (j = 0; j < 20; j++) mp_msg(MSGT_OPEN, MSGL_ERR, "%02x", discid[j]); - mp_msg(MSGT_OPEN, MSGL_ERR, "\n"); + "No Volume Unique Key (VUK) found for this Disc: %s\n", idstr); av_free(buf); return 0; } @@ -253,14 +262,10 @@ static int bd_get_uks(struct bd_priv *bd a = av_malloc(av_aes_size); av_aes_init(a, bd->vuk.u8, 128, 1); - mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_BD_DISCID="); - for (j = 0; j < 20; j++) - mp_msg(MSGT_IDENTIFY, MSGL_INFO, "%02x", discid[j]); - mp_msg(MSGT_IDENTIFY, MSGL_INFO, "\n"); - mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_BD_VUK="); - for (j = 0; j < 20; j++) - mp_msg(MSGT_IDENTIFY, MSGL_INFO, "%02x", discid[j]); - mp_msg(MSGT_IDENTIFY, MSGL_INFO, "\n"); + id2str(discid, 20, idstr); + mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_BD_DISCID=%s\n", idstr); + id2str(bd->vuk.u8, 16, idstr); + mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_BD_VUK=%s\n", idstr); for (i = 0; i < bd->uks.count; i++) { av_aes_crypt(a, bd->uks.keys[i].u8, &buf[key_pos], 1, NULL, 1); // decrypt unit key

1 0

r31990 - trunk/stream/stream_bd.c
by reimar 21 Aug '10

21 Aug '10

Author: reimar Date: Sat Aug 21 11:27:15 2010 New Revision: 31990 Log: Add const to pointer argument. Modified: trunk/stream/stream_bd.c Modified: trunk/stream/stream_bd.c ============================================================================== --- trunk/stream/stream_bd.c Sat Aug 21 11:20:14 2010 (r31989) +++ trunk/stream/stream_bd.c Sat Aug 21 11:27:15 2010 (r31990) @@ -131,7 +131,7 @@ static int bd_stream_seek(stream_t *s, o return 1; } -static int find_vuk(struct bd_priv *bd, uint8_t discid[20]) +static int find_vuk(struct bd_priv *bd, const uint8_t discid[20]) { char filename[PATH_MAX]; const char *home;

1 0

r31989 - trunk/stream/stream_bd.c
by reimar 21 Aug '10

21 Aug '10

Author: reimar Date: Sat Aug 21 11:20:14 2010 New Revision: 31989 Log: Remove a unused assignment. Modified: trunk/stream/stream_bd.c Modified: trunk/stream/stream_bd.c ============================================================================== --- trunk/stream/stream_bd.c Sat Aug 21 11:19:12 2010 (r31988) +++ trunk/stream/stream_bd.c Sat Aug 21 11:20:14 2010 (r31989) @@ -251,7 +251,7 @@ static int bd_get_uks(struct bd_priv *bd bd->uks.keys = calloc(bd->uks.count, sizeof(key)); a = av_malloc(av_aes_size); - j = av_aes_init(a, bd->vuk.u8, 128, 1); + av_aes_init(a, bd->vuk.u8, 128, 1); mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_BD_DISCID="); for (j = 0; j < 20; j++)

1 0

r31988 - trunk/stream/stream_bd.c
by reimar 21 Aug '10

21 Aug '10

Author: reimar Date: Sat Aug 21 11:19:12 2010 New Revision: 31988 Log: Fix a memleak. Modified: trunk/stream/stream_bd.c Modified: trunk/stream/stream_bd.c ============================================================================== --- trunk/stream/stream_bd.c Sat Aug 21 11:18:29 2010 (r31987) +++ trunk/stream/stream_bd.c Sat Aug 21 11:19:12 2010 (r31988) @@ -233,6 +233,7 @@ static int bd_get_uks(struct bd_priv *bd "No Volume Unique Key (VUK) found for this Disc: "); for (j = 0; j < 20; j++) mp_msg(MSGT_OPEN, MSGL_ERR, "%02x", discid[j]); mp_msg(MSGT_OPEN, MSGL_ERR, "\n"); + av_free(buf); return 0; }

1 0

r31987 - trunk/stream/stream_bd.c
by reimar 21 Aug '10

21 Aug '10

Author: reimar Date: Sat Aug 21 11:18:29 2010 New Revision: 31987 Log: Extract reading KEDB.cfg into a separate function. Modified: trunk/stream/stream_bd.c Modified: trunk/stream/stream_bd.c ============================================================================== --- trunk/stream/stream_bd.c Fri Aug 20 20:19:11 2010 (r31986) +++ trunk/stream/stream_bd.c Sat Aug 21 11:18:29 2010 (r31987) @@ -131,43 +131,12 @@ static int bd_stream_seek(stream_t *s, o return 1; } -static int bd_get_uks(struct bd_priv *bd) +static int find_vuk(struct bd_priv *bd, uint8_t discid[20]) { - unsigned char *buf; - size_t file_size; - int pos; - int i, j; - struct AVAES *a; - struct AVSHA *asha; - stream_t *file; char filename[PATH_MAX]; - uint8_t discid[20]; - char *home; + const char *home; int vukfound = 0; - - snprintf(filename, sizeof(filename), BD_UKF_PATH, bd->device); - file = open_stream(filename, NULL, NULL); - if (!file) { - mp_msg(MSGT_OPEN, MSGL_ERR, - "Cannot open file %s to get UK and DiscID\n", filename); - return 0; - } - file_size = file->end_pos; - if (file_size <= 0 || file_size > 10 * 1024* 1024) { - mp_msg(MSGT_OPEN, MSGL_ERR, "File %s too large\n", filename); - free_stream(file); - return 0; - } - buf = av_malloc(file_size); - stream_read(file, buf, file_size); - free_stream(file); - - // get discid from file - asha = av_malloc(av_sha_size); - av_sha_init(asha, 160); - av_sha_update(asha, buf, file_size); - av_sha_final(asha, discid); - av_free(asha); + stream_t *file; // look up discid in KEYDB.cfg to get VUK home = getenv("HOME"); @@ -176,10 +145,10 @@ static int bd_get_uks(struct bd_priv *bd if (!file) { mp_msg(MSGT_OPEN,MSGL_ERR, "Cannot open VUK database file %s\n", filename); - av_free(buf); return 0; } while (!stream_eof(file)) { + int i; char line[1024]; uint8_t id[20]; char d[200]; @@ -220,7 +189,46 @@ static int bd_get_uks(struct bd_priv *bd vukfound = 1; } free_stream(file); - if (!vukfound) { + return vukfound; +} + +static int bd_get_uks(struct bd_priv *bd) +{ + unsigned char *buf; + size_t file_size; + int pos; + int i, j; + struct AVAES *a; + struct AVSHA *asha; + stream_t *file; + char filename[PATH_MAX]; + uint8_t discid[20]; + + snprintf(filename, sizeof(filename), BD_UKF_PATH, bd->device); + file = open_stream(filename, NULL, NULL); + if (!file) { + mp_msg(MSGT_OPEN, MSGL_ERR, + "Cannot open file %s to get UK and DiscID\n", filename); + return 0; + } + file_size = file->end_pos; + if (file_size <= 0 || file_size > 10 * 1024* 1024) { + mp_msg(MSGT_OPEN, MSGL_ERR, "File %s too large\n", filename); + free_stream(file); + return 0; + } + buf = av_malloc(file_size); + stream_read(file, buf, file_size); + free_stream(file); + + // get discid from file + asha = av_malloc(av_sha_size); + av_sha_init(asha, 160); + av_sha_update(asha, buf, file_size); + av_sha_final(asha, discid); + av_free(asha); + + if (!find_vuk(bd, discid)) { mp_msg(MSGT_OPEN, MSGL_ERR, "No Volume Unique Key (VUK) found for this Disc: "); for (j = 0; j < 20; j++) mp_msg(MSGT_OPEN, MSGL_ERR, "%02x", discid[j]);

1 0