From 6fd71766594a40623b42c87da07b255eaa9c974a Mon Sep 17 00:00:00 2001
From: lwvmobile <lwvmobile@gmail.com>
Date: Mon, 29 Jun 2026 16:18:31 -0400
Subject: [PATCH] MBE: Fixes and Tweaks on SDRTrunk .mbe files for NXDN
 Scrambler Key Loading; #298

---
 src/dsd_file.c | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/dsd_file.c b/src/dsd_file.c
index 9308a8a..4757bf3 100644
--- a/src/dsd_file.c
+++ b/src/dsd_file.c
@@ -1492,13 +1492,13 @@ void read_sdrtrunk_json_format (dsd_opts * opts, dsd_state * state)
 
         alg_id = state->forced_alg_id;
 
-        //TEST: Key Load Forced Scrambler Key by TGT or SRC value?
+        //Key Load Forced Scrambler Key by TGT or SRC value
         if (state->forced_alg_id == 1 && state->keyloader == 1)
         {
           if (state->rkey_array[target] != 0)
-            state->R = target;
+            state->R = state->rkey_array[target];
           else if (state->rkey_array[source] != 0)
-            state->R = source;
+            state->R = state->rkey_array[source];
         }
 
         if (alg_id == 1 && state->R != 0)
@@ -1654,6 +1654,19 @@ void read_sdrtrunk_json_format (dsd_opts * opts, dsd_state * state)
         if (state->keyloader == 1)
           keyring(opts, state);
 
+        //If Scrambler Key still not available on KID
+        if (state->R == 0)
+        {
+          //Key Load Scrambler Key by TGT or SRC value
+          if (state->forced_alg_id == 1 && state->keyloader == 1)
+          {
+            if (state->rkey_array[target] != 0)
+              state->R = state->rkey_array[target];
+            else if (state->rkey_array[source] != 0)
+              state->R = state->rkey_array[source];
+          }
+        }
+
         if (state->R != 0)
         {
           pdu_scrambler_keystream_creation(ks, state->R, 16*49);