Attention is currently required from: laforge, pespin.
lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35901?usp=email )
Change subject: Make PDP-Type and APN from GSUP AuthInfoReq available through all layers
......................................................................
Patch Set 2:
(1 comment)
Patchset:
PS2:
Related to https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35902
--
To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35901?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: erlang/osmo-epdg
Gerrit-Branch: master
Gerrit-Change-Id: I3f29b00f57f433f8623b9f0a5048c83985e5cced
Gerrit-Change-Number: 35901
Gerrit-PatchSet: 2
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Thu, 08 Feb 2024 14:16:21 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35902?usp=email )
Change subject: diameter: rfc7155: move Framed-* AVP into a separate file
......................................................................
diameter: rfc7155: move Framed-* AVP into a separate file
The AVP Frame-IP-Address type information isn't included in diameter_3gpp_ts29_273_swx except
when direct inherits. It seems there is still an issue with multiple levels of inherits.
Move the Framed-* into a seperate file to workaround collisions of other AVPs defined by SWX.
Change-Id: I002b1346f68401f4095cfcd57d74fed7de772e4c
---
M dia/diameter_3gpp_ts29_273_swx.dia
M dia/diameter_rfc7155_nasreq.dia
2 files changed, 15 insertions(+), 16 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-epdg refs/changes/02/35902/1
diff --git a/dia/diameter_3gpp_ts29_273_swx.dia b/dia/diameter_3gpp_ts29_273_swx.dia
index 1e86dee..259e626 100644
--- a/dia/diameter_3gpp_ts29_273_swx.dia
+++ b/dia/diameter_3gpp_ts29_273_swx.dia
@@ -46,6 +46,7 @@
@inherits diameter_rfc5447
@inherits diameter_rfc5580
@inherits diameter_rfc5778
+@inherits diameter_rfc7155
@inherits diameter_rfc7683
@inherits diameter_rfc7944
@inherits diameter_rfc8583
diff --git a/dia/diameter_rfc7155_nasreq.dia b/dia/diameter_rfc7155_nasreq.dia
index ddeccae..7f09512 100644
--- a/dia/diameter_rfc7155_nasreq.dia
+++ b/dia/diameter_rfc7155_nasreq.dia
@@ -22,6 +22,7 @@
@vendor 0 IETF
@inherits diameter_gen_base_rfc6733
+@inherits diameter_rfc7155
@avp_types
@@ -42,22 +43,6 @@
Calling-Station-Id 31 UTF8String M
Connect-Info 77 UTF8String M
Filter-Id 11 UTF8String M
- Framed-AppleTalk-Link 37 Unsigned32 M
- Framed-AppleTalk-Network 38 Unsigned32 M
- Framed-AppleTalk-Zone 39 OctetString M
- Framed-Compression 13 Enumerated M
- Framed-IP-Address 8 OctetString M
- Framed-IP-Netmask 9 OctetString M
- Framed-IPX-Network 23 Unsigned32 M
- Framed-IPv6-Pool 100 OctetString M
- Framed-IPv6-Prefix 97 OctetString M
- Framed-IPv6-Route 99 UTF8String M
- Framed-Interface-Id 96 Unsigned64 M
- Framed-MTU 12 Unsigned32 M
- Framed-Pool 88 OctetString M
- Framed-Protocol 7 Enumerated M
- Framed-Route 22 UTF8String M
- Framed-Routing 10 Enumerated M
Idle-Timeout 28 Unsigned32 M
Login-IP-Host 14 OctetString M
Login-IPv6-Host 98 OctetString M
--
To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35902?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: erlang/osmo-epdg
Gerrit-Branch: master
Gerrit-Change-Id: I002b1346f68401f4095cfcd57d74fed7de772e4c
Gerrit-Change-Number: 35902
Gerrit-PatchSet: 1
Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu>
Gerrit-MessageType: newchange
Attention is currently required from: laforge, pespin.
lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35901?usp=email )
Change subject: Make PDP-Type and APN from GSUP AuthInfoReq available through all layers
......................................................................
Patch Set 2:
(1 comment)
File src/aaa_diameter_swx.erl:
https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35901/comment/63d4ef26_7e58…
PS1, Line 192: %16#21 ->
> Do you tried to encode the ipv4 with ip_to_bin()? like we do in src/epdg_gtpc_s2b. […]
Also I think we need to add an additional inherit.
I can't find an avp_name(x, x) type definition for it.
--
To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35901?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: erlang/osmo-epdg
Gerrit-Branch: master
Gerrit-Change-Id: I3f29b00f57f433f8623b9f0a5048c83985e5cced
Gerrit-Change-Number: 35901
Gerrit-PatchSet: 2
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Thu, 08 Feb 2024 14:05:28 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>
Comment-In-Reply-To: lynxis lazus <lynxis(a)fe80.eu>
Gerrit-MessageType: comment
Attention is currently required from: laforge, pespin.
lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35901?usp=email )
Change subject: Make PDP-Type and APN from GSUP AuthInfoReq available through all layers
......................................................................
Patch Set 2:
(1 comment)
File src/aaa_diameter_swx.erl:
https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35901/comment/6b578e9e_16ca…
PS1, Line 192: %16#21 ->
> idk why, if it go through this path, I get an encode error: […]
Do you tried to encode the ipv4 with ip_to_bin()? like we do in src/epdg_gtpc_s2b.erl:348
--
To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35901?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: erlang/osmo-epdg
Gerrit-Branch: master
Gerrit-Change-Id: I3f29b00f57f433f8623b9f0a5048c83985e5cced
Gerrit-Change-Number: 35901
Gerrit-PatchSet: 2
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Thu, 08 Feb 2024 14:01:04 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: comment
Attention is currently required from: laforge, lynxis lazus.
Hello Jenkins Builder, laforge, lynxis lazus,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35901?usp=email
to look at the new patch set (#2).
The following approvals got outdated and were removed:
Verified+1 by Jenkins Builder
Change subject: Make PDP-Type and APN from GSUP AuthInfoReq available through all layers
......................................................................
Make PDP-Type and APN from GSUP AuthInfoReq available through all layers
Change-Id: I3f29b00f57f433f8623b9f0a5048c83985e5cced
---
M src/aaa_diameter_swm.erl
M src/aaa_diameter_swx.erl
M src/aaa_ue_fsm.erl
M src/epdg_diameter_swm.erl
M src/epdg_ue_fsm.erl
M src/gsup_server.erl
6 files changed, 72 insertions(+), 30 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-epdg refs/changes/01/35901/2
--
To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35901?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: erlang/osmo-epdg
Gerrit-Branch: master
Gerrit-Change-Id: I3f29b00f57f433f8623b9f0a5048c83985e5cced
Gerrit-Change-Number: 35901
Gerrit-PatchSet: 2
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu>
Gerrit-MessageType: newpatchset
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/35897?usp=email )
Change subject: gsup.adoc: Fix Authentication Info message naming in table
......................................................................
Patch Set 1:
(1 comment)
Patchset:
PS1:
It's written differently in the section related to this message. I simply used the same term in the table.
--
To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/35897?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-gsm-manuals
Gerrit-Branch: master
Gerrit-Change-Id: I6d5c95334c961f1f0aa083107713c31d9894c7aa
Gerrit-Change-Number: 35897
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Comment-Date: Wed, 07 Feb 2024 23:51:37 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/35890?usp=email )
Change subject: global_platform: Add --suppress-key-check option to put_key command
......................................................................
global_platform: Add --suppress-key-check option to put_key command
In some cases we may not want to auto-generate the Key Check Values.
Change-Id: I244b717b3e3aae6eb3ad512f9e23ff0b65958bb7
---
M pySim/global_platform/__init__.py
1 file changed, 18 insertions(+), 0 deletions(-)
Approvals:
laforge: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/pySim/global_platform/__init__.py b/pySim/global_platform/__init__.py
index ca99f5f..4d553a7 100644
--- a/pySim/global_platform/__init__.py
+++ b/pySim/global_platform/__init__.py
@@ -515,12 +515,17 @@
put_key_parser.add_argument('--key-type', choices=KeyType.ksymapping.values(), action='append', required=True, help='Key Type')
put_key_parser.add_argument('--key-data', type=is_hexstr, action='append', required=True, help='Key Data Block')
put_key_parser.add_argument('--key-check', type=is_hexstr, action='append', help='Key Check Value')
+ put_key_parser.add_argument('--suppress-key-check', action='store_true', help='Suppress generation of Key Check Values')
@cmd2.with_argparser(put_key_parser)
def do_put_key(self, opts):
"""Perform the GlobalPlatform PUT KEY command in order to store a new key on the card.
See GlobalPlatform CardSpecification v2.3 Section 11.8 for details.
+ The KCV (Key Check Values) can either be explicitly specified using `--key-check`, or will
+ otherwise be automatically generated for DES and AES keys. You can suppress the latter using
+ `--suppress-key-check`.
+
Example (SCP80 KIC/KID/KIK):
put_key --key-version-nr 1 --key-id 0x01 --key-type aes --key-data 000102030405060708090a0b0c0d0e0f
--key-type aes --key-data 101112131415161718191a1b1c1d1e1f
@@ -537,6 +542,8 @@
for i in range(0, len(opts.key_type)):
if opts.key_check and len(opts.key_check) > i:
kcv = opts.key_check[i]
+ elif opts.suppress_key_check:
+ kcv = ''
else:
kcv_bin = compute_kcv(opts.key_type[i], h2b(opts.key_data[i])) or b''
kcv = b2h(kcv_bin)
--
To view, visit https://gerrit.osmocom.org/c/pysim/+/35890?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: I244b717b3e3aae6eb3ad512f9e23ff0b65958bb7
Gerrit-Change-Number: 35890
Gerrit-PatchSet: 1
Gerrit-Owner: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-MessageType: merged