November 2024 - gerrit-log - lists.osmocom.org

[XS] Change in osmo-ci[master]: osmo-depcheck: Remove libosmo-sccp-legacy dep libosmo-xua

by osmith

Attention is currently required from: pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-ci/+/38632?usp=email ) Change subject: osmo-depcheck: Remove libosmo-sccp-legacy dep libosmo-xua ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/38632?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I83ef3576507cc615090afd5d80d985551c7aa5a7 Gerrit-Change-Number: 38632 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 05 Nov 2024 11:05:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

7 months, 3 weeks

1
0
0 0

[L] Change in osmo-ci[master]: WIP

by pespin

pespin has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/38634?usp=email ) Change subject: WIP ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/38634?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: abandon Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I671190206ec64dd1730aefb901acf22afd25c7cd Gerrit-Change-Number: 38634 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

7 months, 3 weeks

1
0
0 0

[M] Change in osmo-ci[master]: WIP

by pespin

pespin has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/38633?usp=email ) Change subject: WIP ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/38633?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: abandon Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ic242b9919552ab7c2647d5ca3b60a71a456b5837 Gerrit-Change-Number: 38633 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

7 months, 3 weeks

1
0
0 0

[M] Change in pysim[master]: global_platform/scp: refactor _wrap_cmd_apdu

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/38635?usp=email ) Change subject: global_platform/scp: refactor _wrap_cmd_apdu ...................................................................... global_platform/scp: refactor _wrap_cmd_apdu The _wrap_cmd_apdu methods for SCP02 and SCP03 are a bit hard to read. Let's refactor them so that it is easier to understand what happens. In particular that one can not have encryption (cenc) without signing (cmac) Related: OS#6367 Change-Id: I4c5650337779a4bd1f98673650c6c3cb526d518b --- M pySim/global_platform/scp.py 1 file changed, 38 insertions(+), 35 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/35/38635/1 diff --git a/pySim/global_platform/scp.py b/pySim/global_platform/scp.py index 0b1f6a9..ebdd880 100644 --- a/pySim/global_platform/scp.py +++ b/pySim/global_platform/scp.py @@ -275,23 +275,24 @@ def _wrap_cmd_apdu(self, apdu: bytes, *args, **kwargs) -> bytes: """Wrap Command APDU for SCP02: calculate MAC and encrypt.""" - lc = len(apdu) - 5 - assert len(apdu) >= 5, "Wrong APDU length: %d" % len(apdu) - assert len(apdu) == 5 or apdu[4] == lc, "Lc differs from length of data: %d vs %d" % (apdu[4], lc) - logger.debug("wrap_cmd_apdu(%s)", b2h(apdu)) - - cla = apdu[0] - b8 = cla & 0x80 - if cla & 0x03 or cla & CLA_SM: - # nonzero logical channel in APDU, check that are the same - assert cla == self._cla(False, b8), "CLA mismatch" - # CLA without log. channel can be 80 or 00 only if self.do_cmac: + lc = len(apdu) - 5 + assert len(apdu) >= 5, "Wrong APDU length: %d" % len(apdu) + assert len(apdu) == 5 or apdu[4] == lc, "Lc differs from length of data: %d vs %d" % (apdu[4], lc) + + # CLA without log. channel can be 80 or 00 only + cla = apdu[0] + b8 = cla & 0x80 + if cla & 0x03 or cla & CLA_SM: + # nonzero logical channel in APDU, check that are the same + assert cla == self._cla(False, b8), "CLA mismatch" + if self.mac_on_unmodified: mlc = lc clac = cla - else: # CMAC on modified APDU + else: + # CMAC on modified APDU mlc = lc + 8 clac = cla | CLA_SM mac = self.sk.calc_mac_1des(bytes([clac]) + apdu[1:4] + bytes([mlc]) + apdu[5:]) @@ -301,8 +302,10 @@ lc = len(data) else: data = apdu[5:] + lc += 8 apdu = bytes([self._cla(True, b8)]) + apdu[1:4] + bytes([lc]) + data + mac + return apdu def unwrap_rsp_apdu(self, sw: bytes, rsp_apdu: bytes) -> bytes: @@ -475,30 +478,30 @@ def _wrap_cmd_apdu(self, apdu: bytes, skip_cenc: bool = False) -> bytes: """Wrap Command APDU for SCP03: calculate MAC and encrypt.""" - cla = apdu[0] - ins = apdu[1] - p1 = apdu[2] - p2 = apdu[3] - lc = apdu[4] - assert lc == len(apdu) - 5 - cmd_data = apdu[5:] - - if self.do_cenc and not skip_cenc: - assert self.do_cmac - if lc == 0: - # No encryption shall be applied to a command where there is no command data field. In this - # case, the encryption counter shall still be incremented - self.sk.block_nr += 1 - else: - # data shall be padded as defined in [GPCS] section B.2.3 - padded_data = pad80(cmd_data, 16) - lc = len(padded_data) - if lc >= 256: - raise ValueError('Modified Lc (%u) would exceed maximum when appending padding' % (lc)) - # perform AES-CBC with ICV + S_ENC - cmd_data = self.sk._encrypt(padded_data) - + logger.debug("wrap_cmd_apdu(%s)", b2h(apdu)) if self.do_cmac: + cla = apdu[0] + ins = apdu[1] + p1 = apdu[2] + p2 = apdu[3] + lc = apdu[4] + assert lc == len(apdu) - 5 + cmd_data = apdu[5:] + + if self.do_cenc and not skip_cenc: + if lc == 0: + # No encryption shall be applied to a command where there is no command data field. In this + # case, the encryption counter shall still be incremented + self.sk.block_nr += 1 + else: + # data shall be padded as defined in [GPCS] section B.2.3 + padded_data = pad80(cmd_data, 16) + lc = len(padded_data) + if lc >= 256: + raise ValueError('Modified Lc (%u) would exceed maximum when appending padding' % (lc)) + # perform AES-CBC with ICV + S_ENC + cmd_data = self.sk._encrypt(padded_data) + # The length of the command message (Lc) shall be incremented by 8 (in S8 mode) or 16 (in S16 # mode) to indicate the inclusion of the C-MAC in the data field of the command message. mlc = lc + self.s_mode -- To view, visit https://gerrit.osmocom.org/c/pysim/+/38635?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: I4c5650337779a4bd1f98673650c6c3cb526d518b Gerrit-Change-Number: 38635 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de>

