From 9a31678d9ac9532de923ba8c8f2e272a6f811175 Mon Sep 17 00:00:00 2001 From: lwvmobile Date: Fri, 25 Aug 2023 09:12:51 -0400 Subject: [PATCH] Fix M17 Enc Type Values; --- src/dsd_ncurses.c | 4 ++-- src/m17.c | 7 +++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/dsd_ncurses.c b/src/dsd_ncurses.c index cff8635..2b4c000 100644 --- a/src/dsd_ncurses.c +++ b/src/dsd_ncurses.c @@ -2524,12 +2524,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 diff --git a/src/m17.c b/src/m17.c index b01dc1a..1822220 100644 --- a/src/m17.c +++ b/src/m17.c @@ -178,8 +178,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"); @@ -188,8 +186,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;