M17_Project
/
gr-m17
mirror of https://github.com/M17-Project/gr-m17.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #18 from jmfriedt/main 

API and submodule version update
main
Wojciech Kaczmarski 2025-06-07 10:04:04 +02:00 committed by GitHub
parent 508c77c96e 533cfdda3c
commit 92474f4435
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 93 additions and 234 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
M17_Implementations

@ -1 +1 @@
Subproject commit 63fab5c092ef55c59806c460d6c60a41df4f597f Subproject commit 527432a2ea9e6cb587029fcb1f220c8542d13da4

232
lib/m17_coder_impl.cc
View File

@ -95,15 +95,9 @@ namespace gr
memset (_key, 0, 32 * sizeof (uint8_t)); memset (_key, 0, 32 * sizeof (uint8_t));
memset (_iv, 0, 16 * sizeof (uint8_t)); memset (_iv, 0, 16 * sizeof (uint8_t));
#endif #endif
if (_encr_type == ENCR_AES)
{
set_key (key); // read key
*((int32_t *) & _iv[0]) = (uint32_t) time (NULL) - (uint32_t) epoch; //timestamp
for (uint8_t i = 4; i < 4 + 10; i++)
_iv[i] = 0; //10 random bytes TODO: replace with a rand() or pass through an additional arg
}
message_port_register_in(pmt::mp("end_of_transmission")); message_port_register_in(pmt::mp("end_of_transmission"));
set_msg_handler(pmt::mp("end_of_transmission"), [this](const pmt::pmt_t& msg) { end_of_transmission(msg); }); set_msg_handler(pmt::mp("end_of_transmission"), [this](const pmt::pmt_t& msg) { end_of_transmission(msg); });
_init_frame=true;
} }
void m17_coder_impl::end_of_transmission(const pmt::pmt_t& msg) void m17_coder_impl::end_of_transmission(const pmt::pmt_t& msg)
@ -115,10 +109,10 @@ namespace gr
void m17_coder_impl::set_encr_type (int encr_type) void m17_coder_impl::set_encr_type (int encr_type)
{ {
switch (encr_type) switch (encr_type)
{case 0:_encr_type=ENCR_NONE;break; {case 0:_encr_type=ENCR_NONE; break;
case 1:_encr_type=ENCR_SCRAM;break; case 1:_encr_type=ENCR_SCRAM;break;
case 2:_encr_type=ENCR_AES;break; case 2:_encr_type=ENCR_AES; break;
case 3:_encr_type=ENCR_RES;break; case 3:_encr_type=ENCR_RES; break;
default:_encr_type=ENCR_NONE; default:_encr_type=ENCR_NONE;
} }
printf ("new encr type: %x -> ", _encr_type); printf ("new encr type: %x -> ", _encr_type);
@ -546,12 +540,37 @@ namespace gr
uint8_t data[16], next_data[16]; //raw payload, packed bits uint8_t data[16], next_data[16]; //raw payload, packed bits
if (_init_frame==true)
{
if(_encr_type==ENCR_AES)
{
for(uint8_t i=0; i<4; i++)
_iv[i] = ((uint32_t)(time(NULL)&0xFFFFFFFF)-(uint32_t)epoch) >> (24-(i*8));
for(uint8_t i=3; i<14; i++)
_iv[i] = rand() & 0xFF; //10 random bytes
}
gen_preamble(out, &countout, PREAM_LSF); //0 - LSF preamble, as opposed to 1 - BERT preamble
if(_encr_type==ENCR_AES)
{
memcpy(&(_lsf.meta), _iv, 14);
_iv[14] = (_fn >> 8) & 0x7F;
_iv[15] = (_fn >> 0) & 0xFF;
//re-calculate LSF CRC with IV insertion
uint16_t ccrc=LSF_CRC(&_lsf);
_lsf.crc[0]=ccrc>>8;
_lsf.crc[1]=ccrc&0xFF;
}
_init_frame=false;
} // end of init frame
while ((countout < (uint32_t) noutput_items) && (countin + 16 <= noutput_items)) while ((countout < (uint32_t) noutput_items) && (countin + 16 <= noutput_items))
{ {
if (!_got_lsf) //stream frames if (!_got_lsf) //stream frames
{ {
//send LSF syncword //send LSF syncword
send_syncword (out, &countout, SYNC_LSF); gen_syncword (out, &countout, SYNC_LSF);
//encode LSF data //encode LSF data
conv_encode_LSF (enc_bits, &_lsf); conv_encode_LSF (enc_bits, &_lsf);
@ -563,7 +582,7 @@ namespace gr
randomize_bits (rf_bits); randomize_bits (rf_bits);
//send LSF data //send LSF data
send_data (out, &countout, rf_bits); gen_data (out, &countout, rf_bits);
//check the SIGNED STREAM flag //check the SIGNED STREAM flag
_signed_str = (_lsf.type[0] >> 3) & 1; _signed_str = (_lsf.type[0] >> 3) & 1;
@ -572,178 +591,7 @@ namespace gr
_got_lsf = 1; _got_lsf = 1;
} }
if (_debug == true) if (countin + 16 < noutput_items)
{
//destination set to "ALL"
memset (_next_lsf.dst, 0xFF, 6 * sizeof (uint8_t));
//source set to "N0CALL"
_next_lsf.src[0] = 0x00;
_next_lsf.src[1] = 0x00;
_next_lsf.src[2] = 0x4B;
_next_lsf.src[3] = 0x13;
_next_lsf.src[4] = 0xD1;
_next_lsf.src[5] = 0x06;
if (_encr_type == ENCR_AES) //AES ENC, 3200 voice
{
_next_lsf.type[0] = 0x03;
_next_lsf.type[1] = 0x95;
}
else if (_encr_type == ENCR_SCRAM) //Scrambler ENC, 3200 Voice
{
_next_lsf.type[0] = 0x00;
_next_lsf.type[1] = 0x00;
if (_scrambler_subtype == 0)
_next_lsf.type[1] = 0x0D;
else if (_scrambler_subtype == 1)
_next_lsf.type[1] = 0x2D;
else if (_scrambler_subtype == 2)
_next_lsf.type[1] = 0x4D;
}
else //no enc or subtype field, normal 3200 voice
{
_next_lsf.type[0] = 0x00;
_next_lsf.type[1] = 0x05;
}
//a signature key is loaded, OR this bit
if (_priv_key_loaded == true)
_next_lsf.type[0] |= 0x8;
_finished = false;
memset (next_data, 0, sizeof (next_data));
memcpy (data, next_data, sizeof (data));
// if (_fn == 60)
// _finished = true;
//debug sig with random payloads (don't play the audio)
for (uint8_t i = 0; i < 16; i++)
data[i] = 0x69; //rand() & 0xFF;
}
/*
//TODO: pass some of these through arguments?
//read data
dummy=fread(&(lsf.dst), 6, 1, stdin);
dummy=fread(&(lsf.src), 6, 1, stdin);
dummy=fread(&(lsf.type), 2, 1, stdin);
dummy=fread(&(lsf.meta), 14, 1, stdin);
dummy=fread(data, 16, 1, stdin);
*/
if (countin + 16 <= noutput_items)
{
for (int i = 0; i < 16; i++)
{
data[i] = in[countin];
countin++;
}
}
//AES encryption enabled - use 112 bits of IV
if (_encr_type == ENCR_AES)
{
memcpy (&(_lsf.meta), _iv, 14);
_iv[14] = (_fn >> 8) & 0x7F;
_iv[15] = (_fn >> 0) & 0xFF;
//re-calculate LSF CRC with IV insertion
uint16_t ccrc = LSF_CRC (&_lsf);
_lsf.crc[0] = ccrc >> 8;
_lsf.crc[1] = ccrc & 0xFF;
}
// while (_finished == false)
{
if (!_got_lsf)
{ //debug
//fprintf(stderr, "LSF\n");
//send LSF syncword
send_syncword (out, &countout, SYNC_LSF);
//encode LSF data
conv_encode_LSF (enc_bits, &_lsf);
//reorder bits
reorder_bits (rf_bits, enc_bits);
//randomize
randomize_bits (rf_bits);
//send LSF data
send_data (out, &countout, rf_bits);
//check the SIGNED STREAM flag
_signed_str = (_lsf.type[0] >> 3) & 1;
//set the flag
_got_lsf = 1;
}
if (_debug == true)
{
//destination set to "ALL"
memset (_next_lsf.dst, 0xFF, 6 * sizeof (uint8_t));
//source set to "N0CALL"
_next_lsf.src[0] = 0x00;
_next_lsf.src[1] = 0x00;
_next_lsf.src[2] = 0x4B;
_next_lsf.src[3] = 0x13;
_next_lsf.src[4] = 0xD1;
_next_lsf.src[5] = 0x06;
if (_encr_type == ENCR_AES) //AES ENC, 3200 voice
{
_next_lsf.type[0] = 0x03;
_next_lsf.type[1] = 0x95;
}
else if (_encr_type == ENCR_SCRAM) //Scrambler ENC, 3200 Voice
{
_next_lsf.type[0] = 0x00;
_next_lsf.type[1] = 0x00;
if (_scrambler_subtype == 0)
_next_lsf.type[1] = 0x0D;
else if (_scrambler_subtype == 1)
_next_lsf.type[1] = 0x2D;
else if (_scrambler_subtype == 2)
_next_lsf.type[1] = 0x4D;
}
else //no enc or subtype field, normal 3200 voice
{
_next_lsf.type[0] = 0x00;
_next_lsf.type[1] = 0x05;
}
//a signature key is loaded, OR this bit
if (_priv_key_loaded == true)
_next_lsf.type[0] |= 0x8;
_finished = false;
memset (next_data, 0, sizeof (next_data));
memcpy (data, next_data, sizeof (data));
if (_fn == 60)
_finished = 1;
//debug sig with random payloads (don't play the audio)
for (uint8_t i = 0; i < 16; i++)
data[i] = 0x69; //rand() & 0xFF;
} // end of debug==true
else
{
/*
//check if theres any more data
if(fread(&(next_lsf.dst), 6, 1, stdin)<1) finished=1;
if(fread(&(next_lsf.src), 6, 1, stdin)<1) finished=1;
if(fread(&(next_lsf.type), 2, 1, stdin)<1) finished=1;
if(fread(&(next_lsf.meta), 14, 1, stdin)<1) finished=1;
if(fread(next_data, 16, 1, stdin)<1) _finished=true;
*/
if (countin + 16 <= noutput_items)
{ {
for (int i = 0; i < 16; i++) for (int i = 0; i < 16; i++)
{ {
@ -751,7 +599,6 @@ namespace gr
countin++; countin++;
} }
} }
}
//AES //AES
if (_encr_type == ENCR_AES) if (_encr_type == ENCR_AES)
@ -774,14 +621,14 @@ namespace gr
if (_finished == false) if (_finished == false)
{ {
send_syncword (out, &countout, SYNC_STR); gen_syncword (out, &countout, SYNC_STR);
extract_LICH (lich, _lich_cnt, &_lsf); extract_LICH (lich, _lich_cnt, &_lsf);
encode_LICH (lich_encoded, lich); encode_LICH (lich_encoded, lich);
unpack_LICH (enc_bits, lich_encoded); unpack_LICH (enc_bits, lich_encoded);
conv_encode_stream_frame (&enc_bits[96], data, _fn); conv_encode_stream_frame (&enc_bits[96], data, _fn);
reorder_bits (rf_bits, enc_bits); reorder_bits (rf_bits, enc_bits);
randomize_bits (rf_bits); randomize_bits (rf_bits);
send_data (out, &countout, rf_bits); gen_data (out, &countout, rf_bits);
_fn = (_fn + 1) % 0x8000; //increment FN _fn = (_fn + 1) % 0x8000; //increment FN
_lich_cnt = (_lich_cnt + 1) % 6; //continue with next LICH_CNT _lich_cnt = (_lich_cnt + 1) % 6; //continue with next LICH_CNT
@ -811,7 +658,7 @@ namespace gr
} }
else //send last frame(s) else //send last frame(s)
{ printf("Sending last frame\n"); { printf("Sending last frame\n");
send_syncword (out, &countout, SYNC_STR); gen_syncword (out, &countout, SYNC_STR);
extract_LICH (lich, _lich_cnt, &_lsf); extract_LICH (lich, _lich_cnt, &_lsf);
encode_LICH (lich_encoded, lich); encode_LICH (lich_encoded, lich);
unpack_LICH (enc_bits, lich_encoded); unpack_LICH (enc_bits, lich_encoded);
@ -822,7 +669,7 @@ namespace gr
conv_encode_stream_frame (&enc_bits[96], data, _fn); conv_encode_stream_frame (&enc_bits[96], data, _fn);
reorder_bits (rf_bits, enc_bits); reorder_bits (rf_bits, enc_bits);
randomize_bits (rf_bits); randomize_bits (rf_bits);
send_data (out, &countout, rf_bits); gen_data (out, &countout, rf_bits);
_lich_cnt = (_lich_cnt + 1) % 6; //continue with next LICH_CNT _lich_cnt = (_lich_cnt + 1) % 6; //continue with next LICH_CNT
//if we are done, and the stream is signed, so we need to transmit the signature (4 frames) //if we are done, and the stream is signed, so we need to transmit the signature (4 frames)
@ -844,7 +691,7 @@ namespace gr
_fn = 0x7FFC; //signature has to start at 0x7FFC to end at 0x7FFF (0xFFFF with EoT marker set) _fn = 0x7FFC; //signature has to start at 0x7FFC to end at 0x7FFF (0xFFFF with EoT marker set)
for (uint8_t i = 0; i < 4; i++) for (uint8_t i = 0; i < 4; i++)
{ {
send_syncword (out, &countout, SYNC_STR); gen_syncword (out, &countout, SYNC_STR);
extract_LICH (lich, _lich_cnt, &_lsf); extract_LICH (lich, _lich_cnt, &_lsf);
encode_LICH (lich_encoded, lich); encode_LICH (lich_encoded, lich);
unpack_LICH (enc_bits, lich_encoded); unpack_LICH (enc_bits, lich_encoded);
@ -852,7 +699,7 @@ namespace gr
&_sig[i * 16], _fn); &_sig[i * 16], _fn);
reorder_bits (rf_bits, enc_bits); reorder_bits (rf_bits, enc_bits);
randomize_bits (rf_bits); randomize_bits (rf_bits);
send_data (out, &countout, rf_bits); gen_data (out, &countout, rf_bits);
_fn = _fn =
(_fn < 0x7FFE) ? _fn + 1 : (0x7FFF | 0x8000); (_fn < 0x7FFE) ? _fn + 1 : (0x7FFF | 0x8000);
_lich_cnt = (_lich_cnt + 1) % 6; //continue with next LICH_CNT _lich_cnt = (_lich_cnt + 1) % 6; //continue with next LICH_CNT
@ -871,10 +718,9 @@ namespace gr
} }
} }
//send EOT frame //send EOT frame
send_eot (out, &countout); gen_eot (out, &countout);
//fprintf(stderr, "Stream has ended. Exiting.\n"); //fprintf(stderr, "Stream has ended. Exiting.\n");
} // finished == true } // finished == true
} // finished == false
} // loop on input data } // loop on input data
// Tell runtime system how many input items we consumed on // Tell runtime system how many input items we consumed on
// each input stream. // each input stream.

