osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/36991?usp=email )
Change subject: ccache.opts: find wrapper in debian path too
......................................................................
ccache.opts: find wrapper in debian path too
With Debian's packaging, the ccache symlinks are created in
/usr/lib/ccache/, not in /usr/lib/ccache/bin/. Tweak ccache.opts to
find gcc and g++ in both paths.
Change-Id: I3803d453c06c503bc9c0ea1823cb9470e5f157b1
---
M ccache.opts
M ttcn3/ttcn3.opts
2 files changed, 18 insertions(+), 2 deletions(-)
Approvals:
osmith: Looks good to me, approved; Verified
diff --git a/ccache.opts b/ccache.opts
index 13dca45..46c6d87 100644
--- a/ccache.opts
+++ b/ccache.opts
@@ -1 +1,2 @@
-ALL CC="/usr/lib/ccache/bin/gcc" CXX="/usr/lib/ccache/bin/g++"
+# Find the ccache wrapper in /usr/lib/ccache and /usr/lib/ccache/bin
+ALL CC="$(find /usr/lib/ccache -name gcc | head -n1)" CXX="$(find /usr/lib/ccache -name g++ | head -n1)"
diff --git a/ttcn3/ttcn3.opts b/ttcn3/ttcn3.opts
index bf2f472..7949d16 100644
--- a/ttcn3/ttcn3.opts
+++ b/ttcn3/ttcn3.opts
@@ -1,2 +1,4 @@
osmo-bts --enable-trx
-ALL CC="/usr/lib/ccache/gcc" CXX="/usr/lib/ccache/g++"
+
+# Find the ccache wrapper in /usr/lib/ccache and /usr/lib/ccache/bin
+ALL CC="$(find /usr/lib/ccache -name gcc | head -n1)" CXX="$(find /usr/lib/ccache -name g++ | head -n1)"
--
To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/36991?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-dev
Gerrit-Branch: master
Gerrit-Change-Id: I3803d453c06c503bc9c0ea1823cb9470e5f157b1
Gerrit-Change-Number: 36991
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-MessageType: merged
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/36991?usp=email )
Change subject: ccache.opts: find wrapper in debian path too
......................................................................
Patch Set 1: Verified+1
--
To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/36991?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-dev
Gerrit-Branch: master
Gerrit-Change-Id: I3803d453c06c503bc9c0ea1823cb9470e5f157b1
Gerrit-Change-Number: 36991
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Comment-Date: Tue, 04 Jun 2024 07:30:47 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-dev/+/36991?usp=email )
Change subject: ccache.opts: find wrapper in debian path too
......................................................................
ccache.opts: find wrapper in debian path too
With Debian's packaging, the ccache symlinks are created in
/usr/lib/ccache/, not in /usr/lib/ccache/bin/. Tweak ccache.opts to
find gcc and g++ in both paths.
Change-Id: I3803d453c06c503bc9c0ea1823cb9470e5f157b1
---
M ccache.opts
M ttcn3/ttcn3.opts
2 files changed, 18 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/91/36991/1
diff --git a/ccache.opts b/ccache.opts
index 13dca45..46c6d87 100644
--- a/ccache.opts
+++ b/ccache.opts
@@ -1 +1,2 @@
-ALL CC="/usr/lib/ccache/bin/gcc" CXX="/usr/lib/ccache/bin/g++"
+# Find the ccache wrapper in /usr/lib/ccache and /usr/lib/ccache/bin
+ALL CC="$(find /usr/lib/ccache -name gcc | head -n1)" CXX="$(find /usr/lib/ccache -name g++ | head -n1)"
diff --git a/ttcn3/ttcn3.opts b/ttcn3/ttcn3.opts
index bf2f472..7949d16 100644
--- a/ttcn3/ttcn3.opts
+++ b/ttcn3/ttcn3.opts
@@ -1,2 +1,4 @@
osmo-bts --enable-trx
-ALL CC="/usr/lib/ccache/gcc" CXX="/usr/lib/ccache/g++"
+
+# Find the ccache wrapper in /usr/lib/ccache and /usr/lib/ccache/bin
+ALL CC="$(find /usr/lib/ccache -name gcc | head -n1)" CXX="$(find /usr/lib/ccache -name g++ | head -n1)"
--
To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/36991?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-dev
Gerrit-Branch: master
Gerrit-Change-Id: I3803d453c06c503bc9c0ea1823cb9470e5f157b1
Gerrit-Change-Number: 36991
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-MessageType: newchange
Attention is currently required from: neels.
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/36988?usp=email )
Change subject: err log: output sigtran prim name instead of number
......................................................................
Patch Set 1: Code-Review+1
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/36988?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I14eb92a6c6d391873f0d6fc7d61205a13e635e6e
Gerrit-Change-Number: 36988
Gerrit-PatchSet: 1
Gerrit-Owner: neels <nhofmeyr(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-Attention: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Comment-Date: Tue, 04 Jun 2024 07:11:26 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/36970?usp=email )
Change subject: esim.bsp: Fix a bug in demac_only_one()
......................................................................
esim.bsp: Fix a bug in demac_only_one()
When de-MAC-ing at the recipient side, we must increment the cipher(!)
block number even if no ciphering is done at all.
We did this correctly for MAC (sender) case, but not on the de-MAC
(receiver) case.
Change-Id: I97993f9e8357b36401d435aaa15558d1c7e411eb
---
M pySim/esim/bsp.py
1 file changed, 17 insertions(+), 0 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
lynxis lazus: Looks good to me, but someone else must approve
osmith: Looks good to me, but someone else must approve
diff --git a/pySim/esim/bsp.py b/pySim/esim/bsp.py
index 2afbd46..81fe092 100644
--- a/pySim/esim/bsp.py
+++ b/pySim/esim/bsp.py
@@ -287,6 +287,8 @@
def demac_only_one(self, ciphertext: bytes) -> bytes:
payload = self.m_algo.verify(ciphertext)
_tdict, _l, val, _remain = bertlv_parse_one(payload)
+ # The data block counter for ICV caluclation is incremented also for each segment with C-MAC only.
+ self.c_algo.block_nr += 1
return val
def demac_only(self, ciphertext_list: List[bytes]) -> bytes:
--
To view, visit https://gerrit.osmocom.org/c/pysim/+/36970?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-Change-Id: I97993f9e8357b36401d435aaa15558d1c7e411eb
Gerrit-Change-Number: 36970
Gerrit-PatchSet: 2
Gerrit-Owner: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-MessageType: merged