December 2025 - gerrit-log - lists.osmocom.org

[XS] Change in pysim[master]: pyshark_gsmtap: Adjust display filter for some wireshark versions
by laforge 18 Dec '25

18 Dec '25

Attention is currently required from: dexter, fixeria. laforge has posted comments on this change by laforge. ( https://gerrit.osmocom.org/c/pysim/+/41712?usp=email ) Change subject: pyshark_gsmtap: Adjust display filter for some wireshark versions ...................................................................... Patch Set 2: (1 comment) File pySim/apdu_source/pyshark_gsmtap.py: https://gerrit.osmocom.org/c/pysim/+/41712/comment/97e46d52_548891e1?usp=em… : PS1, Line 87: pyshark_inst = pyshark.FileCapture(pcap_filename, display_filter='gsmtap.type == 4', use_json=True, keep_packets=False) > I have tried to check back why this patch fails the unit-tests. […] Done -- To view, visit https://gerrit.osmocom.org/c/pysim/+/41712?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I53c1c8ed58a82c37cd4be4af3890af21da839e86 Gerrit-Change-Number: 41712 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: dexter <pmaier(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Thu, 18 Dec 2025 19:48:49 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: dexter <pmaier(a)sysmocom.de>

1 0

[S] Change in osmo-tetra[master]: Added functional TA61 decryption
by laforge 18 Dec '25

18 Dec '25

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-tetra/+/41684?usp=email ) ( 2 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: Added functional TA61 decryption ...................................................................... Added functional TA61 decryption Now uses a known SCK/CCK to decrypt identities using TA61 Change-Id: Ic01c1d9cd151ba0213ed67971cc479f312af14fb --- M src/crypto/tetra_crypto.c 1 file changed, 9 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/crypto/tetra_crypto.c b/src/crypto/tetra_crypto.c index 3230cb8..7344dd0 100644 --- a/src/crypto/tetra_crypto.c +++ b/src/crypto/tetra_crypto.c @@ -204,8 +204,15 @@ bool decrypt_identity(struct tetra_crypto_state *tcs, struct tetra_addr *addr) { - /* TODO FIXME implement TA61 decryption */ - return false; + if (!tcs->cck) + return false; + + uint8_t a_addr[3] = {addr->ssi >> 16, addr->ssi >> 8, addr->ssi}; + ta61_inv(tcs->cck->key, a_addr, a_addr); + + uint32_t addr_decrypted = (a_addr[0] << 16) | (a_addr[1] << 8) | a_addr[2]; + addr->ssi = addr_decrypted; + return true; } bool decrypt_mac_element(struct tetra_crypto_state *tcs, struct tetra_tmvsap_prim *tmvp, struct tetra_key *key, int l1_len, int tmpdu_offset) -- To view, visit https://gerrit.osmocom.org/c/osmo-tetra/+/41684?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-tetra Gerrit-Branch: master Gerrit-Change-Id: Ic01c1d9cd151ba0213ed67971cc479f312af14fb Gerrit-Change-Number: 41684 Gerrit-PatchSet: 3 Gerrit-Owner: wbokslag <w.bokslag(a)midnightblue.nl> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org>

1 0

[M] Change in osmo-tetra[master]: Added TA61 to the TAA1 suite
by laforge 18 Dec '25

18 Dec '25

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-tetra/+/41683?usp=email ) ( 2 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: Added TA61 to the TAA1 suite ...................................................................... Added TA61 to the TAA1 suite Change-Id: I79e93d6863ab6c044a8e19bba85c7447095f5e11 --- M src/crypto/hurdle.c M src/crypto/hurdle.h M src/crypto/taa1.c M src/crypto/taa1.h 4 files changed, 149 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/crypto/hurdle.c b/src/crypto/hurdle.c index 58a1bb0..a7b1f8d 100644 --- a/src/crypto/hurdle.c +++ b/src/crypto/hurdle.c @@ -45,6 +45,24 @@ 0xF0, 0xE6, 0x3F, 0x14, 0xF1, 0xE2, 0xB1, 0x86, 0xB4, 0xF3, 0x74, 0xFA, 0x6A, 0xB2, 0x21, 0x6D, 0xEA, 0xB5, 0xE7, 0xE3, 0xC9, 0xD3, 0x8F, 0x03, 0x75, 0xE8, 0xD4, 0x42, 0xFD, 0x7E, 0xFF, 0x7F}; +const uint8_t g_abHurdleInvSbox[256] = { + 0x03, 0x02, 0x8D, 0xF7, 0x44, 0xA4, 0x79, 0xB9, 0xAE, 0x9E, 0xDE, 0x9B, 0x3E, 0xA9, 0x5E, 0x95, + 0xDB, 0x71, 0xC3, 0x5B, 0xE3, 0x3D, 0x4F, 0x65, 0x93, 0xDD, 0x56, 0x83, 0xA3, 0x80, 0x48, 0x29, + 0x6F, 0xEE, 0x3A, 0x52, 0x63, 0x55, 0x2F, 0x89, 0x73, 0xD3, 0x1C, 0x49, 0x25, 0x88, 0x30, 0x6D, + 0x4B, 0x8A, 0x6C, 0x2D, 0xA7, 0xC0, 0x43, 0x5D, 0x53, 0x21, 0xCC, 0xAA, 0xA8, 0x0F, 0x16, 0xE2, + 0x35, 0x5C, 0xFB, 0xD6, 0x91, 0x4D, 0xA5, 0x07, 0x33, 0x8B, 0x28, 0x1D, 0x15, 0x64, 0x46, 0x90, + 0x3B, 0x20, 0x6B, 0x8F, 0x82, 0x19, 0x26, 0x62, 0x10, 0xC2, 0xC8, 0x60, 0x94, 0x0D, 0x34, 0x42, + 0x27, 0x54, 0xCA, 0x58, 0xBA, 0x01, 0x14, 0x4E, 0x51, 0x8E, 0xEC, 0xB0, 0x23, 0xEF, 0x2C, 0x31, + 0x2B, 0xD2, 0x12, 0xDA, 0xEA, 0xF8, 0xD9, 0x7A, 0xD8, 0x74, 0x05, 0xB8, 0x87, 0xCE, 0xFD, 0xFF, + 0x18, 0x57, 0xA2, 0x1E, 0x7F, 0xCF, 0xE7, 0xB3, 0x4A, 0x32, 0x24, 0x2E, 0x50, 0x6A, 0xC7, 0xF6, + 0x1B, 0xDC, 0x47, 0x4C, 0x98, 0xBF, 0x0C, 0x5F, 0x08, 0xDF, 0xBE, 0x97, 0xAF, 0x0A, 0xC4, 0xA1, + 0x1F, 0x81, 0x9C, 0xC5, 0x37, 0xC1, 0x45, 0x06, 0xCD, 0x38, 0x0E, 0x3F, 0x9F, 0x0B, 0xBD, 0xB4, + 0x84, 0xE6, 0xED, 0x68, 0xE8, 0xF1, 0xBC, 0xAC, 0xC6, 0x67, 0x04, 0x78, 0x96, 0x99, 0xAD, 0xB5, + 0x11, 0x5A, 0xA6, 0x36, 0x66, 0xBB, 0xA0, 0x9D, 0xD1, 0xF4, 0x61, 0x59, 0x86, 0x7E, 0xAB, 0x39, + 0x2A, 0x72, 0xCB, 0xF5, 0xFA, 0x40, 0xD4, 0xD5, 0x13, 0x70, 0x75, 0x7B, 0x9A, 0x09, 0x1A, 0x92, + 0x17, 0x3C, 0xE5, 0xF3, 0x85, 0xB2, 0xE1, 0xF2, 0xF9, 0x77, 0xF0, 0xB7, 0x6E, 0x22, 0xB1, 0x69, + 0xE0, 0xE4, 0xB6, 0xE9, 0x00, 0x8C, 0xD0, 0xC9, 0x41, 0xD7, 0xEB, 0x76, 0x7C, 0xFC, 0x7D, 0xFE}; + #if __BYTE_ORDER == __LITTLE_ENDIAN static const uint32_t g_adwReorder[16] = { 0x00000000, 0x80000000, 0x00800000, 0x80800000, diff --git a/src/crypto/hurdle.h b/src/crypto/hurdle.h index bbd641c..123a5d3 100644 --- a/src/crypto/hurdle.h +++ b/src/crypto/hurdle.h @@ -16,5 +16,6 @@ void HURDLE_dec_cts(uint8_t abPlaintext[15], const uint8_t abCiphertext[15], uint8_t abKey[16]); extern const uint8_t g_abHurdleSbox[256]; +extern const uint8_t g_abHurdleInvSbox[256]; #endif /* HAVE_HURDLE_H */ diff --git a/src/crypto/taa1.c b/src/crypto/taa1.c index 09e3a4b..71ff45d 100644 --- a/src/crypto/taa1.c +++ b/src/crypto/taa1.c @@ -127,6 +127,30 @@ lpBufferOut[9] = lpBuffer[13]; } +void transform_identity(const uint8_t *lpInput, uint8_t *lpOutput) +{ + uint8_t abSboxIndexes[3]; + + abSboxIndexes[0] = ((lpInput[1] + lpInput[0]) << 1) - lpInput[2]; + abSboxIndexes[1] = ((lpInput[2] + lpInput[0]) << 1) - lpInput[1]; + abSboxIndexes[2] = ((lpInput[2] + lpInput[1]) << 1) - lpInput[0]; + + lpOutput[0] = g_abHurdleSbox[abSboxIndexes[0]]; + lpOutput[1] = g_abHurdleSbox[abSboxIndexes[1]]; + lpOutput[2] = g_abHurdleSbox[abSboxIndexes[2]]; +} + +void transform_identity_inverse(const uint8_t *lpInput, uint8_t *lpOutput) +{ + uint8_t x = g_abHurdleInvSbox[lpInput[0]]; + uint8_t y = g_abHurdleInvSbox[lpInput[1]]; + uint8_t z = g_abHurdleInvSbox[lpInput[2]]; + + lpOutput[0] = (114*x + 114*y - 57*z); + lpOutput[1] = (114*x - 57*y + 114*z); + lpOutput[2] = (-57*x + 114*y + 114*z); +} + void ta11_ta41(uint8_t *lpKeyK, uint8_t *lpChallengeRs, uint8_t *lpKsOut) { uint8_t abChallengeExpanded[16]; @@ -261,6 +285,103 @@ abUnsealed[10] & 0xe0; } +void ta61_compute_c(const uint8_t *lpKey, uint8_t *lpIntermediateKeyOut) +{ + struct hurdle_ctx stCipher; + uint8_t abKeyExpanded[16]; + + transform_80_to_128(lpKey, abKeyExpanded); + + hurdle_set_key(abKeyExpanded, &stCipher); + + uint8_t abPlaintext[8]; + abPlaintext[0] = lpKey[0] ^ lpKey[2]; + abPlaintext[1] = lpKey[1] ^ lpKey[3]; + abPlaintext[2] = lpKey[2] ^ lpKey[4]; + abPlaintext[3] = lpKey[3] ^ lpKey[5]; + abPlaintext[4] = lpKey[4] ^ lpKey[6]; + abPlaintext[5] = lpKey[5] ^ lpKey[7]; + abPlaintext[6] = lpKey[6] ^ lpKey[8]; + abPlaintext[7] = lpKey[7] ^ lpKey[9]; + + HURDLE_encrypt( + lpIntermediateKeyOut, + abPlaintext, + &stCipher, + HURDLE_ENCRYPT + ); +} + +void ta61(const uint8_t *lpKey, const uint8_t *lpIdentity, uint8_t *lpEncIdentityOut) +{ + uint8_t abIntermediateKey[8]; + ta61_compute_c(lpKey, abIntermediateKey); + ta61_inner(abIntermediateKey, lpIdentity, lpEncIdentityOut); +} + +void ta61_inner(const uint8_t *lpIntermediateKey, const uint8_t *lpIdentity, uint8_t *lpEncIdentityOut) +{ + uint8_t abIdentity[3]; + abIdentity[0] = lpIdentity[0]; + abIdentity[1] = lpIdentity[1]; + abIdentity[2] = lpIdentity[2]; + + abIdentity[0] ^= lpIntermediateKey[0]; + abIdentity[1] ^= lpIntermediateKey[3]; + abIdentity[2] ^= lpIntermediateKey[6]; + + transform_identity(abIdentity, abIdentity); + + abIdentity[0] ^= lpIntermediateKey[1]; + abIdentity[1] ^= lpIntermediateKey[4]; + abIdentity[2] ^= lpIntermediateKey[7]; + + transform_identity(abIdentity, abIdentity); + + abIdentity[0] ^= lpIntermediateKey[2]; + abIdentity[1] ^= lpIntermediateKey[5]; + abIdentity[2] ^= lpIntermediateKey[0]; + + lpEncIdentityOut[0] = abIdentity[0]; + lpEncIdentityOut[1] = abIdentity[1]; + lpEncIdentityOut[2] = abIdentity[2]; +} + +void ta61_inv(uint8_t *lpKey, uint8_t *lpIdentity, uint8_t *lpDecIdentityOut) +{ + uint8_t abIntermediateKey[8]; + ta61_compute_c(lpKey, abIntermediateKey); + ta61_inner_inv(abIntermediateKey, lpIdentity, lpDecIdentityOut); +} + +void ta61_inner_inv(uint8_t *lpIntermediateKey, uint8_t *lpIdentity, uint8_t *lpDecIdentityOut) +{ + uint8_t abIdentity[3]; + abIdentity[0] = lpIdentity[0]; + abIdentity[1] = lpIdentity[1]; + abIdentity[2] = lpIdentity[2]; + + abIdentity[0] ^= lpIntermediateKey[2]; + abIdentity[1] ^= lpIntermediateKey[5]; + abIdentity[2] ^= lpIntermediateKey[0]; + + transform_identity_inverse(abIdentity, abIdentity); + + abIdentity[0] ^= lpIntermediateKey[1]; + abIdentity[1] ^= lpIntermediateKey[4]; + abIdentity[2] ^= lpIntermediateKey[7]; + + transform_identity_inverse(abIdentity, abIdentity); + + abIdentity[0] ^= lpIntermediateKey[0]; + abIdentity[1] ^= lpIntermediateKey[3]; + abIdentity[2] ^= lpIntermediateKey[6]; + + lpDecIdentityOut[0] = abIdentity[0]; + lpDecIdentityOut[1] = abIdentity[1]; + lpDecIdentityOut[2] = abIdentity[2]; +} + void ta71(uint8_t *lpGck, uint8_t *lpCck, uint8_t *lpMgckOut) { uint8_t abCiphertext[16]; diff --git a/src/crypto/taa1.h b/src/crypto/taa1.h index 4baff6e..84d287e 100644 --- a/src/crypto/taa1.h +++ b/src/crypto/taa1.h @@ -36,6 +36,8 @@ void ta32(uint8_t *lpSealedCck, uint8_t *lpCckId, uint8_t *lpDck, uint8_t *lpUnsealedCckOut, uint8_t *lpMfOut); void ta51(uint8_t *lpUnsealed, uint8_t *lpVn, uint8_t *lpKey, uint8_t *lpKeyN, uint8_t *lpSealedOut); void ta52(uint8_t *lpSealed, uint8_t *lpKey, uint8_t *lpVn, uint8_t *lpUnsealedOut, uint8_t *lpMfOut, uint8_t *lpKeyNOut); +void ta61(const uint8_t *lpKey, const uint8_t *lpIdentity, uint8_t *lpEncIdentityOut); +void ta61_inv(uint8_t *lpKey, uint8_t *lpIdentity, uint8_t *lpDecIdentityOut); void ta71(uint8_t *lpGck, uint8_t *lpCck, uint8_t *lpMgckOut); void ta81(uint8_t *lpUnsealedGck, uint8_t *lpGckVn, uint8_t *lpGckN, uint8_t *lpKey, uint8_t *lpSealedGckOut); void ta82(uint8_t *lpSealedGck, uint8_t *lpGckVn, uint8_t *lpKey, uint8_t *lpUnsealedGckOut, uint8_t *lpMfOut, uint8_t *lpGckNOut); @@ -43,6 +45,13 @@ void ta92(uint8_t *lpSealedGsko, uint8_t *lpGskoVn, uint8_t *lpKey, uint8_t *lpUnsealedGskoOut, uint8_t *lpMfOut); /* + * TA61 internals + */ +void ta61_compute_c(const uint8_t *lpKey, uint8_t *lpIntermediateKeyOut); +void ta61_inner(const uint8_t *lpIntermediateKey, const uint8_t *lpIdentity, uint8_t *lpEncIdentityOut); +void ta61_inner_inv(uint8_t *lpIntermediateKey, uint8_t *lpIdentity, uint8_t *lpDecIdentityOut); + +/* * TBxx non-cryptographic primitives also used for authentication and key derivation */ void tb4(uint8_t *lpDck1, uint8_t *lpDck2, uint8_t *lpDckOut); -- To view, visit https://gerrit.osmocom.org/c/osmo-tetra/+/41683?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-tetra Gerrit-Branch: master Gerrit-Change-Id: I79e93d6863ab6c044a8e19bba85c7447095f5e11 Gerrit-Change-Number: 41683 Gerrit-PatchSet: 3 Gerrit-Owner: wbokslag <w.bokslag(a)midnightblue.nl> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org>

1 0

[XS] Change in osmo-tetra[master]: Small bugfix in SYSINFO parsing
by laforge 18 Dec '25

18 Dec '25

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-tetra/+/41680?usp=email ) ( 2 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: Small bugfix in SYSINFO parsing ...................................................................... Small bugfix in SYSINFO parsing Small bugfix. We now increases the position in the SYSINFO read buffer when parsing hyperframe or cck number. Change-Id: Ic35f5106c096a7a3dd0d2302ad53fa00c69ab76d --- M src/tetra_mac_pdu.c 1 file changed, 5 insertions(+), 4 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve diff --git a/src/tetra_mac_pdu.c b/src/tetra_mac_pdu.c index 06c93ef..b81edcb 100644 --- a/src/tetra_mac_pdu.c +++ b/src/tetra_mac_pdu.c @@ -57,10 +57,11 @@ sid->access_parameter = bits_to_uint(cur, 4); cur += 4; sid->radio_dl_timeout = bits_to_uint(cur, 4); cur += 4; sid->cck_valid_no_hf = *cur++; - if (sid->cck_valid_no_hf) - sid->cck_id = bits_to_uint(cur, 16); - else - sid->hyperframe_number = bits_to_uint(cur, 16); + if (sid->cck_valid_no_hf) { + sid->cck_id = bits_to_uint(cur, 16); cur += 16; + } else { + sid->hyperframe_number = bits_to_uint(cur, 16); cur += 16; + } sid->option_field = bits_to_uint(cur, 2); cur += 2; switch (sid->option_field) { -- To view, visit https://gerrit.osmocom.org/c/osmo-tetra/+/41680?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-tetra Gerrit-Branch: master Gerrit-Change-Id: Ic35f5106c096a7a3dd0d2302ad53fa00c69ab76d Gerrit-Change-Number: 41680 Gerrit-PatchSet: 3 Gerrit-Owner: wbokslag <w.bokslag(a)midnightblue.nl> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in osmo-tetra[master]: Fix preventing crashes when -d missing
by laforge 18 Dec '25

18 Dec '25

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-tetra/+/41679?usp=email ) Change subject: Fix preventing crashes when -d missing ...................................................................... Fix preventing crashes when -d missing Small fix that check whether a dumpdir was provided with -d. If not, no voice data is written to file. Change-Id: I6a857f62aae542b054cbb474594359da626762bb --- M src/lower_mac/tetra_lower_mac.c 1 file changed, 5 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve diff --git a/src/lower_mac/tetra_lower_mac.c b/src/lower_mac/tetra_lower_mac.c index f8e7810..d58f2ab 100644 --- a/src/lower_mac/tetra_lower_mac.c +++ b/src/lower_mac/tetra_lower_mac.c @@ -194,8 +194,11 @@ if (tms->cur_burst.is_traffic && type == TPSAP_T_NDB && blk_num == BLK_1) tms->cur_burst.blk1_stolen = true; - /* If this is a traffic channel, dump. */ - if (tms->cur_burst.is_traffic && (type == TPSAP_T_SCH_F || (blk_num == BLK_2 && !tms->cur_burst.blk2_stolen))) { + /* If this is a traffic channel and we have a dump output directory, dump. */ + if (tms->dumpdir && + tms->cur_burst.is_traffic && + (type == TPSAP_T_SCH_F || (blk_num == BLK_2 && !tms->cur_burst.blk2_stolen))) { + char fname[PATH_MAX]; int16_t block[690]; FILE *f; -- To view, visit https://gerrit.osmocom.org/c/osmo-tetra/+/41679?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-tetra Gerrit-Branch: master Gerrit-Change-Id: I6a857f62aae542b054cbb474594359da626762bb Gerrit-Change-Number: 41679 Gerrit-PatchSet: 3 Gerrit-Owner: wbokslag <w.bokslag(a)midnightblue.nl> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in osmo-tetra[master]: Added example keyfile
by laforge 18 Dec '25

18 Dec '25

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-tetra/+/41682?usp=email ) ( 2 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: Added example keyfile ...................................................................... Added example keyfile Added an example keyfile that people can use when trying to decrypt TEA-encrypted traffic. Note that a legitimate 80-bit key is needed. This is not a cracking tool. Change-Id: I7e13dcd10546e118e2cf9845f14121862db0cca9 --- A src/example_keyfile.txt 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/example_keyfile.txt b/src/example_keyfile.txt new file mode 100644 index 0000000..93e2b06 --- /dev/null +++ b/src/example_keyfile.txt @@ -0,0 +1,2 @@ +network mcc 204 mnc 1337 ksg_type 1 security_class 2 +key mcc 204 mnc 1337 addr 00000000 key_type 1 key_num 1234 key 00112233445566778899 -- To view, visit https://gerrit.osmocom.org/c/osmo-tetra/+/41682?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-tetra Gerrit-Branch: master Gerrit-Change-Id: I7e13dcd10546e118e2cf9845f14121862db0cca9 Gerrit-Change-Number: 41682 Gerrit-PatchSet: 3 Gerrit-Owner: wbokslag <w.bokslag(a)midnightblue.nl> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org>

1 0

[M] Change in osmo-tetra[master]: Fix in GNU Radio 3.10 receiver
by laforge 18 Dec '25

18 Dec '25

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-tetra/+/41681?usp=email ) Change subject: Fix in GNU Radio 3.10 receiver ...................................................................... Fix in GNU Radio 3.10 receiver The GNU Radio 3.10 compatible receiver script added by SQ5BPF contains an erroneous block that should not be present. This block was removed. Change-Id: I63a95bd8dbbceadd1b6c1b227a125910051d415e --- M src/demod/telive_1ch_simple_gr310_udp.grc M src/demod/telive_1ch_simple_gr310_udp.py 2 files changed, 28 insertions(+), 64 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/demod/telive_1ch_simple_gr310_udp.grc b/src/demod/telive_1ch_simple_gr310_udp.grc index 00a1130..dd5b708 100644 --- a/src/demod/telive_1ch_simple_gr310_udp.grc +++ b/src/demod/telive_1ch_simple_gr310_udp.grc @@ -64,6 +64,7 @@ id: variable_qtgui_entry parameters: comment: '' + entry_signal: editingFinished gui_hint: 0,0,1,2 label: Frequency type: real @@ -887,27 +888,6 @@ coordinate: [832, 156.0] rotation: 0 state: true -- name: xlate_offset_fine1 - id: variable_slider - parameters: - alias: '' - comment: '' - converver: float_converter - grid_pos: 3,1,1,4 - label: Fine Tune - max: '10000' - min: '-10000' - notebook: '' - num_steps: '200' - style: wx.SL_HORIZONTAL - value: '0' - states: - bus_sink: false - bus_source: false - bus_structure: null - coordinate: [144, 770] - rotation: 0 - state: enabled - name: xmlrpc_server_0 id: xmlrpc_server parameters: @@ -933,4 +913,4 @@ metadata: file_format: 1 - grc_version: 3.10.5.1 + grc_version: 3.10.12.0 diff --git a/src/demod/telive_1ch_simple_gr310_udp.py b/src/demod/telive_1ch_simple_gr310_udp.py index 22990c0..cb17624 100755 --- a/src/demod/telive_1ch_simple_gr310_udp.py +++ b/src/demod/telive_1ch_simple_gr310_udp.py @@ -8,43 +8,30 @@ # Title: SQ5BPF Tetra live receiver 1ch simple UDP demo with fixed offset (gnuradio 3.10 version) xmlrpc # Author: Jacek Lipkowski SQ5BPF # Description: This is a receiver flowgraph, uses a rtl-sdr dongle, and outputs a downsampled stream to 127.0.0.1 42001/udp. This can be used with telive, or just osmo-tetra -# GNU Radio version: 3.10.5.1 - -from packaging.version import Version as StrictVersion - -if __name__ == '__main__': - import ctypes - import sys - if sys.platform.startswith('linux'): - try: - x11 = ctypes.cdll.LoadLibrary('libX11.so') - x11.XInitThreads() - except: - print("Warning: failed to XInitThreads()") +# GNU Radio version: 3.10.12.0 from PyQt5 import Qt -from gnuradio import eng_notation from gnuradio import qtgui -from gnuradio.filter import firdes -import sip +from PyQt5 import QtCore from gnuradio import analog +from gnuradio import eng_notation from gnuradio import filter +from gnuradio.filter import firdes from gnuradio import gr from gnuradio.fft import window import sys import signal +from PyQt5 import Qt from argparse import ArgumentParser from gnuradio.eng_arg import eng_float, intx from gnuradio import network -from gnuradio.qtgui import Range, RangeWidget -from PyQt5 import QtCore import osmosdr import time +import sip +import threading -from gnuradio import qtgui - class telive_1ch_simple_gr310_udp(gr.top_block, Qt.QWidget): def __init__(self): @@ -54,8 +41,8 @@ qtgui.util.check_set_qss() try: self.setWindowIcon(Qt.QIcon.fromTheme('gnuradio-grc')) - except: - pass + except BaseException as exc: + print(f"Qt GUI: Could not set Icon: {str(exc)}", file=sys.stderr) self.top_scroll_layout = Qt.QVBoxLayout() self.setLayout(self.top_scroll_layout) self.top_scroll = Qt.QScrollArea() @@ -68,15 +55,15 @@ self.top_grid_layout = Qt.QGridLayout() self.top_layout.addLayout(self.top_grid_layout) - self.settings = Qt.QSettings("GNU Radio", "telive_1ch_simple_gr310_udp") + self.settings = Qt.QSettings("gnuradio/flowgraphs", "telive_1ch_simple_gr310_udp") try: - if StrictVersion(Qt.qVersion()) < StrictVersion("5.0.0"): - self.restoreGeometry(self.settings.value("geometry").toByteArray()) - else: - self.restoreGeometry(self.settings.value("geometry")) - except: - pass + geometry = self.settings.value("geometry") + if geometry: + self.restoreGeometry(geometry) + except BaseException as exc: + print(f"Qt GUI: Could not restore geometry: {str(exc)}", file=sys.stderr) + self.flowgraph_started = threading.Event() ################################################## # Variables @@ -103,22 +90,22 @@ # Blocks ################################################## - self._xlate_offset_fine1_range = Range(-5e3, +5e3, 1, 0, 200) - self._xlate_offset_fine1_win = RangeWidget(self._xlate_offset_fine1_range, self.set_xlate_offset_fine1, "Fine tune1", "counter_slider", float, QtCore.Qt.Horizontal) + self._xlate_offset_fine1_range = qtgui.Range(-5e3, +5e3, 1, 0, 200) + self._xlate_offset_fine1_win = qtgui.RangeWidget(self._xlate_offset_fine1_range, self.set_xlate_offset_fine1, "Fine tune1", "counter_slider", float, QtCore.Qt.Horizontal) self.top_grid_layout.addWidget(self._xlate_offset_fine1_win, 0, 2, 1, 3) for r in range(0, 1): self.top_grid_layout.setRowStretch(r, 1) for c in range(2, 5): self.top_grid_layout.setColumnStretch(c, 1) - self._sdr_gain_range = Range(0, 50, 1, 30, 200) - self._sdr_gain_win = RangeWidget(self._sdr_gain_range, self.set_sdr_gain, "gain", "counter_slider", int, QtCore.Qt.Horizontal) + self._sdr_gain_range = qtgui.Range(0, 50, 1, 30, 200) + self._sdr_gain_win = qtgui.RangeWidget(self._sdr_gain_range, self.set_sdr_gain, "gain", "counter_slider", int, QtCore.Qt.Horizontal) self.top_grid_layout.addWidget(self._sdr_gain_win, 0, 8, 1, 2) for r in range(0, 1): self.top_grid_layout.setRowStretch(r, 1) for c in range(8, 10): self.top_grid_layout.setColumnStretch(c, 1) - self._ppm_corr_range = Range(-100, 100, 0.5, 0, 200) - self._ppm_corr_win = RangeWidget(self._ppm_corr_range, self.set_ppm_corr, "ppm", "counter_slider", float, QtCore.Qt.Horizontal) + self._ppm_corr_range = qtgui.Range(-100, 100, 0.5, 0, 200) + self._ppm_corr_win = qtgui.RangeWidget(self._ppm_corr_range, self.set_ppm_corr, "ppm", "counter_slider", float, QtCore.Qt.Horizontal) self.top_grid_layout.addWidget(self._ppm_corr_win, 0, 5, 1, 3) for r in range(0, 1): self.top_grid_layout.setRowStretch(r, 1) @@ -128,7 +115,7 @@ self._freq_tool_bar.addWidget(Qt.QLabel("Frequency" + ": ")) self._freq_line_edit = Qt.QLineEdit(str(self.freq)) self._freq_tool_bar.addWidget(self._freq_line_edit) - self._freq_line_edit.returnPressed.connect( + self._freq_line_edit.editingFinished.connect( lambda: self.set_freq(eng_notation.str_to_num(str(self._freq_line_edit.text())))) self.top_grid_layout.addWidget(self._freq_tool_bar, 0, 0, 1, 2) for r in range(0, 1): @@ -256,8 +243,7 @@ self.network_udp_sink_0 = network.udp_sink(gr.sizeof_gr_complex, 1, udp_dest_addr, (first_port+1), 0, udp_packet_size, False) self.mmse_resampler_xx_0 = filter.mmse_resampler_cc(0, (float(float(if_samp_rate)/float(out_sample_rate)))) self.freq_xlating_fir_filter_xxx_0 = filter.freq_xlating_fir_filter_ccc(first_decim, firdes.low_pass(1, samp_rate, options_low_pass, options_low_pass*0.2), (xlate_offset1+xlate_offset_fine1), samp_rate) - self.analog_agc3_xx_0 = analog.agc3_cc((1e-3), (1e-4), 1.0, 1.0, 1) - self.analog_agc3_xx_0.set_max_gain(65536) + self.analog_agc3_xx_0 = analog.agc3_cc((1e-3), (1e-4), 1.0, 1.0, 1, 65536) ################################################## @@ -272,7 +258,7 @@ def closeEvent(self, event): - self.settings = Qt.QSettings("GNU Radio", "telive_1ch_simple_gr310_udp") + self.settings = Qt.QSettings("gnuradio/flowgraphs", "telive_1ch_simple_gr310_udp") self.settings.setValue("geometry", self.saveGeometry()) self.stop() self.wait() @@ -408,14 +394,12 @@ def main(top_block_cls=telive_1ch_simple_gr310_udp, options=None): - if StrictVersion("4.5.0") <= StrictVersion(Qt.qVersion()) < StrictVersion("5.0.0"): - style = gr.prefs().get_string('qtgui', 'style', 'raster') - Qt.QApplication.setGraphicsSystem(style) qapp = Qt.QApplication(sys.argv) tb = top_block_cls() tb.start() + tb.flowgraph_started.set() tb.show() -- To view, visit https://gerrit.osmocom.org/c/osmo-tetra/+/41681?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-tetra Gerrit-Branch: master Gerrit-Change-Id: I63a95bd8dbbceadd1b6c1b227a125910051d415e Gerrit-Change-Number: 41681 Gerrit-PatchSet: 3 Gerrit-Owner: wbokslag <w.bokslag(a)midnightblue.nl> Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: tnt <tnt(a)246tNt.com>

1 0

[M] Change in osmo-tetra[master]: Fix in GNU Radio 3.10 receiver
by laforge 18 Dec '25

18 Dec '25

Attention is currently required from: Hoernchen, tnt, wbokslag. laforge has posted comments on this change by wbokslag. ( https://gerrit.osmocom.org/c/osmo-tetra/+/41681?usp=email ) Change subject: Fix in GNU Radio 3.10 receiver ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-tetra/+/41681?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-tetra Gerrit-Branch: master Gerrit-Change-Id: I63a95bd8dbbceadd1b6c1b227a125910051d415e Gerrit-Change-Number: 41681 Gerrit-PatchSet: 3 Gerrit-Owner: wbokslag <w.bokslag(a)midnightblue.nl> Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-Attention: wbokslag <w.bokslag(a)midnightblue.nl> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Attention: tnt <tnt(a)246tNt.com> Gerrit-Comment-Date: Thu, 18 Dec 2025 19:47:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in osmo-tetra[master]: Fix preventing crashes when -d missing
by laforge 18 Dec '25

18 Dec '25

Attention is currently required from: wbokslag. laforge has posted comments on this change by wbokslag. ( https://gerrit.osmocom.org/c/osmo-tetra/+/41679?usp=email ) Change subject: Fix preventing crashes when -d missing ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-tetra/+/41679?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-tetra Gerrit-Branch: master Gerrit-Change-Id: I6a857f62aae542b054cbb474594359da626762bb Gerrit-Change-Number: 41679 Gerrit-PatchSet: 3 Gerrit-Owner: wbokslag <w.bokslag(a)midnightblue.nl> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: wbokslag <w.bokslag(a)midnightblue.nl> Gerrit-Comment-Date: Thu, 18 Dec 2025 19:47:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[L] Change in pysim[master]: card_key_provider: add PostgreSQL support
by laforge 18 Dec '25

18 Dec '25

Attention is currently required from: daniel, dexter. laforge has posted comments on this change by dexter. ( https://gerrit.osmocom.org/c/pysim/+/41508?usp=email ) Change subject: card_key_provider: add PostgreSQL support ...................................................................... Patch Set 5: (1 comment) File setup.py: https://gerrit.osmocom.org/c/pysim/+/41508/comment/c5fa580e_954c6b8a?usp=em… : PS4, Line 37: psycopg2-binary > > What if we leave it out and mention it in the manual that it is needed […] I agree it should be extras_require -- To view, visit https://gerrit.osmocom.org/c/pysim/+/41508?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Icba625c02a60d7e1f519b506a46bda5ded0537d3 Gerrit-Change-Number: 41508 Gerrit-PatchSet: 5 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Thu, 18 Dec 2025 19:47:23 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Comment-In-Reply-To: dexter <pmaier(a)sysmocom.de>

1 0