Commit 4e9d7470 authored by npzacs's avatar npzacs
Browse files

Failing title hash calculation is fatal. We need either the keys from that...

Failing title hash calculation is fatal. We need either the keys from that file or hash for config file.
parent 8b2c68d0
......@@ -450,7 +450,7 @@ static int _verify_ts(uint8_t *buf, size_t size)
}
/* Function that collects keys from keydb config entry */
static void _find_config_entry(AACS *aacs, const char *path)
static void _find_config_entry(AACS *aacs)
{
uint8_t discid[20];
char str[48];
......@@ -458,10 +458,6 @@ static void _find_config_entry(AACS *aacs, const char *path)
aacs->uks = NULL;
aacs->num_uks = 0;
if (!_calc_title_hash(path, aacs->disc_id)) {
return;
}
if (aacs->cf && aacs->cf->list) {
aacs->ce = aacs->cf->list;
while (aacs->ce && aacs->ce->entry.discid) {
......@@ -611,9 +607,14 @@ AACS *aacs_open(const char *path, const char *configfile_path)
AACS *aacs = calloc(1, sizeof(AACS));
if (!_calc_title_hash(path, aacs->disc_id)) {
aacs_close(aacs);
return NULL;
}
if (_load_config(aacs, configfile_path)) {
DEBUG(DBG_AACS, "Searching for keydb config entry...\n");
_find_config_entry(aacs, path);
_find_config_entry(aacs);
DEBUG(DBG_AACS, "Starting AACS waterfall...\n");
if (_calc_uks(aacs, path)) {
......
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