7 months, 3 weeks

1
0
0 0

[M] Change in osmo-ci[master]: WIP

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/38633?usp=email ) Change subject: WIP ...................................................................... WIP Change-Id: Ic242b9919552ab7c2647d5ca3b60a71a456b5837 --- A scripts/pespin-nightly.sh 1 file changed, 205 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/33/38633/1 diff --git a/scripts/pespin-nightly.sh b/scripts/pespin-nightly.sh new file mode 100755 index 0000000..2bd95c8 --- /dev/null +++ b/scripts/pespin-nightly.sh @@ -0,0 +1,205 @@ +#!/bin/bash +. "$(dirname "$0")/common.sh" +. "$(dirname "$0")/common-obs.sh" + +# requirements +# apt install devscripts git-buildpackage osc git + +set -e +set -x + +# OBS project name +PROJ=home:pespin:branches:network:osmocom:nightly + +DT=$(date +%Y%m%d) +TOP=$(pwd)/$(mktemp -d nightly-3g_XXXXXX) + +if ! which osc >/dev/null 2>/dev/null ; then + echo "osc binary not found" + exit 1 +fi + +### OBS build +prepare() { + # clean up the whole space + mkdir -p "$REPO/osc/" + cd "$REPO/osc" + osc co "$PROJ" + + cd "$REPO" + osmo_obs_prepare_conflict "osmocom-nightly" "osmocom-latest" +} + +get_last_tag() { + project="$1" + if [ "$project" = "limesuite" ]; then + ver_regexp="^v[0-9]*.[0-9]*.[0-9]*$" + else + ver_regexp="^[0-9]*.[0-9]*.[0-9]*$" + fi + VER=$(git -C "${REPO}/${project}" tag -l --sort=v:refname | grep "$ver_regexp" | tail -n 1) + echo "${VER}" +} + +get_commit_version() { + # return a version based on the commit + local version + + # determine git version *and generate the .tarball-version file* + test -x ./git-version-gen && ./git-version-gen . > .tarball-version 2>/dev/null + version=$(cat .tarball-version) + # debian doesn't allow '-' in version. + version=$(echo "$version" | sed 's/-/./g' ) + + # deb version + if [ -z "$version" ] ; then + version=$(head -1 debian/changelog | cut -d ' ' -f 2 | sed 's,(,,' | sed 's,),,') + version="$version.$DT" + fi + + echo -n "$version" +} + +### common +checkout() { + local name=$1 + local branch=$2 + local url="https://git.osmocom.org" + + cd "$REPO" + + if [ -n "$branch" ] ; then + osmo_git_clone_date "$url/$name" -b "$branch" + else + osmo_git_clone_date "$url/$name" + fi + + cd - +} + +build() { + local name=$1 + local changelog=$2 + local gitbpargs=$3 + local repodir=$REPO/$name + local oscdir=$REPO/osc/$PROJ/$name + + if [ -z "$changelog" ] ; then + changelog=commit + fi + + if [ -d "$oscdir" ] ; then + # remove earlier version + cd "$oscdir" + osc rm -- * || true + else + # new package + mkdir -p "$oscdir/" + cd "$REPO/osc/$PROJ/" + osc add "$name" + fi + + cd "$repodir" + + if [ "$changelog" = "commit" ] ; then + VER=$(get_commit_version) + osmo_obs_add_debian_dependency "./debian/control" "osmocom-nightly" + dch -b -v "$VER" -m "Snapshot build" + git commit -m "$VER snapshot" debian/ + fi + + mkdir -p "$DATA/$name" + # source code build without dependency checks and unsigned source and unsigned change log + if [ -f .tarball-version ]; then + gbp buildpackage -S -uc -us -d --git-ignore-branch "--git-export-dir=$DATA/$name" \ + --git-ignore-new $gitbpargs \ + --git-postexport='cp $GBP_GIT_DIR/../.tarball-version $GBP_TMP_DIR/' + else + gbp buildpackage -S -uc -us -d --git-ignore-branch "--git-export-dir=$DATA/$name" \ + --git-ignore-new $gitbpargs + fi + + mv "$DATA/$name/"*.tar* "$DATA/$name/"*.dsc "$oscdir/" + + cd "$oscdir" + osc add -- *.tar* *.dsc + osc ci -m "Snapshot $name $DT" +} + +post() { + cd "$REPO/osc/$PROJ/" + osc status +} + +download_bumpversion() { + # bumpversion is required for debian < 9/stretch + local oscdir=$REPO/osc/$PROJ/bumpversion + local version=0.5.3 + local release=3 + + if [ ! -d "$oscdir" ] ; then + mkdir "$oscdir" + cd "$oscdir" + wget "http://http.debian.net/debian/pool/main/b/bumpversion/bumpversion_$version-…" + wget "http://http.debian.net/debian/pool/main/b/bumpversion/bumpversion_$version.…" + wget "http://http.debian.net/debian/pool/main/b/bumpversion/bumpversion_$version-…" + fi +} + +checkout_limesuite() { + cd "$REPO" + git clone https://github.com/myriadrf/LimeSuite limesuite + TAG="$(get_last_tag limesuite)" + cd limesuite + git checkout "$TAG" +} + +# Copy an already checked out repository dir and apply its debian 8 patch. +# $1: Osmocom repository +checkout_copy_debian8_jessie() { + cd "$REPO" + cp -a "$1" "$1-debian8-jessie" + cd "$1-debian8-jessie" + patch -p1 < debian/patches/build-for-debian8.patch + git commit -m 'auto-commit: allow debian8 to build' debian/ + cd .. +} + +build_osmocom() { + DATA=$TOP/data + REPO=$TOP/repo + + # rather than including a dangerous 'rm -rf *' here, lets delegate to the user: + if [ -n "$(ls $TOP)" ]; then + echo "ERROR: I need to run in an empty directory." + exit 1 + fi + + prepare + + checkout osmo-gsm-manuals + checkout libosmocore + checkout libosmo-sccp + checkout libosmo-abis + checkout libosmo-netif + checkout libasn1c + checkout osmo-iuh pespin/fix-sabp + + checkout_copy_debian8_jessie "osmo-gsm-manuals" + + build osmocom-nightly + build osmo-gsm-manuals + build osmo-gsm-manuals-debian8-jessie + build libosmocore + build libosmo-sccp + build libosmo-abis + build libosmo-netif + build libasn1c + build osmo-iuh + + download_bumpversion + + post +} + +build_osmocom -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/38633?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ic242b9919552ab7c2647d5ca3b60a71a456b5837 Gerrit-Change-Number: 38633 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

