mirror of
https://github.com/lwvmobile/dsd-fme.git
synced 2026-11-16 18:57:24 -05:00
Add More Options
Serpen'tera' Privacy now supports 10/32/64 character modes (have to use ncurses terminal to enter 32 or 64 char values) NXDN Scrambler LFSR Odd and End Terminal Tweaks
This commit is contained in:
@@ -206,10 +206,10 @@ char *choices[] = {
|
||||
"Decode NXDN96",
|
||||
"Decode X2-TDMA*",
|
||||
"Toggle Signal Inversion",
|
||||
"Privacy Key Entry", //spacer
|
||||
"Privacy Key Entry",
|
||||
"Reset Call History",
|
||||
"Enable Payloads to Console",
|
||||
"Disable Payloads to Console",
|
||||
"Toggle Payloads to Console",
|
||||
" ", //spacer
|
||||
"Input & Output Options",
|
||||
"LRRP Data to File",
|
||||
"Exit DSD-FME",
|
||||
@@ -802,16 +802,15 @@ void ncursesMenu (dsd_opts * opts, dsd_state * state)
|
||||
{
|
||||
state->payload_keyid = 0;
|
||||
state->payload_keyidR = 0;
|
||||
// state->K = 0;
|
||||
// state->H = 0;
|
||||
short int option = 0;
|
||||
entry_win = newwin(9, WIDTH+6, starty+10, startx+10);
|
||||
entry_win = newwin(10, WIDTH+6, starty+10, startx+10);
|
||||
box (entry_win, 0, 0);
|
||||
mvwprintw(entry_win, 2, 2, "Key Type Selection");
|
||||
mvwprintw(entry_win, 3, 2, " ");
|
||||
mvwprintw(entry_win, 4, 2, "1 - DMRA Privacy ");
|
||||
mvwprintw(entry_win, 5, 2, "2 - 'Tera Privacy ");
|
||||
mvwprintw(entry_win, 6, 3, " ");
|
||||
mvwprintw(entry_win, 4, 2, "1 - DMRA Privacy ");
|
||||
mvwprintw(entry_win, 5, 2, "2 - **tera Privacy ");
|
||||
mvwprintw(entry_win, 6, 2, "3 - NXDN Scrambler ");
|
||||
mvwprintw(entry_win, 7, 3, " ");
|
||||
echo();
|
||||
refresh();
|
||||
wscanw(entry_win, "%d", &option);
|
||||
@@ -820,6 +819,7 @@ void ncursesMenu (dsd_opts * opts, dsd_state * state)
|
||||
opts->dmr_mute_encR = 0;
|
||||
if (option == 1)
|
||||
{
|
||||
state->K = 0;
|
||||
entry_win = newwin(6, WIDTH+6, starty+10, startx+10);
|
||||
box (entry_win, 0, 0);
|
||||
mvwprintw(entry_win, 2, 2, "DMRA Privacy Key Number (DEC):");
|
||||
@@ -835,21 +835,71 @@ void ncursesMenu (dsd_opts * opts, dsd_state * state)
|
||||
}
|
||||
if (option == 2)
|
||||
{
|
||||
entry_win = newwin(6, WIDTH+6, starty+10, startx+10);
|
||||
state->K1 = 0;
|
||||
state->K2 = 0;
|
||||
state->K3 = 0;
|
||||
state->K4 = 0;
|
||||
state->H = 0;
|
||||
|
||||
entry_win = newwin(7, WIDTH+6, starty+10, startx+10);
|
||||
box (entry_win, 0, 0);
|
||||
mvwprintw(entry_win, 2, 2, "'Tera 10 Key Value (HEX):");
|
||||
mvwprintw(entry_win, 3, 3, " ");
|
||||
mvwprintw(entry_win, 2, 2, " Enter **tera BP Key Value (HEX) ");
|
||||
mvwprintw(entry_win, 3, 2, " 10 Char or First 16 for 32/64");
|
||||
mvwprintw(entry_win, 4, 3, " ");
|
||||
echo();
|
||||
refresh();
|
||||
wscanw(entry_win, "%llX", &state->H);
|
||||
noecho();
|
||||
if (state->H > 0xFFFFFFFFFF)
|
||||
state->K1 = state->H;
|
||||
|
||||
entry_win = newwin(7, WIDTH+6, starty+10, startx+10);
|
||||
box (entry_win, 0, 0);
|
||||
mvwprintw(entry_win, 2, 2, " Enter **tera BP Key Value 2 (HEX) ");
|
||||
mvwprintw(entry_win, 3, 2, " Second 16 Chars or Zero");
|
||||
mvwprintw(entry_win, 4, 3, " ");
|
||||
echo();
|
||||
refresh();
|
||||
wscanw(entry_win, "%llX", &state->K2);
|
||||
noecho();
|
||||
|
||||
entry_win = newwin(7, WIDTH+6, starty+10, startx+10);
|
||||
box (entry_win, 0, 0);
|
||||
mvwprintw(entry_win, 2, 2, " Enter **tera BP Key Value 3 (HEX) ");
|
||||
mvwprintw(entry_win, 3, 2, " Third 16 Chars or Zero");
|
||||
mvwprintw(entry_win, 4, 3, " ");
|
||||
echo();
|
||||
refresh();
|
||||
wscanw(entry_win, "%llX", &state->K3);
|
||||
noecho();
|
||||
|
||||
entry_win = newwin(7, WIDTH+6, starty+10, startx+10);
|
||||
box (entry_win, 0, 0);
|
||||
mvwprintw(entry_win, 2, 2, " Enter **tera BP Key Value 4 (HEX) ");
|
||||
mvwprintw(entry_win, 3, 2, " Fourth 16 Chars or Zero");
|
||||
mvwprintw(entry_win, 4, 3, " ");
|
||||
echo();
|
||||
refresh();
|
||||
wscanw(entry_win, "%llX", &state->K4);
|
||||
noecho();
|
||||
|
||||
}
|
||||
if (option == 3)
|
||||
{
|
||||
state->R = 0;
|
||||
entry_win = newwin(6, WIDTH+6, starty+10, startx+10);
|
||||
box (entry_win, 0, 0);
|
||||
mvwprintw(entry_win, 2, 2, "NXDN Scrambler Key Value (DEC):");
|
||||
mvwprintw(entry_win, 3, 3, " ");
|
||||
echo();
|
||||
refresh();
|
||||
wscanw(entry_win, "%lld", &state->R);
|
||||
noecho();
|
||||
if (state->K > 0x7FFF)
|
||||
{
|
||||
state->H = 0xFFFFFFFFFF;
|
||||
state->K = 0x7FFF;
|
||||
}
|
||||
}
|
||||
|
||||
if (state->K == 0 && state->H == 0)
|
||||
if (state->K == 0 && state->K1 == 0)
|
||||
{
|
||||
opts->dmr_mute_encL = 1;
|
||||
opts->dmr_mute_encR = 1;
|
||||
@@ -1156,15 +1206,22 @@ void ncursesMenu (dsd_opts * opts, dsd_state * state)
|
||||
}
|
||||
}
|
||||
|
||||
if (choice == 15) //turn on payload printing
|
||||
if (choice == 15) //toggle payload printing
|
||||
{
|
||||
opts->payload = 1;
|
||||
fprintf(stderr, "Payload on\n");
|
||||
if (opts->payload == 0)
|
||||
{
|
||||
opts->payload = 1;
|
||||
fprintf(stderr, "Payload on\n");
|
||||
}
|
||||
else
|
||||
{
|
||||
opts->payload = 0;
|
||||
fprintf(stderr, "Payload Off\n");
|
||||
}
|
||||
}
|
||||
if (choice == 16) //turn off payload printing
|
||||
if (choice == 16)
|
||||
{
|
||||
opts->payload = 0;
|
||||
fprintf(stderr, "Payload Off\n");
|
||||
|
||||
}
|
||||
if (choice == 18)
|
||||
{
|
||||
@@ -1746,6 +1803,14 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state)
|
||||
printw ("Scrambler ");
|
||||
attroff(COLOR_PAIR(2));
|
||||
attron(COLOR_PAIR(3));
|
||||
if (state->R != 0)
|
||||
{
|
||||
//printw ("\n| ");
|
||||
attron(COLOR_PAIR(1));
|
||||
printw ("KEY VALUE: [%05lld] ", state->R );
|
||||
printw ("SEED: [%04llX]", state->payload_miN);
|
||||
attron(COLOR_PAIR(3));
|
||||
}
|
||||
}
|
||||
if (state->nxdn_cipher_type == 0x2 && state->carrier == 1)
|
||||
{
|
||||
@@ -1855,7 +1920,7 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state)
|
||||
if(state->dmrburstL == 16 && state->payload_algid == 0 && state->H > 0 && state->dmr_fid == 0x68 && ((state->dmr_so & 0xCF) == 0x40) )
|
||||
{
|
||||
attron(COLOR_PAIR(1));
|
||||
printw ("**'Tera Pr Key [%010llX] ", state->H);
|
||||
printw ("**tera Pr Key [%010llX] ", state->H);
|
||||
attroff(COLOR_PAIR(1));
|
||||
attron(COLOR_PAIR(3));
|
||||
}
|
||||
@@ -1963,7 +2028,7 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state)
|
||||
if(state->dmrburstR == 16 && state->payload_algidR == 0 && state->H > 0 && ((state->dmr_soR & 0xCF) == 0x40) && state->dmr_fidR == 0x68)
|
||||
{
|
||||
attron(COLOR_PAIR(1));
|
||||
printw ("**'Tera Pr Key [%010llX] ", state->H);
|
||||
printw ("**tera Pr Key [%010llX] ", state->H);
|
||||
attroff(COLOR_PAIR(1));
|
||||
attron(COLOR_PAIR(3));
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user