DMR: Add -M option to allow forcing any algid value;

Remove Setting from DMR_LE and place in MBE section instead;

Change state->M to state->forced_alg_id to make it easier to find later;
This commit is contained in:
lwvmobile
2025-10-31 09:41:10 -04:00
parent 14edf325bc
commit eb76ea2039
11 changed files with 68 additions and 62 deletions

View File

@@ -921,11 +921,11 @@ void ncursesMenu (dsd_opts * opts, dsd_state * state)
//toggle enforcement of basic privacy key over enc bit set on traffic
if (option == 4)
{
if (state->M == 1 || state->M == 0x21)
if (state->forced_alg_id == 1 || state->forced_alg_id == 0x21)
{
state->M = 0;
state->forced_alg_id = 0;
}
else state->M = 1;
else state->forced_alg_id = 1;
}
if (option == 5)
@@ -951,11 +951,11 @@ void ncursesMenu (dsd_opts * opts, dsd_state * state)
//toggle enforcement of rc4 key over missing pi header/le on DMR
// if (option == 6)
// {
// if (state->M == 1 || state->M == 0x21)
// if (state->forced_alg_id == 1 || state->forced_alg_id == 0x21)
// {
// state->M = 0;
// state->forced_alg_id = 0;
// }
// else state->M = 0x21;
// else state->forced_alg_id = 0x21;
// }
//load AES keys