7 months, 3 weeks

1
0
0 0

[L] Change in osmo-ci[master]: WIP

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/38634?usp=email ) Change subject: WIP ...................................................................... WIP Change-Id: I671190206ec64dd1730aefb901acf22afd25c7cd --- A scripts/pespin-latest.sh A scripts/pespin-packages.sh 2 files changed, 358 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/34/38634/1 diff --git a/scripts/pespin-latest.sh b/scripts/pespin-latest.sh new file mode 100755 index 0000000..e493f81 --- /dev/null +++ b/scripts/pespin-latest.sh @@ -0,0 +1,160 @@ +#!/bin/sh + +# requirements +# apt install git-buildpackage osc git + +set -e +set -x + +# OBS project name +PROJ=home:pespin:branches:network:osmocom:nightly + +DT=$(date +%Y%m%d) +TOP=$(pwd) +DEBSRCDIR="$TOP/debsrc" + +if ! which osc >/dev/null 2>/dev/null ; then + echo "osc binary not found" + exit 1 +fi + +prepare() { + # start with a checkout of the project + if [ -d $PROJ ]; then + (cd $PROJ && osc up) + else + osc co $PROJ + fi + [ -d "$DEBSRCDIR" ] && rm -rf "$DEBSRCDIR" + mkdir "$DEBSRCDIR" +} + +get_last_tag() { + project="$1" + if [ "$project" = "limesuite" ]; then + ver_regexp="^v[0-9]*.[0-9]*.[0-9]*$" + else + ver_regexp="^[0-9]*.[0-9]*.[0-9]*$" + fi + VER=$(git -C "${TOP}/${project}" tag -l --sort=v:refname | grep "$ver_regexp" | tail -n 1) + echo "${VER}" +} + +checkout() { + project=$1 + gitbpargs="" + echo + echo "====> Checking out $project" + cd "$TOP" + if [ "$project" = "limesuite" ]; then + [ -d "$project" ] || git clone "https://github.com/myriadrf/LimeSuite" "$project" + else + [ -d "$project" ] || git clone "git://git.osmocom.org/$project" + fi + cd "$project" + git fetch + VER=$(get_last_tag "$project") + git checkout -f -B "$VER" "refs/tags/$VER" +} + +build() { + project=$1 + gitbpargs="$2" + output="$DEBSRCDIR/$project" + echo + echo "====> Building $project" + cd "$TOP/$project" + VER=$(get_last_tag "$project") + git checkout -f -B "$VER" "refs/tags/$VER" + if [ -x ./git-version-gen ]; then + ./git-version-gen . > .tarball-version 2>/dev/null + gbp buildpackage -S -uc -us -d --git-ignore-branch "--git-export-dir=$output" \ + "--git-debian-branch=$VER" --git-ignore-new $gitbpargs \ + --git-postexport='cp $GBP_GIT_DIR/../.tarball-version $GBP_TMP_DIR/' + else + gbp buildpackage -S -uc -us -d --git-ignore-branch "--git-export-dir=$output" \ + "--git-debian-branch=$VER" --git-ignore-new $gitbpargs + fi + + if [ ! -d "$TOP/$PROJ/$project" ] ; then + # creating a new package is different from using old ones + mkdir "$TOP/$PROJ/$project" + mv "$output/"*.dsc "$TOP/$PROJ/$project/" + mv "$output/"*.tar* "$TOP/$PROJ/$project/" + cd "$TOP/$PROJ" + osc add "$project" + else + cd "$TOP/$PROJ/$project" + + # update OBS only if the filename doesn't match + file=$(cd "$output/" ; ls ./*.dsc) + if [ ! -e "$file" ] ; then + osc rm ./* || true + mv "$output/"*.dsc . + mv "$output/"*.tar* . + osc add ./* + fi + fi + cd "$TOP" +} + +# add those two once they have tagged any versions that include the 'debian' sub-dir: +#rtl-sdr +#osmo-fl2k + +build_osmocom() { + prepare + + checkout limesuite + checkout libosmocore + #checkout libosmo-sccp + #checkout libosmo-abis + #checkout libosmo-netif + #checkout libsmpp34 + #checkout libasn1c + #checkout libgtpnl + #checkout libusrp + #checkout osmo-iuh + #checkout osmo-ggsn + #checkout osmo-sgsn + #checkout openbsc + #checkout osmo-pcap + checkout osmo-trx + #checkout osmo-sip-connector + #checkout osmo-bts + #checkout osmo-pcu + #checkout osmo-hlr + #checkout osmo-mgw + #checkout osmo-msc + #checkout osmo-bsc + #checkout simtrace2 + + build limesuite --git-upstream-tree="$(get_last_tag limesuite)" + build libosmocore + #build libosmo-sccp + #build libosmo-abis + #build libosmo-netif + #build libsmpp34 + #build libasn1c + #build libgtpnl + #build libusrp + #build osmo-iuh + #build osmo-ggsn + #build osmo-sgsn + #build openbsc + #build osmo-pcap + build osmo-trx + #build osmo-sip-connector + #build osmo-bts + #build osmo-pcu + #build osmo-hlr + #build osmo-mgw + #build osmo-msc + #build osmo-bsc + #build simtrace2 + + cd "$TOP/$PROJ" + osc ci -m "Latest Tagged versions of $DT" +} + +build_osmocom diff --git a/scripts/pespin-packages.sh b/scripts/pespin-packages.sh new file mode 100755 index 0000000..c0a97fc --- /dev/null +++ b/scripts/pespin-packages.sh @@ -0,0 +1,198 @@ +#!/bin/sh +. "$(dirname "$0")/common.sh" +. "$(dirname "$0")/common-obs.sh" + +# requirements +# apt install git-buildpackage osc git + +set -e +set -x + +# OBS project name +PROJ=home:pespin:branches:network:osmocom:nightly + +DT=$(date +%Y%m%d) +TOP=$(pwd) +DEBSRCDIR="$TOP/debsrc" + +if ! which osc >/dev/null 2>/dev/null ; then + echo "osc binary not found" + exit 1 +fi + +### OBS build +prepare() { + # start with a checkout of the project + if [ -d $PROJ ]; then + (cd $PROJ && osc up) + else + osc co $PROJ + fi + [ -d "$DEBSRCDIR" ] && rm -rf "$DEBSRCDIR" + mkdir "$DEBSRCDIR" + + cd "$TOP" + osmo_obs_prepare_conflict "osmocom-latest" "osmocom-nightly" +} + +get_last_tag() { + project="$1" + if [ "$project" = "limesuite" ]; then + ver_regexp="^v[0-9]*.[0-9]*.[0-9]*$" + else + ver_regexp="^[0-9]*.[0-9]*.[0-9]*$" + fi + VER=$(git -C "${TOP}/${project}" tag -l --sort=v:refname | grep "$ver_regexp" | tail -n 1) + echo "${VER}" +} + +checkout() { + project=$1 + gitbpargs="" + echo + echo "====> Checking out $project" + cd "$TOP" + if [ "$project" = "limesuite" ]; then + [ -d "$project" ] || git clone "https://github.com/myriadrf/LimeSuite" "$project" + else + [ -d "$project" ] || osmo_git_clone_date "https://git.osmocom.org/$project" + fi + cd "$project" + git fetch + VER=$(get_last_tag "$project") + git checkout -f -B "$VER" "refs/tags/$VER" +} + +# Copy an already checked out repository dir and apply its debian 8 patch. +# $1: Osmocom repository +checkout_copy_debian8_jessie() { + echo + echo "====> Checking out $1-debian8-jessie" + cd "$TOP" + if [ -d "$1-debian8-jessie" ]; then + rm -rf "$1-debian8-jessie" + fi + cp -a "$1" "$1-debian8-jessie" + cd "$1-debian8-jessie" + patch -p1 < debian/patches/build-for-debian8.patch + git commit --amend --no-edit debian/ + cd .. +} + +build() { + project=$1 + gitbpargs="$2" + output="$DEBSRCDIR/$project" + echo + echo "====> Building $project" + cd "$TOP/$project" + VER=$(get_last_tag "$project") + if [ -x ./git-version-gen ]; then + ./git-version-gen . > .tarball-version 2>/dev/null + fi + + osmo_obs_add_debian_dependency "./debian/control" "osmocom-latest" + + if [ -x ./git-version-gen ]; then + gbp buildpackage -S -uc -us -d --git-ignore-branch "--git-export-dir=$output" \ + "--git-debian-branch=$VER" --git-ignore-new $gitbpargs \ + --git-postexport='cp $GBP_GIT_DIR/../.tarball-version $GBP_TMP_DIR/' + else + gbp buildpackage -S -uc -us -d --git-ignore-branch "--git-export-dir=$output" \ + "--git-debian-branch=$VER" --git-ignore-new $gitbpargs + fi + + if [ ! -d "$TOP/$PROJ/$project" ] ; then + # creating a new package is different from using old ones + mkdir "$TOP/$PROJ/$project" + mv "$output/"*.dsc "$TOP/$PROJ/$project/" + mv "$output/"*.tar* "$TOP/$PROJ/$project/" + cd "$TOP/$PROJ" + osc add "$project" + else + cd "$TOP/$PROJ/$project" + + # update OBS only if the filename doesn't match + file=$(cd "$output/" ; ls ./*.dsc) + if [ ! -e "$file" ] ; then + osc rm ./* || true + mv "$output/"*.dsc . + mv "$output/"*.tar* . + osc add ./* + fi + fi + cd "$TOP" +} + +# add those once they have tagged any versions that include the 'debian' sub-dir: +#rtl-sdr +#osmo-fl2k + +build_osmocom() { + prepare + + checkout limesuite + checkout osmo-gsm-manuals + checkout libosmocore + checkout libosmo-sccp + checkout libosmo-abis + checkout libosmo-netif + checkout libsmpp34 + checkout libasn1c + checkout libgtpnl + checkout libusrp + checkout osmo-iuh + checkout osmo-ggsn + checkout osmo-sgsn + checkout openbsc + checkout osmo-pcap + checkout osmo-trx + checkout osmo-sip-connector + checkout osmo-bts + checkout osmo-pcu + checkout osmo-hlr + checkout osmo-mgw + checkout osmo-msc + checkout osmo-bsc + checkout simtrace2 + checkout libosmo-dsp + checkout osmo-sysmon + checkout osmo-remsim + + checkout_copy_debian8_jessie "osmo-gsm-manuals" + + build osmocom-latest + build limesuite --git-upstream-tree="$(get_last_tag limesuite)" + build osmo-gsm-manuals + build osmo-gsm-manuals-debian8-jessie + build libosmocore + build libosmo-sccp + build libosmo-abis + build libosmo-netif + build libsmpp34 + build libasn1c + build libgtpnl + build libusrp + build osmo-iuh + build osmo-ggsn + build osmo-sgsn + build openbsc + build osmo-pcap + build osmo-trx + build osmo-sip-connector + build osmo-bts + build osmo-pcu + build osmo-hlr + build osmo-mgw + build osmo-msc + build osmo-bsc + build simtrace2 + build libosmo-dsp + build osmo-sysmon + build osmo-remsim + + cd "$TOP/$PROJ" + osc ci -m "Latest Tagged versions of $DT" +} + +build_osmocom -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/38634?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I671190206ec64dd1730aefb901acf22afd25c7cd Gerrit-Change-Number: 38634 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

