Commit 9c73ea81 authored by npzacs's avatar npzacs
Browse files

Do not store unused data from KEYDB.cfg

parent 98b269ad
......@@ -67,20 +67,25 @@ static int print_title_entries(title_entry_list *list)
break;
printf("DISCID: %s\n", str_print_hex(tmp, cursor->entry.discid, 20));
#if 0
printf(" Title: %s\n", cursor->entry.title);
printf(" Date: %u-%u-%u\n", cursor->entry.date.year,
cursor->entry.date.month, cursor->entry.date.day);
#endif
if (cursor->entry.mek)
printf(" MEK: %s\n", cursor->entry.mek);
if (cursor->entry.vid)
printf(" VID: %s\n", cursor->entry.vid);
#if 0
if (cursor->entry.bn)
{
printf(" BN:\n");
print_digit_key_pair_enties(cursor->entry.bn);
}
#endif
if (cursor->entry.vuk)
printf(" VUK: %s\n", cursor->entry.vuk);
#if 0
if (cursor->entry.pak)
{
printf(" PAK:\n");
......@@ -91,6 +96,7 @@ static int print_title_entries(title_entry_list *list)
printf(" TK:\n");
print_digit_key_pair_enties(cursor->entry.tk);
}
#endif
if (cursor->entry.uk)
{
printf(" UK:\n");
......
......@@ -54,14 +54,14 @@
enum
{
ENTRY_TYPE_DISCID,
ENTRY_TYPE_TITLE,
ENTRY_TYPE_DATE,
/*ENTRY_TYPE_TITLE,*/
/*ENTRY_TYPE_DATE,*/
ENTRY_TYPE_MEK,
ENTRY_TYPE_VID,
ENTRY_TYPE_BN,
/*ENTRY_TYPE_BN,*/
ENTRY_TYPE_VUK,
ENTRY_TYPE_PAK,
ENTRY_TYPE_TK,
/*ENTRY_TYPE_PAK,*/
/*ENTRY_TYPE_TK,*/
ENTRY_TYPE_UK
};
......@@ -78,8 +78,10 @@ static int add_entry(title_entry_list *list, int type, char *entry);
static digit_key_pair_list *new_digit_key_pair_list(void);
static digit_key_pair_list *add_digit_key_pair_entry(digit_key_pair_list *list,
int type, unsigned int digit, char *key);
/*
static int add_date_entry(title_entry_list *list, unsigned int year,
unsigned int month, unsigned int day);
*/
void yyerror (void *scanner, config_file *cf,
title_entry_list *celist, digit_key_pair_list *dkplist,
const char *msg);
......@@ -284,7 +286,7 @@ disc_info
celist = celist->next;
}
add_entry(celist, ENTRY_TYPE_DISCID, $1);
add_entry(celist, ENTRY_TYPE_TITLE, $3);
/*add_entry(celist, ENTRY_TYPE_TITLE, $3);*/
}
;
......@@ -314,9 +316,11 @@ entry
date_entry
: ENTRY_ID_DATE DIGIT PUNCT_HYPHEN DIGIT PUNCT_HYPHEN DIGIT
/*
{
add_date_entry(celist, $2, $4, $6);
}
*/
;
mek_entry
......@@ -347,6 +351,7 @@ bn_data_list
bn_data
: DIGIT PUNCT_HYPHEN hexstring_list
/*
{
if (!dkplist)
{
......@@ -355,6 +360,7 @@ bn_data
}
dkplist = add_digit_key_pair_entry(dkplist, ENTRY_TYPE_BN, $1, $3);
}
*/
;
vuk_entry
......@@ -378,6 +384,7 @@ pak_data_list
pak_data
: DIGIT PUNCT_HYPHEN hexstring_list
/*
{
if (!dkplist)
{
......@@ -386,6 +393,7 @@ pak_data
}
dkplist = add_digit_key_pair_entry(dkplist, ENTRY_TYPE_PAK, $1, $3);
}
*/
;
tk_entry
......@@ -402,7 +410,8 @@ tk_data_list
tk_data
: DIGIT PUNCT_HYPHEN hexstring_list
{
/*
{
if (!dkplist)
{
dkplist = new_digit_key_pair_list();
......@@ -410,6 +419,7 @@ tk_data
}
dkplist = add_digit_key_pair_entry(dkplist, ENTRY_TYPE_TK, $1, $3);
}
*/
;
uk_entry
......@@ -520,13 +530,13 @@ int keydbcfg_config_file_close(config_file *cfgfile)
while (cfgfile->list)
{
title_entry_list *next = cfgfile->list->next;
X_FREE(cfgfile->list->entry.title);
/*X_FREE(cfgfile->list->entry.title);*/
X_FREE(cfgfile->list->entry.mek);
X_FREE(cfgfile->list->entry.vid);
DIGIT_KEY_PAIR_LIST_FREE(cfgfile->list->entry.bn);
/*DIGIT_KEY_PAIR_LIST_FREE(cfgfile->list->entry.bn);*/
X_FREE(cfgfile->list->entry.vuk);
DIGIT_KEY_PAIR_LIST_FREE(cfgfile->list->entry.pak);
DIGIT_KEY_PAIR_LIST_FREE(cfgfile->list->entry.tk);
/*DIGIT_KEY_PAIR_LIST_FREE(cfgfile->list->entry.pak);*/
/*DIGIT_KEY_PAIR_LIST_FREE(cfgfile->list->entry.tk);*/
DIGIT_KEY_PAIR_LIST_FREE(cfgfile->list->entry.uk);
X_FREE(cfgfile->list);
cfgfile->list = next;
......@@ -694,12 +704,13 @@ static int add_entry(title_entry_list *list, int type, char *entry)
X_FREE(entry);
break;
#if 0
case ENTRY_TYPE_TITLE:
X_FREE(list->entry.title);
list->entry.title = (char*)malloc(strlen(entry) + 1);
strcpy(list->entry.title, entry);
break;
#endif
case ENTRY_TYPE_MEK:
CHECK_KEY_LENGTH("mek", 32)
X_FREE(list->entry.mek);
......@@ -761,6 +772,7 @@ static digit_key_pair_list *add_digit_key_pair_entry(digit_key_pair_list *list,
}
/* Function to add a date entry */
#if 0
static int add_date_entry(title_entry_list *list, unsigned int year,
unsigned int month, unsigned int day)
{
......@@ -776,6 +788,7 @@ static int add_date_entry(title_entry_list *list, unsigned int year,
return 1;
}
#endif
/* Our definition of yyerror */
void yyerror (void *scanner, config_file *cf,
......
......@@ -41,6 +41,7 @@ struct digit_key_pair_list_t
};
/* date entry struct */
#if 0
typedef struct date_entry_t date_entry;
struct date_entry_t
{
......@@ -48,6 +49,7 @@ struct date_entry_t
unsigned int month;
unsigned int day;
};
#endif
/* dk entry */
typedef struct dk_entry dk_list;
......@@ -84,14 +86,14 @@ typedef struct title_entry_t title_entry;
struct title_entry_t
{
uint8_t discid[20];
char *title;
date_entry date;
//char *title;
//date_entry date;
char *mek;
char *vid;
digit_key_pair_list *bn;
//digit_key_pair_list *bn;
char *vuk;
digit_key_pair_list *pak;
digit_key_pair_list *tk;
//digit_key_pair_list *pak;
//digit_key_pair_list *tk;
digit_key_pair_list *uk;
};
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment