csaba.sipos has posted comments on this change by csaba.sipos. ( https://gerrit.osmocom.org/c/osmo-bsc/+/42289?usp=email )
Change subject: nokia_site: Change the LAPD N200 counter for RSL
......................................................................
Set Ready For Review
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/42289?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: Ie4bb804ea636eba2182586db13a625c5933eff31
Gerrit-Change-Number: 42289
Gerrit-PatchSet: 2
Gerrit-Owner: csaba.sipos <metro4(a)freemail.hu>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Comment-Date: Fri, 06 Mar 2026 15:48:01 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: No
dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/42287?usp=email )
Change subject: global_platform/scp: fix dek_encrypt/dek_decrypt for SCP02
......................................................................
global_platform/scp: fix dek_encrypt/dek_decrypt for SCP02
The methods dek_encrypt/dek_decrypt use the wrong algorithm and the
wrong key material. The algorithm should be 3DES rather then single
DES and the key must be the DEK session key instead of the static
DEK key from which the DEK session key is derived.
Related: SYS#7902
Change-Id: I3d0cc7378680b346fa39152c8b7074446d2c869d
---
M pySim/global_platform/scp.py
1 file changed, 4 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/87/42287/1
diff --git a/pySim/global_platform/scp.py b/pySim/global_platform/scp.py
index e674766..124b4c5 100644
--- a/pySim/global_platform/scp.py
+++ b/pySim/global_platform/scp.py
@@ -266,11 +266,13 @@
super().__init__(*args, **kwargs)
def dek_encrypt(self, plaintext:bytes) -> bytes:
- cipher = DES.new(self.card_keys.dek[:8], DES.MODE_ECB)
+ # See also GPC section B.1.1.2, E.4.7, and E.4.1
+ cipher = DES3.new(self.sk.data_enc, DES.MODE_ECB)
return cipher.encrypt(plaintext)
def dek_decrypt(self, ciphertext:bytes) -> bytes:
- cipher = DES.new(self.card_keys.dek[:8], DES.MODE_ECB)
+ # See also GPC section B.1.1.2, E.4.7, and E.4.1
+ cipher = DES3.new(self.sk.data_enc, DES.MODE_ECB)
return cipher.decrypt(ciphertext)
def _compute_cryptograms(self, card_challenge: bytes, host_challenge: bytes):
--
To view, visit https://gerrit.osmocom.org/c/pysim/+/42287?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-Change-Id: I3d0cc7378680b346fa39152c8b7074446d2c869d
Gerrit-Change-Number: 42287
Gerrit-PatchSet: 1
Gerrit-Owner: dexter <pmaier(a)sysmocom.de>
Attention is currently required from: pespin.
osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42271?usp=email )
Change subject: ggsn: TC_pdp(4)6_clients_interact: Expect UEs can interact using global IPv6 address
......................................................................
Patch Set 2: Code-Review+1
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42271?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I0267a9c3bb85736a2aeb4f7dd91f44dbce626958
Gerrit-Change-Number: 42271
Gerrit-PatchSet: 2
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Fri, 06 Mar 2026 13:23:04 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Attention is currently required from: laforge.
osmith has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/python/pyosmocom/+/41384?usp=email )
Change subject: Fix lint errors: don't use star imports
......................................................................
Patch Set 2:
(1 comment)
File tests/test_construct.py:
https://gerrit.osmocom.org/c/python/pyosmocom/+/41384/comment/96eb99b7_cc69… :
PS2, Line 8: DnsAdapter,
> So far we don't have a "from X import" line in pyosmocom that exceeds the 120 character limit which […]
@laforge@osmocom.org: ping, could you take another look?
--
To view, visit https://gerrit.osmocom.org/c/python/pyosmocom/+/41384?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: python/pyosmocom
Gerrit-Branch: master
Gerrit-Change-Id: I0ca76a40d47f72635682de9303ff73e9b2197266
Gerrit-Change-Number: 41384
Gerrit-PatchSet: 2
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Comment-Date: Fri, 06 Mar 2026 13:21:10 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: osmith <osmith(a)sysmocom.de>
Comment-In-Reply-To: laforge <laforge(a)osmocom.org>
osmith has submitted this change. ( https://gerrit.osmocom.org/c/python/pyosmocom/+/41386?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: Fix lint errors: test for membership should be `not in`
......................................................................
Fix lint errors: test for membership should be `not in`
src/osmocom/tlv.py:477:16: E713 [*] Test for membership should be `not in`
|
475 | key-value pair, where the key is the snake-reformatted type name of 'self'"""
476 | expected_key_name = camel_to_snake(type(self).__name__)
477 | if not expected_key_name in decoded:
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ E713
478 | raise ValueError("Dict %s doesn't contain expected key %s" % (decoded, expected_key_name))
479 | self.from_val_dict(decoded[expected_key_name])
|
= help: Convert to `not in`
Change-Id: I2ca3135f1ce38dcc06dc95c38f4b6258a60121cd
---
M src/osmocom/tlv.py
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
pespin: Looks good to me, approved
laforge: Looks good to me, approved
osmith: Verified
fixeria: Looks good to me, but someone else must approve
diff --git a/src/osmocom/tlv.py b/src/osmocom/tlv.py
index 93e4e87..14c22f0 100644
--- a/src/osmocom/tlv.py
+++ b/src/osmocom/tlv.py
@@ -474,7 +474,7 @@
This method is symmetrical to to_dict() above, i.e. the outer dict must contain just a single
key-value pair, where the key is the snake-reformatted type name of 'self'"""
expected_key_name = camel_to_snake(type(self).__name__)
- if not expected_key_name in decoded:
+ if expected_key_name not in decoded:
raise ValueError("Dict %s doesn't contain expected key %s" % (decoded, expected_key_name))
self.from_val_dict(decoded[expected_key_name])
--
To view, visit https://gerrit.osmocom.org/c/python/pyosmocom/+/41386?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: python/pyosmocom
Gerrit-Branch: master
Gerrit-Change-Id: I2ca3135f1ce38dcc06dc95c38f4b6258a60121cd
Gerrit-Change-Number: 41386
Gerrit-PatchSet: 3
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
osmith has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/python/pyosmocom/+/41386?usp=email )
Change subject: Fix lint errors: test for membership should be `not in`
......................................................................
Patch Set 3: Verified+1
--
To view, visit https://gerrit.osmocom.org/c/python/pyosmocom/+/41386?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: python/pyosmocom
Gerrit-Branch: master
Gerrit-Change-Id: I2ca3135f1ce38dcc06dc95c38f4b6258a60121cd
Gerrit-Change-Number: 41386
Gerrit-PatchSet: 3
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Fri, 06 Mar 2026 13:19:40 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
osmith has submitted this change. ( https://gerrit.osmocom.org/c/python/pyosmocom/+/41385?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: Fix lint errors: avoid equality comparisons to `False`
......................................................................
Fix lint errors: avoid equality comparisons to `False`
src/osmocom/utils.py:150:8: E712 Avoid equality comparisons to `False`; use `if not signed:` for false checks
|
148 | """
149 |
150 | if signed == False and number < 0:
| ^^^^^^^^^^^^^^^ E712
151 | raise ValueError("expecting a positive number")
|
= help: Replace with `not signed`
Change-Id: I2ebb33c498b4a7e6229980462aa51b579fa4f782
---
M src/osmocom/utils.py
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
fixeria: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
osmith: Verified
laforge: Looks good to me, approved
diff --git a/src/osmocom/utils.py b/src/osmocom/utils.py
index 3991da2..7963c05 100644
--- a/src/osmocom/utils.py
+++ b/src/osmocom/utils.py
@@ -147,7 +147,7 @@
Integer 'nbytes', which is the number of bytes required to encode 'number'
"""
- if signed == False and number < 0:
+ if not signed and number < 0:
raise ValueError("expecting a positive number")
# Compute how many bytes we need for the absolute (positive) value of the given number
--
To view, visit https://gerrit.osmocom.org/c/python/pyosmocom/+/41385?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: python/pyosmocom
Gerrit-Branch: master
Gerrit-Change-Id: I2ebb33c498b4a7e6229980462aa51b579fa4f782
Gerrit-Change-Number: 41385
Gerrit-PatchSet: 3
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42286?usp=email )
Change subject: {hlr,hss}/pyhss/config: remove unused options
......................................................................
{hlr,hss}/pyhss/config: remove unused options
PyHSS had several unused config options. They have been removed
upstream, remove them from the osmo-ttcn3-hacks configs as well.
Related: https://github.com/nickvsnetworking/pyhss/pull/284
Change-Id: I87cf01e00fe0a3b32be9eaa4cf4c1ddf02cddc0b
---
M hlr/pyhss/config.yaml
M hss/pyhss/config.yaml
2 files changed, 0 insertions(+), 52 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/86/42286/1
diff --git a/hlr/pyhss/config.yaml b/hlr/pyhss/config.yaml
index 87e6c53..61b819e 100644
--- a/hlr/pyhss/config.yaml
+++ b/hlr/pyhss/config.yaml
@@ -8,12 +8,6 @@
site_name: "TTCN3"
MCC: "001"
MNC: "01"
- SLh_enabled: False
- #IMSI of Test Subscriber for Unit Checks (Optional)
- test_sub_imsi: '001021234567890'
-
- #The maximum time to wait, in seconds, before disconnecting a client when no data is received.
- client_socket_timeout: 120
#The maximum time to wait, in seconds, before disconnecting a client when no data is received.
client_socket_timeout: 300
@@ -39,13 +33,6 @@
#If enabled sends CLRs to old MME when new MME attaches active sub
CancelLocationRequest_Enabled: False
- #Workaround for some MMEs to force an Insert Subscriber Data request to be sent immediately after ULA
- Insert_Subscriber_Data_Force: False
-
- #Default Initial Filter Criteria for IMS Subscribers
- #Jinja Formatted Template, see the example for variables passed to it.
- Default_iFC: 'default_ifc.xml'
-
#Default Sh User Data
Default_Sh_UserData: 'default_sh_user_data.xml'
@@ -124,11 +111,7 @@
database:
db_type: sqlite
server: 127.0.0.1
- username: dbeaver
- password: password
database: pyhss.db
- readCacheEnabled: True
- readCacheInterval: 60
## External Webhook Notifications
webhooks:
@@ -160,18 +143,6 @@
unixSocketPath: '/var/run/redis/redis-server.sock'
host: localhost
port: 6379
- sentinel:
- masterName: exampleMaster
- hosts:
- - exampleSentinel.mnc001.mcc001.3gppnetwork.org:
- port: 6379
- password: ''
-
-
-prometheus:
- enabled: False
- port: 8081 #If the API is run the API runs on the next port number up from this
- async_subscriber_count: False #If enabled the subscriber count will be updated asynchronously for Prometheus
influxdb:
enabled: False
diff --git a/hss/pyhss/config.yaml b/hss/pyhss/config.yaml
index 3114820..c951beb 100644
--- a/hss/pyhss/config.yaml
+++ b/hss/pyhss/config.yaml
@@ -8,12 +8,6 @@
site_name: "TTCN3"
MCC: "001"
MNC: "01"
- SLh_enabled: False
- #IMSI of Test Subscriber for Unit Checks (Optional)
- test_sub_imsi: '001021234567890'
-
- #The maximum time to wait, in seconds, before disconnecting a client when no data is received.
- client_socket_timeout: 120
#The maximum time to wait, in seconds, before disconnecting a client when no data is received.
client_socket_timeout: 300
@@ -39,13 +33,6 @@
#If enabled sends CLRs to old MME when new MME attaches active sub
CancelLocationRequest_Enabled: False
- #Workaround for some MMEs to force an Insert Subscriber Data request to be sent immediately after ULA
- Insert_Subscriber_Data_Force: False
-
- #Default Initial Filter Criteria for IMS Subscribers
- #Jinja Formatted Template, see the example for variables passed to it.
- Default_iFC: 'default_ifc.xml'
-
#Default Sh User Data
Default_Sh_UserData: 'default_sh_user_data.xml'
@@ -121,11 +108,7 @@
database:
db_type: sqlite
server: 127.0.0.1
- username: dbeaver
- password: password
database: pyhss.db
- readCacheEnabled: True
- readCacheInterval: 60
## External Webhook Notifications
webhooks:
@@ -157,12 +140,6 @@
unixSocketPath: '/var/run/redis/redis-server.sock'
host: localhost
port: 6379
- sentinel:
- masterName: exampleMaster
- hosts:
- - exampleSentinel.mnc001.mcc001.3gppnetwork.org:
- port: 6379
- password: ''
influxdb:
enabled: False
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42286?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I87cf01e00fe0a3b32be9eaa4cf4c1ddf02cddc0b
Gerrit-Change-Number: 42286
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42285?usp=email )
Change subject: hlr: pyhss: run the pyhss_hss service
......................................................................
hlr: pyhss: run the pyhss_hss service
Database preparations used to be done in PyHSS by all services if they
noticed that this was needed. The time between checking and creating the
tables caused a race condition where two services attempting to create
tables at the same time will result at one of them failing, we have seen
this in our ttcn3-hlr-test-pyhss jobs sometimes:
[Database] [DEBUG] Table apn already exists
[Database] [DEBUG] Table auc already exists
[Database] [DEBUG] Table subscriber already exists
…
[testenv][pyhss] pyhss_gsup: setup script failed
I have fixed this upstream by letting only the main service (pyhss_hss)
prepare the database:
https://github.com/nickvsnetworking/pyhss/commit/8b8a2202c345fbb7262c9d07d0…
This means that we now need to run the pyhss_hss service in the HLR
tests, so pyhss_gsup doesn't fail with:
[Database] [INFO] Waiting for the main service to prepare the database
ERROR: 127.0.0.1:4222 did not become available within 5s!
[testenv][pyhss] pyhss_gsup: setup script failed
Change-Id: I4fe689c8d8617432175ba403b45021c0f646970b
---
M hlr/testenv_pyhss.cfg
1 file changed, 5 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/85/42285/1
diff --git a/hlr/testenv_pyhss.cfg b/hlr/testenv_pyhss.cfg
index 7a70872..2e81987 100644
--- a/hlr/testenv_pyhss.cfg
+++ b/hlr/testenv_pyhss.cfg
@@ -10,6 +10,11 @@
package=no
copy=pyhss/redis.conf
+[pyhss_hss]
+program=cd ../pyhss_gsup && ./run_in_venv.sh pyhss_hss
+make=pyhss
+package=pyhss
+
[pyhss_gsup]
program=./run_in_venv.sh pyhss_gsup
setup=wait_for_port.py -p 4222
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42285?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I4fe689c8d8617432175ba403b45021c0f646970b
Gerrit-Change-Number: 42285
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>