7 months, 3 weeks

1
0
0 0

[XS] Change in osmo-ci[master]: osmo-depcheck: Remove libosmo-sccp-legacy dep libosmo-xua

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/38632?usp=email ) Change subject: osmo-depcheck: Remove libosmo-sccp-legacy dep libosmo-xua ...................................................................... osmo-depcheck: Remove libosmo-sccp-legacy dep libosmo-xua libosmo-xua was not really used anywhere and dropped here: https://gitea.osmocom.org/osmocom/libosmo-sccp-legacy/pulls/1 Change-Id: I83ef3576507cc615090afd5d80d985551c7aa5a7 --- M scripts/osmo-depcheck/config.py 1 file changed, 1 insertion(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/32/38632/1 diff --git a/scripts/osmo-depcheck/config.py b/scripts/osmo-depcheck/config.py index 39c79b4..19619b0 100644 --- a/scripts/osmo-depcheck/config.py +++ b/scripts/osmo-depcheck/config.py @@ -38,8 +38,7 @@ "libosmotrau"), "libosmo-sigtran": ("libosmo-sigtran"), "libosmo-sccp-legacy": ("libosmo-mtp", - "libosmo-sccp", - "libosmo-xua"), + "libosmo-sccp"), "osmo-ggsn": ("libgtp"), "osmo-hlr": ("libosmo-gsup-client"), "osmo-iuh": ("libosmo-ranap"), -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/38632?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I83ef3576507cc615090afd5d80d985551c7aa5a7 Gerrit-Change-Number: 38632 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

