From 4924bd249a02fe5d41e717a83ce5e7889bf006c6 Mon Sep 17 00:00:00 2001 From: lwvmobile Date: Mon, 5 Jan 2026 12:56:07 -0500 Subject: [PATCH] Remove Remnants of ITPP; #331 Tweaks to Decrypted MBE Playback; #298 #329 --- cyg_portable.sh | 4 ---- examples/Install_Notes.md | 2 +- src/dsd_file.c | 17 ++++++++++++++++- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/cyg_portable.sh b/cyg_portable.sh index 1706a7f..3f8a7fb 100644 --- a/cyg_portable.sh +++ b/cyg_portable.sh @@ -61,10 +61,6 @@ if [ "$RELEASE" = "y" ]; then #start copying things to the lib folder cp -r /lib/pulseaudio/ dsd-fme-portable/lib/ - #support for LAPACK, BLAS, and FFTW3 (SIMD math libraries and dependencies) - cp /lib/lapack/* dsd-fme-portable/dsd-fme/ - cp /bin/cyggfortran* dsd-fme-portable/dsd-fme/ - #start copying things into the dsd-fme folder cp dsd-fme/build/dsd-fme.exe dsd-fme-portable/dsd-fme/ cp -r dsd-fme/examples dsd-fme-portable/dsd-fme/ diff --git a/examples/Install_Notes.md b/examples/Install_Notes.md index f611ebf..6e30c6b 100644 --- a/examples/Install_Notes.md +++ b/examples/Install_Notes.md @@ -116,7 +116,7 @@ Open Windows PowerShell (not Command Prompt) and copy and paste all of this in a ``` Invoke-WebRequest https://cygwin.com/setup-x86_64.exe -OutFile setup-x86_64.exe -.\setup-x86_64.exe --packages nano,libpulse-devel,libpulse-mainloop-glib0,libpulse-simple0,libpulse0,pulseaudio,pulseaudio-debuginfo,pulseaudio-equalizer,pulseaudio-module-x11,pulseaudio-module-zeroconf,pulseaudio-utils,sox-fmt-pulseaudio,libusb0,libusb1.0,libusb1.0-debuginfo,libusb1.0-devel,libncurses++w10,libncurses-devel,libncursesw10,ncurses,cmake,gcc-core,gcc-debuginfo,gcc-objc,git,make,socat,sox,sox-fmt-ao,zip,unzip,wget,gcc-g++,libsndfile-devel,libopenblas,liblapack-devel,libfftw3-devel +.\setup-x86_64.exe --packages nano,libpulse-devel,libpulse-mainloop-glib0,libpulse-simple0,libpulse0,pulseaudio,pulseaudio-debuginfo,pulseaudio-equalizer,pulseaudio-module-x11,pulseaudio-module-zeroconf,pulseaudio-utils,sox-fmt-pulseaudio,libusb0,libusb1.0,libusb1.0-debuginfo,libusb1.0-devel,libncurses++w10,libncurses-devel,libncursesw10,ncurses,cmake,gcc-core,gcc-debuginfo,gcc-objc,git,make,socat,sox,sox-fmt-ao,zip,unzip,wget,gcc-g++,libsndfile-devel ``` diff --git a/src/dsd_file.c b/src/dsd_file.c index 10ddd2a..04c223f 100644 --- a/src/dsd_file.c +++ b/src/dsd_file.c @@ -1235,6 +1235,16 @@ void read_sdrtrunk_json_format (dsd_opts * opts, dsd_state * state) state->synctype = -1; state->lastsynctype = -1; + //reset encryption variables + state->payload_mi = 0; + state->payload_algid = 0; + state->payload_keyid = 0; + if (state->keyloader == 1) + { + state->R = 0; + state->aes_key_loaded[0] = 0; + } + //watchdog for event history watchdog_event_history(opts, state, 0); watchdog_event_current(opts, state, 0); @@ -1397,7 +1407,12 @@ void read_sdrtrunk_json_format (dsd_opts * opts, dsd_state * state) rc4_db = 256; rc4_mod = 9; - if (alg_id == 0x21 && state->R != 0) + //since we can't keyring on a forced alg, we can perhaps look it up + //via the TO field for the TG value, as long as it isn't greated than 0x1FFFF (upper bound of the array) + if (state->keyloader == 1 && state->lasttg != 0 && state->lasttg < 0x1FFFF && state->rkey_array[state->lasttg] != 0) + state->R = state->rkey_array[state->lasttg]; + + if (alg_id == 0x21 && state->R != 0 && state->payload_mi != 0) { //test when we don't have an encryption_mi in the .mbe file for DMR