February 2022 - gerrit-log - lists.osmocom.org

Change in dahdi-tools[master]: Fix compilation with gcc-10.2.0

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/dahdi-tools/+/27273 ) Change subject: Fix compilation with gcc-10.2.0 ...................................................................... Fix compilation with gcc-10.2.0 /bin/sh ../libtool --tag=CC --mode=link gcc -I. -I./xtalk/include -Wall -g -O2 -lusb-1.0 -o astribank_tool astribank_tool-astribank_tool.o libastribank.la -lpthread -lm libtool: link: gcc -I. -I./xtalk/include -Wall -g -O2 -o astribank_tool astribank_tool-astribank_tool.o ./.libs/libastribank.a -lusb-1.0 -lpthread -lm /usr/bin/ld: ./.libs/libastribank.a(libxtalk_la-xtalk_sync.o):/space/home/laforge/projects/git/dahdi-tools/xpp/xtalk/xtalk_sync.c:63: multiple definition of `members'; ./.libs/libastribank.a(libastribank_la-mpptalk.o):/space/home/laforge/projects/git/dahdi-tools/xpp/mpptalk.c:240: first defined here Change-Id: I1d6f46874f74e1dfc70cabf7c4a8b8cdae9af4fa --- M xpp/xtalk/xtalk_sync.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/dahdi-tools refs/changes/73/27273/1 diff --git a/xpp/xtalk/xtalk_sync.c b/xpp/xtalk/xtalk_sync.c index 18a5cad..e1630b2 100644 --- a/xpp/xtalk/xtalk_sync.c +++ b/xpp/xtalk/xtalk_sync.c @@ -60,7 +60,7 @@ MEMBER(XTALK, ACK); MEMBER(XTALK, PROTO_GET); MEMBER(XTALK, PROTO_GET_REPLY); -} PACKED members; +} PACKED _members; const struct xtalk_protocol xtalk_sync_proto = { .name = "XTALK-SYNC", -- To view, visit https://gerrit.osmocom.org/c/dahdi-tools/+/27273 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: dahdi-tools Gerrit-Branch: master Gerrit-Change-Id: I1d6f46874f74e1dfc70cabf7c4a8b8cdae9af4fa Gerrit-Change-Number: 27273 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

3 years, 4 months

1
0
0 0

Change in dahdi-tools[master]: dahdi_pcap: Fix LAPD pseudo header hardware address length

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/dahdi-tools/+/27274 ) Change subject: dahdi_pcap: Fix LAPD pseudo header hardware address length ...................................................................... dahdi_pcap: Fix LAPD pseudo header hardware address length the 'halen' field is the length of the hardware address (8 bytes), and not the length of the payload. Change-Id: I72e009f40c8e9e295bc1e1f4a0951cd1236cdf43 --- M dahdi_pcap.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/dahdi-tools refs/changes/74/27274/1 diff --git a/dahdi_pcap.c b/dahdi_pcap.c index f6fa7fe..225fe78 100644 --- a/dahdi_pcap.c +++ b/dahdi_pcap.c @@ -163,7 +163,7 @@ lapd->sll_pkttype = 3; lapd->sll_hatype = 0; - lapd->sll_halen = res; + lapd->sll_halen = htons(8); // lapd->sll_addr = ??? lapd->sll_protocol[0] = 0x00; lapd->sll_protocol[1] = 0x30; -- To view, visit https://gerrit.osmocom.org/c/dahdi-tools/+/27274 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: dahdi-tools Gerrit-Branch: master Gerrit-Change-Id: I72e009f40c8e9e295bc1e1f4a0951cd1236cdf43 Gerrit-Change-Number: 27274 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

3 years, 4 months

1
0
0 0

Change in osmo-bsc[master]: WIP: New stats for lchan life duration.

by laforge

Attention is currently required from: iedemam, neels. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27081 ) Change subject: WIP: New stats for lchan life duration. ...................................................................... Patch Set 9: (1 comment) File src/osmo-bsc/bts.c: https://gerrit.osmocom.org/c/osmo-bsc/+/27081/comment/9d01083c_7a72c2aa PS8, Line 1514: "Cummulative number of active milliseconds on TCH chans", > I agree the name is messy. […] sounds great -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27081 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I1b0670c47cb5e0b7776eda89d1e71545ba0e3347 Gerrit-Change-Number: 27081 Gerrit-PatchSet: 9 Gerrit-Owner: iedemam <michael(a)kapsulate.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: iedemam <michael(a)kapsulate.com> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Mon, 21 Feb 2022 18:27:52 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: iedemam <michael(a)kapsulate.com> Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: comment

3 years, 4 months

1
0
0 0

Change in osmo-bsc[master]: WIP: New stats for lchan life duration.

by iedemam

Attention is currently required from: neels. iedemam has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27081 ) Change subject: WIP: New stats for lchan life duration. ...................................................................... Patch Set 9: (11 comments) Patchset: PS9: Hi Neels, Thanks for the extensive review. I have addressed many of your individual comments but not yet made the switch to your recommended approach for increasing accuracy. I will submit another update tomorrow. For now, I wanted to clean up the noise on this changeset so far and clarify its purpose. Thanks again, -Michael File include/osmocom/bsc/gsm_data.h: https://gerrit.osmocom.org/c/osmo-bsc/+/27081/comment/9d9705a8_8f4ae15f PS8, Line 1130: unsigned long long gsm_lchan_active_duration_ms(const struct gsm_lchan *lchan); > (idea: use uint64_t for a fixed size independent from arch. […] Done File src/osmo-bsc/bts.c: https://gerrit.osmocom.org/c/osmo-bsc/+/27081/comment/71d1a3aa_870a5141 PS8, Line 1514: "Cummulative number of active milliseconds on TCH chans", > ("Cumulative") […] I agree the name is messy. However, this will indeed hold the cumulative number of milliseconds, not the average duration per activation. I am deriving the average based on this total in the VTY. I am also planning to use this total to show Erlangs per site. Perhaps "Cumulative number of milliseconds of TCH channel activity."? File src/osmo-bsc/bts_trx_vty.c: https://gerrit.osmocom.org/c/osmo-bsc/+/27081/comment/30f5d6cc_d4f24e9b PS8, Line 574: uint duration_s = (gsm_lchan_active_duration_ms(lchan) + 500) / 1000; > the +500 acts as a round(), yet the reported descriptions below suggest that floor() should be used […] Done File src/osmo-bsc/bts_vty.c: https://gerrit.osmocom.org/c/osmo-bsc/+/27081/comment/6d99f3ed_038fd742 PS8, Line 3826: uint64_t activations_tch = rate_ctr_group_get_ctr(bts->bts_ctrs, BTS_CTR_CHAN_ACT_TCH)->current; > osmocom style dictates that local variables are declared at the start of the function (or scope) Done File src/osmo-bsc/gsm_data.c: https://gerrit.osmocom.org/c/osmo-bsc/+/27081/comment/a2e11d99_13e44cab PS8, Line 348: /* Get duration of active time for this lchan in milliseconds */ > Rather: […] Done https://gerrit.osmocom.org/c/osmo-bsc/+/27081/comment/273efcdf_40c620a0 PS8, Line 352: if (lchan->activate.concluded) { > osmocom style asks for early-exit: […] Done https://gerrit.osmocom.org/c/osmo-bsc/+/27081/comment/e7f20f1a_ff1fca66 PS8, Line 357: duration = elapsed.tv_sec * 1000LL + elapsed.tv_nsec / 1000000; > the LL on the 1000 has no effect, the first operand defines the integer size for calculation. […] Done File src/osmo-bsc/lchan_fsm.c: https://gerrit.osmocom.org/c/osmo-bsc/+/27081/comment/0de12fcb_1e7b022d PS8, Line 1810: > You should rather put this bit in a new lchan_st_established_onleave() function. […] This is a great bit of information. I do think it is important to capture the error timeouts. If we see SDCCH averages trending toward a long timeout value, we know something is up. I've moved the stat increment code and log to lchan_fsm_unused_onenter. https://gerrit.osmocom.org/c/osmo-bsc/+/27081/comment/2de06a3f_096d9a4e PS8, Line 1811: /* Add active milliseconds to cummulative counts per channel type */ > /* Report how long this lchan was active, to add to the average activity duration metric. […] Adopted. However, I will use "cumulative duration" to reflect that stat's purpose as mentioned before. https://gerrit.osmocom.org/c/osmo-bsc/+/27081/comment/d1cd083c_5099ffff PS8, Line 1817: LOG_LCHAN(lchan, LOGL_INFO, "GSM_LCHAN_TCH was active for %llu milliseconds\n", duration_ms); > i would rather just have a single LOG_LCHAN() that uses gsm_chan_t_name() above the switch, because […] Done -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27081 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I1b0670c47cb5e0b7776eda89d1e71545ba0e3347 Gerrit-Change-Number: 27081 Gerrit-PatchSet: 9 Gerrit-Owner: iedemam <michael(a)kapsulate.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Mon, 21 Feb 2022 18:13:14 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: comment

3 years, 4 months

1
0
0 0

Change in osmo-bsc[master]: Merge branch 'master' of ssh://gerrit.osmocom.org:29418/osmo-bsc

by iedemam

iedemam has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27272 ) Change subject: Merge branch 'master' of ssh://gerrit.osmocom.org:29418/osmo-bsc ...................................................................... Abandoned pull / merge / push = whoops...apologies for the noise -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27272 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id90e2871c534921f7a67ae89b560ba467b0ef1e7 Gerrit-Change-Number: 27272 Gerrit-PatchSet: 1 Gerrit-Owner: iedemam <michael(a)kapsulate.com> Gerrit-CC: Jenkins Builder Gerrit-MessageType: abandon

3 years, 4 months

1
0
0 0

Change in osmo-bsc[master]: Merge branch 'master' of ssh://gerrit.osmocom.org:29418/osmo-bsc

by iedemam

iedemam has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27272 ) Change subject: Merge branch 'master' of ssh://gerrit.osmocom.org:29418/osmo-bsc ...................................................................... Merge branch 'master' of ssh://gerrit.osmocom.org:29418/osmo-bsc Change-Id: Id90e2871c534921f7a67ae89b560ba467b0ef1e7 --- 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/72/27272/1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27272 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id90e2871c534921f7a67ae89b560ba467b0ef1e7 Gerrit-Change-Number: 27272 Gerrit-PatchSet: 1 Gerrit-Owner: iedemam <michael(a)kapsulate.com> Gerrit-MessageType: newchange

3 years, 4 months

1
0
0 0

Change in osmo-bsc[master]: WIP: New stats for lchan life duration.

by iedemam

Attention is currently required from: iedemam. Hello Jenkins Builder, neels, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/27081 to look at the new patch set (#9). Change subject: WIP: New stats for lchan life duration. ...................................................................... WIP: New stats for lchan life duration. This patch adds two stats which track cummulative lchan lifetime by type TCH and SDCCH. These new counters will accomplish two things: 1) Provide a glanceable way to see if lchan durations look healthy. When examining a site, short-lived (<5s) and long-lived (>30s) TCH lchans are difficult to tell apart. If we only see short-lived TCH lchans, there is most likely an RF or signaling problem to investigate. This new counter will expose channel ages in the VTY output 2) Provide a more accurate count for Erlangs per site. Currently, we are basing Erlangs on active TCH channel counts per stats period. This method skews high very quickly. Each active TCH in that period translates into the full 10s of activity. This counter should improve accuracy by two orders of magnitude. Approach: - For now: a time calculation between channel activation and release - Maybe cleaner: use osmo_time_cc Change-Id: I1b0670c47cb5e0b7776eda89d1e71545ba0e3347 --- M include/osmocom/bsc/bts.h M include/osmocom/bsc/gsm_data.h M src/osmo-bsc/bts.c M src/osmo-bsc/bts_trx_vty.c M src/osmo-bsc/bts_vty.c M src/osmo-bsc/gsm_data.c M src/osmo-bsc/lchan_fsm.c 7 files changed, 71 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/81/27081/9 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27081 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I1b0670c47cb5e0b7776eda89d1e71545ba0e3347 Gerrit-Change-Number: 27081 Gerrit-PatchSet: 9 Gerrit-Owner: iedemam <michael(a)kapsulate.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: iedemam <michael(a)kapsulate.com> Gerrit-MessageType: newpatchset

3 years, 4 months

1
0
0 0

Change in pysim[master]: Initial support for GlobalPlatform

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/27271 ) Change subject: Initial support for GlobalPlatform ...................................................................... Initial support for GlobalPlatform One can now select the Issuer Security Domain (hard-coded to a000000003000000) and issue get_data requests. FCI and other TLV objects are dcoded, e.g. pySIM-shell (MF)> select ADF.ISD { "application_id": "a000000003000000", "proprietary_data": { "maximum_length_of_data_field_in_command_message": 255 } } pySIM-shell (MF/ADF.ISD)> get_data CardData { "card_data": [ { "card_recognition_data": [ { "object_identifier": "2a864886fc6b01" }, { "card_management_type_and_version": [ { "object_identifier": "2a864886fc6b02020101" } ] }, { "card_identification_scheme": [ { "object_identifier": "2a864886fc6b03" } ] }, { "secure_channel_protocol_of_isd": [ { "object_identifier": "2a864886fc6b040215" } ] } ] } ] } Change-Id: If11267d45ab7aa371eea8c143abd9320c32b54d0 --- M pySim-shell.py M pySim/commands.py A pySim/global_platform.py 3 files changed, 265 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/71/27271/1 diff --git a/pySim-shell.py b/pySim-shell.py index 0753b10..06977f0 100755 --- a/pySim-shell.py +++ b/pySim-shell.py @@ -53,6 +53,7 @@ from pySim.ts_31_102 import CardApplicationUSIM from pySim.ts_31_103 import CardApplicationISIM from pySim.ara_m import CardApplicationARAM +from pySim.global_platform import CardApplicationISD from pySim.gsm_r import DF_EIRENE # we need to import this module so that the SysmocomSJA2 sub-class of @@ -103,6 +104,7 @@ profile.add_application(CardApplicationUSIM()) profile.add_application(CardApplicationISIM()) profile.add_application(CardApplicationARAM()) + profile.add_application(CardApplicationISD()) # Create runtime state with card profile rs = RuntimeState(card, profile) diff --git a/pySim/commands.py b/pySim/commands.py index df23393..a959851 100644 --- a/pySim/commands.py +++ b/pySim/commands.py @@ -621,3 +621,7 @@ negotiated_duration_secs = decode_duration(data[:4]) resume_token = data[4:] return (negotiated_duration_secs, resume_token, sw) + + def get_data(self, tag: int, cla: int = 0x00): + data, sw = self._tp.send_apdu('%02xca%04x00' % (cla, tag)) + return (data, sw) diff --git a/pySim/global_platform.py b/pySim/global_platform.py new file mode 100644 index 0000000..96d4329 --- /dev/null +++ b/pySim/global_platform.py @@ -0,0 +1,259 @@ +# coding=utf-8 +"""Partial Support for GlobalPLatform Card Spec (currently 2.1.1) + +(C) 2022 by Harald Welte <laforge(a)osmocom.org> + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see <http://www.gnu.org/licenses/>. +""" + +from typing import Optional, List, Dict, Tuple +from construct import Optional as COptional +from construct import * +from bidict import bidict +from pySim.construct import * +from pySim.utils import * +from pySim.filesystem import * +from pySim.tlv import * +from pySim.profile import CardProfile + +sw_table = { + 'Warnings': { + '6200': 'Logical Channel already closed', + '6283': 'Card Life Cycle State is CARD_LOCKED', + '6310': 'More data available', + }, + 'Execution errors': { + '6400': 'No specific diagnosis', + '6581': 'Memory failure', + }, + 'Checking errors': { + '6700': 'Wrong length in Lc', + }, + 'Functions in CLA not supported': { + '6881': 'Logical channel not supported or active', + '6882': 'Secure messaging not supported', + }, + 'Command not allowed': { + '6982': 'Security Status not satisfied', + '6985': 'Conditions of use not satisfied', + }, + 'Wrong parameters': { + '6a80': 'Incorrect values in command data', + '6a81': 'Function not supported e.g. card Life Cycle State is CARD_LOCKED', + '6a82': 'Application not found', + '6a84': 'Not enough memory space', + '6a86': 'Incorrect P1 P2', + '6a88': 'Referenced data not found', + }, + 'GlobalPlatform': { + '6d00': 'Invalid instruction', + '6e00': 'Invalid class', + }, + 'Application errors': { + '9484': 'Algorithm not supported', + '9485': 'Invalid key check value', + }, +} + +# GlobalPlatform 2.1.1 Section 9.1.6 +KeyType = Enum(Byte, des=0x80, + rsa_public_exponent_e_cleartex=0xA0, + rsa_modulus_n_cleartext=0xA1, + rsa_modulus_n=0xA2, + rsa_private_exponent_d=0xA3, + rsa_chines_remainder_p=0xA4, + rsa_chines_remainder_q=0xA5, + rsa_chines_remainder_pq=0xA6, + rsa_chines_remainder_dpi=0xA7, + rsa_chines_remainder_dqi=0xA8, + not_available=0xff) + +# GlobalPlatform 2.1.1 Section 9.3.3.1 +# example: +# e0 48 +# c0 04 01708010 +# c0 04 02708010 +# c0 04 03708010 +# c0 04 01018010 +# c0 04 02018010 +# c0 04 03018010 +# c0 04 01028010 +# c0 04 02028010 +# c0 04 03028010 +# c0 04 01038010 +# c0 04 02038010 +# c0 04 03038010 +class KeyInformationData(BER_TLV_IE, tag=0xc0): + _construct = Struct('key_identifier'/Byte, 'key_version_number'/Byte, + 'key_types'/GreedyRange(KeyType)) +class KeyInformation(BER_TLV_IE, tag=0xe0, nested=[KeyInformationData]): + pass + +class ConfirmationCounter(BER_TLV_IE, tag=0xc2): + _construct = GreedyInteger() + +# card data sample, returned in response to GET DATA (80ca006600): +# 66 31 +# 73 2f +# 06 07 +# 2a864886fc6b01 +# 60 0c +# 06 0a +# 2a864886fc6b02020101 +# 63 09 +# 06 07 +# 2a864886fc6b03 +# 64 0b +# 06 09 +# 2a864886fc6b040215 + +# GlobalPlatform 2.1.1 Table F-1 +class ObjectIdentifier(BER_TLV_IE, tag=0x06): + _construct = GreedyBytes +class CardManagementTypeAndVersion(BER_TLV_IE, tag=0x60, nested=[ObjectIdentifier]): + pass +class CardIdentificationScheme(BER_TLV_IE, tag=0x63, nested=[ObjectIdentifier]): + pass +class SecureChannelProtocolOfISD(BER_TLV_IE, tag=0x64, nested=[ObjectIdentifier]): + pass +class CardConfigurationDetails(BER_TLV_IE, tag=0x65): + _construct = GreedyBytes +class CardChipDetails(BER_TLV_IE, tag=0x66): + _construct = GreedyBytes +class CardRecognitionData(BER_TLV_IE, tag=0x73, nested=[ObjectIdentifier, + CardManagementTypeAndVersion, + CardIdentificationScheme, + SecureChannelProtocolOfISD, + CardConfigurationDetails, + CardChipDetails]): + pass +class CardData(BER_TLV_IE, tag=0x66, nested=[CardRecognitionData]): + pass + +# GlobalPlatform 2.1.1 Table F-2 +class SecureChannelProtocolOfSelectedSD(BER_TLV_IE, tag=0x64, nested=[ObjectIdentifier]): + pass +class SecurityDomainMgmtData(BER_TLV_IE, tag=0x73, nested=[CardManagementTypeAndVersion, + CardIdentificationScheme, + SecureChannelProtocolOfSelectedSD, + CardConfigurationDetails, + CardChipDetails]): + pass + +# GlobalPlatform 2.1.1 Section 9.1.1 +IsdLifeCycleState = Enum(Byte, op_ready=0x01, initialized=0x07, secured=0x0f, + card_locked = 0x7f, terminated=0xff) + +# GlobalPlatform 2.1.1 Section 9.9.3.1 +class ApplicationID(BER_TLV_IE, tag=0x84): + _construct = GreedyBytes + +# GlobalPlatform 2.1.1 Section 9.9.3.1 +class SecurityDomainManagementData(BER_TLV_IE, tag=0x73): + _construct = GreedyBytes + +# GlobalPlatform 2.1.1 Section 9.9.3.1 +class ApplicationProductionLifeCycleData(BER_TLV_IE, tag=0x9f6e): + _construct = GreedyBytes + +# GlobalPlatform 2.1.1 Section 9.9.3.1 +class MaximumLengthOfDataFieldInCommandMessage(BER_TLV_IE, tag=0x9f65): + _construct = GreedyInteger() + +# GlobalPlatform 2.1.1 Section 9.9.3.1 +class ProprietaryData(BER_TLV_IE, tag=0xA5, nested=[SecurityDomainManagementData, + ApplicationProductionLifeCycleData, + MaximumLengthOfDataFieldInCommandMessage]): + pass + +# GlobalPlatform 2.1.1 Section 9.9.3.1 +class FciTemplate(BER_TLV_IE, tag=0x6f, nested=[ApplicationID, SecurityDomainManagementData, + ApplicationProductionLifeCycleData, + MaximumLengthOfDataFieldInCommandMessage, + ProprietaryData]): + pass + +class IssuerIdentificationNumber(BER_TLV_IE, tag=0x42): + _construct = BcdAdapter(GreedyBytes) + +class CardImageNumber(BER_TLV_IE, tag=0x45): + _construct = BcdAdapter(GreedyBytes) + +class SequenceCounterOfDefaultKvn(BER_TLV_IE, tag=0xc1): + _construct = GreedyInteger() + +class ConfirmationCounter(BER_TLV_IE, tag=0xc2): + _construct = GreedyInteger() + +# Collection of all the data objects we can get from GET DATA +class DataCollection(TLV_IE_Collection, nested=[IssuerIdentificationNumber, + CardImageNumber, + CardData, + KeyInformation, + SequenceCounterOfDefaultKvn, + ConfirmationCounter]): + pass + +def decode_select_response(resp_hex: str) -> object: + t = FciTemplate() + t.from_tlv(h2b(resp_hex)) + d = t.to_dict() + return flatten_dict_lists(d['fci_template']) + +# Application Dedicated File of a Security Domain +class ADF_SD(CardADF): + def __init__(self, aid: str, name: str, desc: str): + super().__init__(aid=aid, fid=None, sfid=None, name=name, desc=desc) + self.shell_commands += [self.AddlShellCommands()] + + @staticmethod + def decode_select_response(res_hex: str) -> object: + return decode_select_response(res_hex) + + @with_default_category('Application-Specific Commands') + class AddlShellCommands(CommandSet): + def __init__(self): + super().__init__() + + def do_get_data(self, opts): + tlv_cls_name = opts.arg_list[0] + tlv_cls = DataCollection().members_by_name[tlv_cls_name] + (data, sw) = self._cmd.card._scc.get_data(cla=0x80, tag=tlv_cls.tag) + ie = tlv_cls() + ie.from_tlv(h2b(data)) + self._cmd.poutput_json(ie.to_dict()) + + def complete_get_data(self, text, line, begidx, endidx) -> List[str]: + #data_dict = {camel_to_snake(str(x.__name__)): x for x in DataCollection.possible_nested} + data_dict = {str(x.__name__): x for x in DataCollection.possible_nested} + index_dict = {1: data_dict} + return self._cmd.index_based_complete(text, line, begidx, endidx, index_dict=index_dict) + +# Card Application of a Security Domain +class CardApplicationSD(CardApplication): + def __init__(self, aid: str, name: str, desc: str): + super().__init__(name, adf=ADF_SD(aid, name, desc), sw=sw_table) + +# Card Application of Issuer Security Domain +class CardApplicationISD(CardApplicationSD): + # FIXME: ISD AID is not static, but could be different. One can select the empty + # application using '00a4040000' and then parse the response FCI to get the ISD AID + def __init__(self, aid='a000000003000000'): + super().__init__(aid=aid, name='ADF.ISD', desc='Issuer Security Domain') + +#class CardProfileGlobalPlatform(CardProfile): +# ORDER = 23 +# +# def __init__(self, name='GlobalPlatform'): +# super().__init__(name, desc='GlobalPlatfomr 2.1.1', cla=['00','80','84'], sw=sw_table) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27271 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: If11267d45ab7aa371eea8c143abd9320c32b54d0 Gerrit-Change-Number: 27271 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

3 years, 4 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: GTP_Codec_Port: Check length field of GTPV1C received packets

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27270 ) Change subject: GTP_Codec_Port: Check length field of GTPV1C received packets ...................................................................... GTP_Codec_Port: Check length field of GTPV1C received packets Change-Id: Ie9447b7ec7f7f5ee35cd0393265f5edb5578bdaf --- M library/GTP_CodecPort.ttcn 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/70/27270/1 diff --git a/library/GTP_CodecPort.ttcn b/library/GTP_CodecPort.ttcn index 317210e..b516611 100644 --- a/library/GTP_CodecPort.ttcn +++ b/library/GTP_CodecPort.ttcn @@ -14,6 +14,7 @@ import from IPL4asp_Types all; import from GTPC_Types all; import from GTPU_Types all; + import from Misc_Helpers all; modulepar { SystemUnderTest mp_pl_SystemUnderTest := SGSN; @@ -63,6 +64,10 @@ out_ud.peer.remName := in_ud.remName; out_ud.peer.remPort := in_ud.remPort; out_ud.gtpc := dec_PDU_GTPC(in_ud.msg, pl_SystemUnderTest := mp_pl_SystemUnderTest); + if (lengthof(in_ud.msg) != out_ud.gtpc.lengthf + 8) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("Rx GTPv1-C with field length ", out_ud.gtpc.lengthf, " + 8 != exp ", lengthof(in_ud.msg))); + } } with { extension "prototype(fast)" }; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27270 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ie9447b7ec7f7f5ee35cd0393265f5edb5578bdaf Gerrit-Change-Number: 27270 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 4 months

1
0
0 0

Change in osmo-bsc-nat[master]: bsc_nat_fsm: initial conn-oriented forwarding

by pespin

Attention is currently required from: osmith, fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27260 ) Change subject: bsc_nat_fsm: initial conn-oriented forwarding ...................................................................... Patch Set 4: (1 comment) File src/osmo-bsc-nat/bsc_nat_fsm.c: https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27260/comment/a5e80a3a_77442897 PS3, Line 78: *peer_addr_in = called_addr; > Ack This doesn't look good to me, you are tricking the compiler here. Because at the caller, it will expect those 2 pointers to be not modified after the function, but they may through peer_addr_in. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27260 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc-nat Gerrit-Branch: master Gerrit-Change-Id: I3df79e4dfaa60f4fd098961ee57cda71e9773b82 Gerrit-Change-Number: 27260 Gerrit-PatchSet: 4 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: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 21 Feb 2022 13:11:28 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

3 years, 4 months

1
0
0 0

2025

2024

2023

2022

gerrit-log February 2022