2
lib/m17_coder_impl.h
View File

@ -62,7 +62,7 @@ namespace gr
bool _priv_key_loaded = false; //do we have a sig key loaded? bool _priv_key_loaded = false; //do we have a sig key loaded?
uint8_t _priv_key[32] = { 0 }; //private key uint8_t _priv_key[32] = { 0 }; //private key
uint8_t _sig[64] = { 0 }; //ECDSA signature uint8_t _sig[64] = { 0 }; //ECDSA signature
bool _init_frame;
#ifdef ECC #ifdef ECC
//Scrambler //Scrambler

91
lib/m17_decoder_impl.cc
View File

@ -545,6 +545,7 @@ namespace gr
scrambler_sequence_generator (); scrambler_sequence_generator ();
else if (_signed_str == false) //non-signed stream else if (_signed_str == false) //non-signed stream
scrambler_sequence_generator (); scrambler_sequence_generator ();
else memset(_scr_bytes, 0, sizeof(_scr_bytes)); // zero out stale scrambler bytes so they aren't applied to the sig frames
for (uint8_t i = 0; i < 16; i++) for (uint8_t i = 0; i < 16; i++)
{ {
@ -553,15 +554,17 @@ namespace gr
} }
//dump data - first byte is empty //dump data - first byte is empty
printf ("FN: %04X PLD: ", fn); //printf ("FN: %04X PLD: ", fn);
for (uint8_t i = 3; i < 19; i++) for (uint8_t i = 3; i < 19; i++)
{ {
printf ("%02X", frame_data[i]); if (_debug_data == true)
printf (" %02X", frame_data[i]);
} }
if (_debug_ctrl == true) if (_debug_ctrl == true)
printf (" e=%1.1f\n", (float) e / 0xFFFF); printf (" e=%1.1f\n", (float) e / 0xFFFF);
printf ("\n"); if ((_debug_ctrl == true) || (_debug_data==true))
printf ("\n");
//send codec2 stream to stdout //send codec2 stream to stdout
//fwrite(&frame_data[3], 16, 1, stdout); //fwrite(&frame_data[3], 16, 1, stdout);
@ -587,27 +590,28 @@ namespace gr
//debug - dump LICH //debug - dump LICH
if (lich_chunks_rcvd == 0x3F) //all 6 chunks received? if (lich_chunks_rcvd == 0x3F) //all 6 chunks received?
{ {
if (_debug_ctrl == true) if (_callsign == true)
{ {
if (_callsign == true) decode_callsign_bytes (d_dst, &lsf[0]);
{ decode_callsign_bytes (d_src, &lsf[6]);
decode_callsign_bytes (d_dst, &lsf[0]); if (_debug_ctrl == true)
decode_callsign_bytes (d_src, &lsf[6]); {
printf ("DST: %-9s ", d_dst); //DST printf ("DST: %-9s ", d_dst); //DST
printf ("SRC: %-9s ", d_src); //SRC printf ("SRC: %-9s ", d_src); //SRC
} }
else }
else
if (_debug_ctrl == true)
{ {
printf ("DST: "); //DST printf ("DST: "); //DST
for (uint8_t i = 0; i < 6; i++) for (uint8_t i = 0; i < 6; i++)
printf ("%02X", lsf[i]); printf ("%02X", lsf[i]);
printf (" "); printf (" ");
printf ("SRC: "); //SRC printf ("SRC: "); //SRC
for (uint8_t i = 0; i < 6; i++) for (uint8_t i = 0; i < 6; i++)
printf ("%02X", lsf[6 + i]); printf ("%02X", lsf[6 + i]);
printf (" "); printf (" ");
} }
}
//TYPE //TYPE
uint16_t type = (uint16_t) lsf[12] * 0x100 + lsf[13]; //big-endian uint16_t type = (uint16_t) lsf[12] * 0x100 + lsf[13]; //big-endian
@ -690,11 +694,13 @@ namespace gr
(_key, _digest, sizeof (_digest), _sig, (_key, _digest, sizeof (_digest), _sig,
_curve)) _curve))
{ {
printf ("Signature OK\n"); if (_debug_ctrl == true)
printf ("Signature OK\n");
} }
else else
{ {
printf ("Signature invalid\n"); if (_debug_ctrl == true)
printf ("Signature invalid\n");
} }
} }
} }
@ -718,18 +724,20 @@ namespace gr
lsf[i] = lsf[i + 1]; lsf[i] = lsf[i + 1];
//dump data //dump data
if (_debug_ctrl == true) if (_callsign == true)
{ {
if (_callsign == true) decode_callsign_bytes (d_dst, &lsf[0]);
decode_callsign_bytes (d_src, &lsf[6]);
if (_debug_ctrl == true)
{ {
decode_callsign_bytes (d_dst, &lsf[0]);
decode_callsign_bytes (d_src, &lsf[6]);
printf ("DST: %-9s ", d_dst); //DST printf ("DST: %-9s ", d_dst); //DST
printf ("SRC: %-9s ", d_src); //SRC printf ("SRC: %-9s ", d_src); //SRC
} }
else }
{ else
printf ("DST: "); //DST {
if (_debug_ctrl == true)
{printf ("DST: "); //DST
for (uint8_t i = 0; i < 6; i++) for (uint8_t i = 0; i < 6; i++)
printf ("%02X", lsf[i]); printf ("%02X", lsf[i]);
printf (" "); printf (" ");
@ -740,30 +748,35 @@ namespace gr
printf ("%02X", lsf[6 + i]); printf ("%02X", lsf[6 + i]);
printf (" "); printf (" ");
} }
}
//TYPE //TYPE
printf ("TYPE: "); if (_debug_ctrl == true)
{printf ("TYPE: ");
for (uint8_t i = 0; i < 2; i++) for (uint8_t i = 0; i < 2; i++)
printf ("%02X", lsf[12 + i]); printf ("%02X", lsf[12 + i]);
printf (" "); printf (" ");
//META //META
printf ("META: "); printf ("META: ");
for (uint8_t i = 0; i < 14; i++) for (uint8_t i = 0; i < 14; i++)
printf ("%02X", lsf[14 + i]); printf ("%02X", lsf[14 + i]);
printf (" "); printf (" ");
}
//CRC //CRC
//printf("CRC: "); //printf("CRC: ");
//for(uint8_t i=0; i<2; i++) //for(uint8_t i=0; i<2; i++)
//printf("%02X", lsf[28+i]); //printf("%02X", lsf[28+i]);
if (CRC_M17 (lsf, 30)) if (CRC_M17 (lsf, 30))
{if (_debug_ctrl == true)
printf ("LSF_CRC_ERR"); printf ("LSF_CRC_ERR");
else }
printf ("LSF_CRC_OK "); else
//Viterbi decoder errors {if (_debug_ctrl == true)
printf (" e=%1.1f\n", (float) e / 0xFFFF); printf ("LSF_CRC_OK ");
} }
//Viterbi decoder errors
if (_debug_ctrl == true)
printf (" e=%1.1f\n", (float) e / 0xFFFF);
} }
//job done //job done