From 7ab5ec8b40e7957343d4dd7f28e4074633255744 Mon Sep 17 00:00:00 2001
From: lwvmobile <lwvmobile@gmail.com>
Date: Sun, 6 Apr 2025 21:00:57 -0400
Subject: [PATCH] DMR: Fix More Lingering DMRA PI lfsr128 Mismatch Issues due
 to int to ulli conversion errors;

---
 src/dmr_pi.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/dmr_pi.c b/src/dmr_pi.c
index 3d98e9c..c938581 100644
--- a/src/dmr_pi.c
+++ b/src/dmr_pi.c
@@ -364,9 +364,11 @@ void LFSR128d(dsd_state * state)
 
   //assign the next 32-bit short MI from 4,5,6,7 so it'll match up with OTA late entry
   if (state->currentslot == 0)
-    next_mi = (state->aes_iv[4] << 24) + (state->aes_iv[5] << 16) + (state->aes_iv[6] << 8) + (state->aes_iv[7] << 0);
+    next_mi = ((unsigned long long int)state->aes_iv[4] << 24) | ((unsigned long long int)state->aes_iv[5] << 16) | 
+              ((unsigned long long int)state->aes_iv[6] << 8)  | ((unsigned long long int)state->aes_iv[7] << 0);
   if (state->currentslot == 1)
-    next_mi = (state->aes_ivR[4] << 24) + (state->aes_ivR[5] << 16) + (state->aes_ivR[6] << 8) + (state->aes_ivR[7] << 0);
+    next_mi = ((unsigned long long int)state->aes_ivR[4] << 24) | ((unsigned long long int)state->aes_ivR[5] << 16) | 
+              ((unsigned long long int)state->aes_ivR[6] << 8)  | ((unsigned long long int)state->aes_ivR[7] << 0);
 
   if (state->currentslot == 0)
   {