7 months, 3 weeks

1
0
0 0

[XS] Change in pysim[master]: pySim-shell: fix reset command for no-profile mode

by dexter

dexter has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/38607?usp=email ) Change subject: pySim-shell: fix reset command for no-profile mode ...................................................................... pySim-shell: fix reset command for no-profile mode There are situations where no card profile can be determined. In this case no RuntimeState will be present. This is in particular the case when pySim-shell is used on a card that is not provisioned/initialized yet. In those cases we have to go the direct route and reset the card directly. Related: OS#6367 Change-Id: I27bf9fdb131d8bdeba07f4dfd2b76b38f9bfdd17 --- M pySim-shell.py 1 file changed, 6 insertions(+), 1 deletion(-) Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve diff --git a/pySim-shell.py b/pySim-shell.py index f53efd3..413d3f7 100755 --- a/pySim-shell.py +++ b/pySim-shell.py @@ -274,7 +274,12 @@ @cmd2.with_category(CUSTOM_CATEGORY) def do_reset(self, opts): """Reset the Card.""" - atr = self.rs.reset(self) + if self.rs is None: + # In case no runtime state is available we go the direct route + self.card._scc.reset_card() + atr = b2h(self.card._scc.get_atr()) + else: + atr = self.rs.reset(self) self.poutput('Card ATR: %s' % atr) self.update_prompt() -- To view, visit https://gerrit.osmocom.org/c/pysim/+/38607?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I27bf9fdb131d8bdeba07f4dfd2b76b38f9bfdd17 Gerrit-Change-Number: 38607 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org>

