GitHub/dsd-fme
1
0
Fork 0
mirror of https://github.com/lwvmobile/dsd-fme.git synced 2026-11-12 08:47:24 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix M17 Enc Type Values;

Browse Source
This commit is contained in:
lwvmobile
2023-08-25 09:11:18 -04:00
parent 53617bd366
commit cd476bb463
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/dsd_ncurses.c
View File

@@ -2566,12 +2566,12 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state)
//fill in any extra info, like Meta (IV, etc)
if (state->m17_enc == 2)
if (state->m17_enc == 1)
{
printw (" Scrambler - Type: %d", state->m17_enc_st);
}
if (state->m17_enc == 1)
if (state->m17_enc == 2)
{
printw (" AES-CTR - IV: ");
//display packed meta as IV

7
src/m17.c
View File

@@ -157,8 +157,6 @@ void M17decodeLSF(dsd_state * state)
fprintf (stderr, " CAN: %d", lsf_cn);
M17decodeCSD(state, lsf_dst, lsf_src);
if (lsf_et != 0) fprintf (stderr, " ENC");
if (lsf_dt == 0) fprintf (stderr, " Reserved");
if (lsf_dt == 1) fprintf (stderr, " Data");
@@ -167,8 +165,9 @@ void M17decodeLSF(dsd_state * state)
if (lsf_rs != 0) fprintf (stderr, " RS: %02X", lsf_rs);
if (lsf_et == 1) fprintf (stderr, " AES-CTR");
if (lsf_et == 2) fprintf (stderr, " Scrambler - %d", lsf_es);
if (lsf_et != 0) fprintf (stderr, " ENC:");
if (lsf_et == 2) fprintf (stderr, " AES-CTR");
if (lsf_et == 1) fprintf (stderr, " Scrambler - %d", lsf_es);
state->m17_enc = lsf_et;
state->m17_enc_st = lsf_es;