mirror of
https://github.com/lwvmobile/dsd-fme.git
synced 2026-11-21 05:05:38 -05:00
MBE: Fixes and Tweaks on SDRTrunk .mbe files for NXDN Scrambler Key Loading; #298
This commit is contained in:
@@ -1492,13 +1492,13 @@ void read_sdrtrunk_json_format (dsd_opts * opts, dsd_state * state)
|
|||||||
|
|
||||||
alg_id = state->forced_alg_id;
|
alg_id = state->forced_alg_id;
|
||||||
|
|
||||||
//TEST: Key Load Forced Scrambler Key by TGT or SRC value?
|
//Key Load Forced Scrambler Key by TGT or SRC value
|
||||||
if (state->forced_alg_id == 1 && state->keyloader == 1)
|
if (state->forced_alg_id == 1 && state->keyloader == 1)
|
||||||
{
|
{
|
||||||
if (state->rkey_array[target] != 0)
|
if (state->rkey_array[target] != 0)
|
||||||
state->R = target;
|
state->R = state->rkey_array[target];
|
||||||
else if (state->rkey_array[source] != 0)
|
else if (state->rkey_array[source] != 0)
|
||||||
state->R = source;
|
state->R = state->rkey_array[source];
|
||||||
}
|
}
|
||||||
|
|
||||||
if (alg_id == 1 && state->R != 0)
|
if (alg_id == 1 && state->R != 0)
|
||||||
@@ -1654,6 +1654,19 @@ void read_sdrtrunk_json_format (dsd_opts * opts, dsd_state * state)
|
|||||||
if (state->keyloader == 1)
|
if (state->keyloader == 1)
|
||||||
keyring(opts, state);
|
keyring(opts, state);
|
||||||
|
|
||||||
|
//If Scrambler Key still not available on KID
|
||||||
|
if (state->R == 0)
|
||||||
|
{
|
||||||
|
//Key Load Scrambler Key by TGT or SRC value
|
||||||
|
if (state->forced_alg_id == 1 && state->keyloader == 1)
|
||||||
|
{
|
||||||
|
if (state->rkey_array[target] != 0)
|
||||||
|
state->R = state->rkey_array[target];
|
||||||
|
else if (state->rkey_array[source] != 0)
|
||||||
|
state->R = state->rkey_array[source];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (state->R != 0)
|
if (state->R != 0)
|
||||||
{
|
{
|
||||||
pdu_scrambler_keystream_creation(ks, state->R, 16*49);
|
pdu_scrambler_keystream_creation(ks, state->R, 16*49);
|
||||||
|
|||||||
Reference in New Issue
Block a user