Fix Keyring Loader to allow KeyID of 0 (P25);

This commit is contained in:
lwvmobile
2023-09-10 21:01:16 -04:00
parent 56b27dd055
commit 9696042156

View File

@@ -201,10 +201,10 @@ processMbeFrame (dsd_opts * opts, dsd_state * state, char imbe_fr[8][23], char a
int x; int x;
//these conditions should ensure no clashing with the BP/HBP/Scrambler key loading machanisms already coded in //these conditions should ensure no clashing with the BP/HBP/Scrambler key loading machanisms already coded in
if (state->currentslot == 0 && state->payload_algid != 0 && state->payload_algid != 0x80 && state->payload_keyid != 0 && state->keyloader == 1) if (state->currentslot == 0 && state->payload_algid != 0 && state->payload_algid != 0x80 && state->keyloader == 1)
keyring (opts, state); keyring (opts, state);
if (state->currentslot == 1 && state->payload_algidR != 0 && state->payload_algidR != 0x80 && state->payload_keyidR != 0 && state->keyloader == 1) if (state->currentslot == 1 && state->payload_algidR != 0 && state->payload_algidR != 0x80 && state->keyloader == 1)
keyring (opts, state); keyring (opts, state);
//24-bit TG to 16-bit hash //24-bit TG to 16-bit hash