mirror of
https://github.com/lwvmobile/dsd-fme.git
synced 2026-11-15 02:07:24 -05:00
Event History Setup: #287
Include a simple sh file to startup dsd-fme with opts line, and open log files for multi linux terminal support; Fix bug with P25p1 MPDU Trunking Blocks setting address values to trigger event history watchdog; Add an internal string into event history to log internal events of note (ENC LO, errors, etc); Add a watchdog during any ENC LO event so the event_history will log the call with ENC LO; Disable AHOY and RSP PDU's from Event History (clogs up the event history with extra info); Fix DMR p_clear trigger to zero out src and tg values when tuning away; Fix Hytera Enhanced RC4 (verified working); Misc Tweaks Regarding;
This commit is contained in:
@@ -88,8 +88,8 @@ void rc4_block_output (int drop, int keylen, int meslen, uint8_t * key, uint8_t
|
||||
|
||||
}
|
||||
|
||||
//NOTE: This has not been verified to work properly
|
||||
//NOTE: This is for Hytera Enhanced RC4, if AES, this will not work
|
||||
//This is now verified to work after changing the drop byte value from 256 to 0.
|
||||
//also, had to change the application to not skip the additional 7 bits like DMRA or P25 does.
|
||||
void hytera_enhanced_rc4_setup(dsd_opts * opts, dsd_state * state, unsigned long long int key_value, unsigned long long int mi_value)
|
||||
{
|
||||
|
||||
@@ -119,7 +119,8 @@ void hytera_enhanced_rc4_setup(dsd_opts * opts, dsd_state * state, unsigned long
|
||||
ks_octets = state->ks_octetL;
|
||||
else ks_octets = state->ks_octetR;
|
||||
|
||||
rc4_block_output(256, 5, 135, key, ks);
|
||||
//NOTE: Drop Byte value is 0
|
||||
rc4_block_output(0, 5, 135, key, ks);
|
||||
|
||||
for (int i = 0; i < 5; i++)
|
||||
kiv[i] = key[i] ^ mi[i];
|
||||
|
||||
Reference in New Issue
Block a user