7 months, 3 weeks

1
0
0 0

[XS] Change in pysim[master]: pySim-shell: allow checking of APDU responses

by dexter

dexter has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/38606?usp=email ) Change subject: pySim-shell: allow checking of APDU responses ...................................................................... pySim-shell: allow checking of APDU responses The "apdu" command allows us to send custom APDUs to a card. This command is often used in low level initialization scripts or tests. To stop the script execution in case of an error, the command allows us to specify a status word that must match the status word of the response. But we have no such mechanism for the response itself. Let's add another parameter where we can pass a regex that the response must match. Related: OS#6367 Change-Id: I97bbcdf37bdcf00ad50a875b96940c211de7073d --- M pySim-shell.py 1 file changed, 6 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/pySim-shell.py b/pySim-shell.py index 37d58ae..f53efd3 100755 --- a/pySim-shell.py +++ b/pySim-shell.py @@ -21,6 +21,7 @@ import json import traceback +import re import cmd2 from packaging import version @@ -239,6 +240,7 @@ apdu_cmd_parser = argparse.ArgumentParser() apdu_cmd_parser.add_argument('--expect-sw', help='expect a specified status word', type=str, default=None) + apdu_cmd_parser.add_argument('--expect-response-regex', help='match response against regex', type=str, default=None) apdu_cmd_parser.add_argument('--raw', help='Bypass the logical channel (and secure channel)', action='store_true') apdu_cmd_parser.add_argument('APDU', type=is_hexstr, help='APDU as hex string') @@ -264,6 +266,10 @@ if opts.expect_sw: if not sw_match(sw, opts.expect_sw): raise SwMatchError(sw, opts.expect_sw) + if opts.expect_response_regex: + response_regex_compiled = re.compile(opts.expect_response_regex) + if re.match(response_regex_compiled, data) is None: + raise ValueError("RESP does not match regex \'%s\'" % opts.expect_response_regex) @cmd2.with_category(CUSTOM_CATEGORY) def do_reset(self, opts): -- To view, visit https://gerrit.osmocom.org/c/pysim/+/38606?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I97bbcdf37bdcf00ad50a875b96940c211de7073d Gerrit-Change-Number: 38606 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org>

7 months, 3 weeks

1
0
0 0

[S] Change in pysim[master]: pySim-shell_test/utils: print logfile on all types of errors

by dexter

dexter has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/38603?usp=email ) Change subject: pySim-shell_test/utils: print logfile on all types of errors ...................................................................... pySim-shell_test/utils: print logfile on all types of errors When pySim-shell has problems starting up, it exits with an error code. This is detected by the testsuite, but it also causes an early exit, so that the log file content are not printed. Change-Id: Ic0f34eda32a7c557810abcb05a84e343741fdb8a --- M tests/pySim-shell_test/utils.py 1 file changed, 8 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved laforge: Looks good to me, but someone else must approve diff --git a/tests/pySim-shell_test/utils.py b/tests/pySim-shell_test/utils.py index 348c9b1..c3cf7a2 100644 --- a/tests/pySim-shell_test/utils.py +++ b/tests/pySim-shell_test/utils.py @@ -265,11 +265,9 @@ # Execute commandline cmdline += " > " + logfile_name + " 2>&1" print("Executing: " + cmdline) - rc = os.system(cmdline) - if rc: - raise RuntimeError("pySim-shell exits with error code %u" % rc) + py_sim_shell_rc = os.system(cmdline) - # Check for exceptions + # Read logfile logfile = open(logfile_name) logfile_content = logfile.read() if self.print_content: @@ -278,6 +276,12 @@ print(logfile_content) print("-----------------------8<-----------------------") logfile.close() + + # Exit early in case pySim-shell ran into a fundamental error + if py_sim_shell_rc: + raise RuntimeError("pySim-shell exits with error code %u" % py_sim_shell_rc) + + # Check log for exceptions exception_regex_compiled = re.compile('.*EXCEPTION.*') exceptions_strings = re.findall(exception_regex_compiled, logfile_content) if exceptions_strings != []: -- To view, visit https://gerrit.osmocom.org/c/pysim/+/38603?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ic0f34eda32a7c557810abcb05a84e343741fdb8a Gerrit-Change-Number: 38603 Gerrit-PatchSet: 4 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org>

7 months, 3 weeks

1
0
0 0

2025

2024

2023

2022

gerrit-log November 2024