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

[M] Change in ...osmo-epdg[master]: Split auth_handler module into SWm files for ePDG and AAA Server
by pespin 25 Jan '24

25 Jan '24

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35689?usp=email ) Change subject: Split auth_handler module into SWm files for ePDG and AAA Server ...................................................................... Split auth_handler module into SWm files for ePDG and AAA Server This allows more easily matching and following the code against the procedures the specs define. Also, ensure proper separation of data and proper order of procedures when later on we may split the AAA Server to be an external process. Change-Id: Ieb925445fb0cf45a58439fd0c4cd9e4d779a0a79 --- R src/aaa_diameter_swm.erl C src/epdg_diameter_swm.erl M src/epdg_ue_fsm.erl M src/osmo_epdg_sup.erl 4 files changed, 43 insertions(+), 22 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-epdg refs/changes/89/35689/1 diff --git a/src/auth_handler.erl b/src/aaa_diameter_swm.erl similarity index 83% rename from src/auth_handler.erl rename to src/aaa_diameter_swm.erl index 9d142fa..6aef1b2 100644 --- a/src/auth_handler.erl +++ b/src/aaa_diameter_swm.erl @@ -1,10 +1,12 @@ --module(auth_handler). +% AAA Server implementation of SWm Diameter interface, TS 29.273 section 7 +% This interface is so far implemented through internal erlang messages against +% the internal ePDG. +-module(aaa_diameter_swm). -behaviour(gen_server). --include_lib("osmo_gsup/include/gsup_protocol.hrl"). -include_lib("diameter_3gpp_ts29_273_swx.hrl"). --record(auth_state, { +-record(swm_state, { table_id % ets table id }). @@ -23,7 +25,7 @@ init([]) -> TableId = ets:new(auth_req, [bag, named_table]), - {ok, #auth_state{table_id = TableId}}. + {ok, #swm_state{table_id = TableId}}. auth_request(Imsi) -> diff --git a/src/auth_handler.erl b/src/epdg_diameter_swm.erl similarity index 70% copy from src/auth_handler.erl copy to src/epdg_diameter_swm.erl index 9d142fa..9c3145b 100644 --- a/src/auth_handler.erl +++ b/src/epdg_diameter_swm.erl @@ -1,11 +1,12 @@ --module(auth_handler). +% ePDG implementation of SWm Diameter interface, TS 29.273 section 7 +% This interface is so far implemented through internal erlang messages against +% the internal AAA Server. +-module(epdg_diameter_swm). -behaviour(gen_server). --include_lib("osmo_gsup/include/gsup_protocol.hrl"). -include_lib("diameter_3gpp_ts29_273_swx.hrl"). --record(auth_state, { - table_id % ets table id +-record(swm_state, { }). -export([start_link/0]). @@ -22,18 +23,15 @@ gen_server:start_link({local, ?MODULE}, ?MODULE, [], []). init([]) -> - TableId = ets:new(auth_req, [bag, named_table]), - {ok, #auth_state{table_id = TableId}}. + {ok, #swm_state{}}. auth_request(Imsi) -> gen_server:call(?SERVER, {epdg_auth_req, Imsi}). -handle_call({epdg_auth_req, Imsi}, From, State) -> - % request the diameter code for a tuple - CKey = [], - IntegrityKey = [], - Result = aaa_diameter_swx:multimedia_auth_request(Imsi, 1, "EAP-AKA", 1, CKey, IntegrityKey), +handle_call({epdg_auth_req, Imsi}, _From, State) -> + % we yet don't implement the Diameter SWm interface on the wire, we process the call internally: + Result = aaa_diameter_swm:auth_request(Imsi), case Result of {ok, Mar} -> {reply, {ok, Mar}, State}; {error, Err} -> {reply, {error, Err}, State}; diff --git a/src/epdg_ue_fsm.erl b/src/epdg_ue_fsm.erl index 8ddb369..787689d 100644 --- a/src/epdg_ue_fsm.erl +++ b/src/epdg_ue_fsm.erl @@ -128,7 +128,7 @@ state_new({call, From}, auth_request, Data) -> lager:info("ue_fsm state_new event=auth_request, ~p~n", [Data]), - Auth = auth_handler:auth_request(Data#ue_fsm_data.imsi), + Auth = epdg_diameter_swm:auth_request(Data#ue_fsm_data.imsi), gsup_server:auth_response(Data#ue_fsm_data.imsi, Auth), case Auth of {ok, _} -> diff --git a/src/osmo_epdg_sup.erl b/src/osmo_epdg_sup.erl index 9b44731..4d004e2 100644 --- a/src/osmo_epdg_sup.erl +++ b/src/osmo_epdg_sup.erl @@ -23,6 +23,7 @@ GtpcLocalPort = application:get_env(?ENV_APP_NAME, gtpc_local_port, ?ENV_DEFAULT_GTPC_LOCAL_PORT), GtpcRemoteIp = application:get_env(?ENV_APP_NAME, gtpc_remote_ip, ?ENV_DEFAULT_GTPC_REMOTE_IP), GtpcRemotePort = application:get_env(?ENV_APP_NAME, gtpc_remote_port, ?ENV_DEFAULT_GTPC_REMOTE_PORT), + %% AAA Server processes: AAADiaSWxServer = {aaa_diameter_swx, {aaa_diameter_swx,start_link,[]}, permanent, 5000, @@ -33,6 +34,12 @@ 5000, worker, [aaa_diameter_s6b_cb]}, + AAADiaSWmServer = {aaa_diameter_swm, {aaa_diameter_swm, start_link, []}, + permanent, + 5000, + worker, + [aaa_diameter_swm]}, + %% ePDG processes: GtpcServer = {epdg_gtpc_s2b, {epdg_gtpc_s2b,start_link, [GtpcLocalIp, GtpcLocalPort, GtpcRemoteIp, GtpcRemotePort, []]}, permanent, 5000, @@ -43,9 +50,9 @@ 5000, worker, [gsup_server]}, - AuthHandler = {auth_handler, {auth_handler, start_link, []}, - permanent, - 5000, - worker, - [auth_handler]}, - {ok, { {one_for_all, 5, 10}, [AAADiaSWxServer, AAADiaS6bServer, GtpcServer, GsupServer, AuthHandler]} }. + DiaSWmServer = {epdg_diameter_swm, {epdg_diameter_swm, start_link, []}, + permanent, + 5000, + worker, + [epdg_diameter_swm]}, + {ok, { {one_for_all, 5, 10}, [AAADiaSWxServer, AAADiaS6bServer, AAADiaSWmServer, GtpcServer, GsupServer, DiaSWmServer]} }. -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35689?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: Ieb925445fb0cf45a58439fd0c4cd9e4d779a0a79 Gerrit-Change-Number: 35689 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in libosmocore[master]: Prevent poll() in select.c to timeout too early
by Hoernchen 25 Jan '24

25 Jan '24

Attention is currently required from: fixeria, jolly, laforge, pespin. Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35672?usp=email ) Change subject: Prevent poll() in select.c to timeout too early ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: rounding up should be fine, but tbh, I can't quite see the actual real world issue here - it would require 1) < 1ms timout 2) absolutely nothing else to do while repeatedly calling the function which does "nothing" 3) no scheduling of any other task because scheduling granularity is way wy above 1ms anyway... -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35672?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I79de77c79af4d50d1eb9ca0c5417123ff760dca3 Gerrit-Change-Number: 35672 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 25 Jan 2024 17:09:22 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[S] Change in libosmocore[master]: Prevent poll() in select.c to timeout too early
by jolly 25 Jan '24

25 Jan '24

Attention is currently required from: Hoernchen, fixeria, laforge, pespin. jolly has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35672?usp=email ) Change subject: Prevent poll() in select.c to timeout too early ...................................................................... Patch Set 1: (1 comment) File src/core/timer.c: https://gerrit.osmocom.org/c/libosmocore/+/35672/comment/022bd86c_d6108823 PS1, Line 199: nearest_ms += (nearest_p->tv_usec + 999) / 1000; > Mhh yeah. […] Just hacked some test code with one random timer. As I stated above the main loop will call poll() again. On the other hand this is no big performance issue. The early return of poll() will not cause any significant processing, because there is no file descriptor event, nor a timeout to handle. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35672?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I79de77c79af4d50d1eb9ca0c5417123ff760dca3 Gerrit-Change-Number: 35672 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 25 Jan 2024 16:56:38 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: jolly <andreas(a)eversberg.eu> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[S] Change in ...osmo-epdg[master]: s6b: Answer Diameter STR with STA
by pespin 25 Jan '24

25 Jan '24

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35687?usp=email ) Change subject: s6b: Answer Diameter STR with STA ...................................................................... s6b: Answer Diameter STR with STA Change-Id: I34f803c1f772bab9b267e4eaad7146e7b1ac2894 --- M src/aaa_diameter_s6b_cb.erl 1 file changed, 26 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-epdg refs/changes/87/35687/1 diff --git a/src/aaa_diameter_s6b_cb.erl b/src/aaa_diameter_s6b_cb.erl index 55bc66f..81757a9 100644 --- a/src/aaa_diameter_s6b_cb.erl +++ b/src/aaa_diameter_s6b_cb.erl @@ -65,9 +65,23 @@ 'Origin-Realm'=OR}, lager:info("S6b Tx to ~p: ~p~n", [Caps, Resp]), {reply, Resp}; - % TODO: extract relevant fields from DIAMETER AAA -%% handle_request/3 + +% 3GPP TS 29.273 9.2.2.3.1 Session-Termination-Request (STR) Command: +handle_request(#diameter_packet{msg = Req, errors = []}, _SvcName, {_, Caps}) when is_record(Req, 'STR') -> + lager:info("S6b Rx from ~p: ~p~n", [Caps, Req]), + % extract relevant fields from DIAMETER STR: + #diameter_caps{origin_host = {OH,_}, origin_realm = {OR,_}} = Caps, + #'STR'{'Session-Id' = SessionId, + 'Auth-Application-Id' = _AuthAppId, + 'User-Name' = _UserNameOpt} = Req, + % 3GPP TS 29.273 9.2.2.3.2 Session-Termination-Answer (STA) Command: + Resp = #'STA'{'Session-Id' = SessionId, + 'Result-Code' = 2001, + 'Origin-Host' = OH, + 'Origin-Realm' = OR}, + lager:info("S6b Tx to ~p: ~p~n", [Caps, Resp]), + {reply, Resp}; + handle_request(Packet, _SvcName, Peer) -> lager:error("S6b Rx unexpected msg from ~p: ~p~n", [Peer, Packet]), - %PESPIN: TODO: handle S6b AAR here, see osmo_dia2gsup "handle_request" as example. erlang:error({unexpected, ?MODULE, ?LINE}). -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35687?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: I34f803c1f772bab9b267e4eaad7146e7b1ac2894 Gerrit-Change-Number: 35687 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in libosmocore[master]: Prevent poll() in select.c to timeout too early
by pespin 25 Jan '24

25 Jan '24

Attention is currently required from: Hoernchen, fixeria, jolly, laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35672?usp=email ) Change subject: Prevent poll() in select.c to timeout too early ...................................................................... Patch Set 1: Code-Review+1 (1 comment) File src/core/timer.c: https://gerrit.osmocom.org/c/libosmocore/+/35672/comment/46f22620_3f60e09c PS1, Line 199: nearest_ms += (nearest_p->tv_usec + 999) / 1000; > If we round down values above 1 ms, we still have the problem that timers that have a remaining time […] Mhh yeah. The main problem here is poll() having a millisecond timeout, but there's not much that we can do there. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35672?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I79de77c79af4d50d1eb9ca0c5417123ff760dca3 Gerrit-Change-Number: 35672 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 25 Jan 2024 16:18:35 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: jolly <andreas(a)eversberg.eu> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[S] Change in libosmocore[master]: Prevent poll() in select.c to timeout too early
by jolly 25 Jan '24

25 Jan '24

Attention is currently required from: fixeria, pespin. jolly has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35672?usp=email ) Change subject: Prevent poll() in select.c to timeout too early ...................................................................... Patch Set 1: (1 comment) File src/core/timer.c: https://gerrit.osmocom.org/c/libosmocore/+/35672/comment/90d9b82a_6bdb986e PS1, Line 199: nearest_ms += (nearest_p->tv_usec + 999) / 1000; > Ack, maybe it makes sense to round 0->1 to avoid busy polls, and let the others X.Y ->X.0. […] If we round down values above 1 ms, we still have the problem that timers that have a remaining time of more than 1 ms will cause poll() to exit too early. The result is that the main loop will call the poll() again, but this time with less than 1 ms, rounded up to 1 ms. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35672?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I79de77c79af4d50d1eb9ca0c5417123ff760dca3 Gerrit-Change-Number: 35672 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 25 Jan 2024 16:14:36 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[S] Change in ...osmo-epdg[master]: Rename s/ue_fsm/epdg_ue_fsm/g
by pespin 25 Jan '24

25 Jan '24

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35686?usp=email ) Change subject: Rename s/ue_fsm/epdg_ue_fsm/g ...................................................................... Rename s/ue_fsm/epdg_ue_fsm/g osmo-epdg actually contains 2 nodes inside: ePDG and AAA server. The fsm is for the ePDG node, and ideally we want to keep both nodes as separate as possible so that we can later on split them or use an external AAA server. Change-Id: If0852f4aedd0fb0cb9bf6cfcf77f00acd4a3fcbf --- M src/epdg_gtpc_s2b.erl R src/epdg_ue_fsm.erl M src/gsup_server.erl 3 files changed, 23 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-epdg refs/changes/86/35686/1 diff --git a/src/epdg_gtpc_s2b.erl b/src/epdg_gtpc_s2b.erl index 7e3dd6e..ca05d9b 100644 --- a/src/epdg_gtpc_s2b.erl +++ b/src/epdg_gtpc_s2b.erl @@ -287,7 +287,7 @@ Sess1 = update_gtp_session_from_create_session_response(Resp, Sess0), lager:info("s2b: Updated Session after create_session_response: ~p~n", [Sess1]), State1 = update_gtp_session(Sess0, Sess1, State0), - ue_fsm:received_gtpc_create_session_response(Sess0#gtp_session.pid, {ok, Resp}), + epdg_ue_fsm:received_gtpc_create_session_response(Sess0#gtp_session.pid, {ok, Resp}), {noreply, State1} end; @@ -299,7 +299,7 @@ {noreply, State0}; Sess -> State1 = delete_gtp_session(Sess, State0), - ue_fsm:received_gtpc_delete_session_response(Sess#gtp_session.pid, Resp), + epdg_ue_fsm:received_gtpc_delete_session_response(Sess#gtp_session.pid, Resp), {noreply, State1} end; diff --git a/src/ue_fsm.erl b/src/epdg_ue_fsm.erl similarity index 99% rename from src/ue_fsm.erl rename to src/epdg_ue_fsm.erl index f17dfdc..f8fca64 100644 --- a/src/ue_fsm.erl +++ b/src/epdg_ue_fsm.erl @@ -30,9 +30,9 @@ % for the parts of the runtime libraries of Erlang/OTP used as well as % that of the covered work. --module(ue_fsm). +-module(epdg_ue_fsm). -behaviour(gen_statem). --define(NAME, ue_fsm). +-define(NAME, epdg_ue_fsm). -include_lib("osmo_gsup/include/gsup_protocol.hrl"). -include_lib("gtplib/include/gtp_packet.hrl"). diff --git a/src/gsup_server.erl b/src/gsup_server.erl index cebcc0f..ae677c9 100644 --- a/src/gsup_server.erl +++ b/src/gsup_server.erl @@ -223,7 +223,7 @@ % send auth info / requesting authentication tuples handle_info({ipa, Socket, ?IPAC_PROTO_EXT_GSUP, _GsupMsgRx = #{message_type := send_auth_info_req, imsi := Imsi}}, State0) -> {UE, State1} = find_or_new_gsups_ue(Imsi, State0), - case ue_fsm:auth_request(UE#gsups_ue.pid) of + case epdg_ue_fsm:auth_request(UE#gsups_ue.pid) of ok -> ok; {error, _} -> Resp = #{message_type => send_auth_info_err, @@ -241,7 +241,7 @@ UE = find_gsups_ue_by_imsi(Imsi, State), case UE of #gsups_ue{imsi = Imsi} -> - case ue_fsm:lu_request(UE#gsups_ue.pid) of + case epdg_ue_fsm:lu_request(UE#gsups_ue.pid) of ok -> ok; {error, _} -> Resp = #{message_type => location_upd_err, @@ -268,7 +268,7 @@ UE = find_gsups_ue_by_imsi(Imsi, State), case UE of #gsups_ue{imsi = Imsi} -> - case ue_fsm:tunnel_request(UE#gsups_ue.pid) of + case epdg_ue_fsm:tunnel_request(UE#gsups_ue.pid) of ok -> ok; {error, _} -> Resp = #{message_type => epdg_tunnel_error, @@ -294,7 +294,7 @@ UE = find_gsups_ue_by_imsi(Imsi, State), case UE of #gsups_ue{imsi = Imsi} -> - case ue_fsm:purge_ms_request(UE#gsups_ue.pid) of + case epdg_ue_fsm:purge_ms_request(UE#gsups_ue.pid) of ok -> ok; _ -> Resp = #{message_type => purge_ms_err, imsi => Imsi, @@ -349,7 +349,7 @@ new_gsups_ue(Imsi, State) -> - {ok, Pid} = ue_fsm:start_link(Imsi), + {ok, Pid} = epdg_ue_fsm:start_link(Imsi), UE = #gsups_ue{imsi = Imsi, pid = Pid}, NewSt = State#gsups_state{ues = sets:add_element(UE, State#gsups_state.ues)}, {UE, NewSt}. -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35686?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: If0852f4aedd0fb0cb9bf6cfcf77f00acd4a3fcbf Gerrit-Change-Number: 35686 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in pysim[master]: docs: Add missing global_platform store_data command docs
by laforge 25 Jan '24

25 Jan '24

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/35683?usp=email ) Change subject: docs: Add missing global_platform store_data command docs ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35683?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: I6039818c2c0c5373b4a4ef1e33e152de7fbbd01a Gerrit-Change-Number: 35683 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Thu, 25 Jan 2024 14:53:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in pysim[master]: osmo-smdpp: Constrain selection of CI certificate
by laforge 25 Jan '24

25 Jan '24

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/35685?usp=email ) Change subject: osmo-smdpp: Constrain selection of CI certificate ...................................................................... osmo-smdpp: Constrain selection of CI certificate We can only choose a CI certificate which is supported both by the eUICC as well as which has signed our own SM-DP+ certificates. Change-Id: I0b9130f06d501ca7d484063d56d606cfdd2544f4 --- M osmo-smdpp.py 1 file changed, 18 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/85/35685/1 diff --git a/osmo-smdpp.py b/osmo-smdpp.py index 58b83ff..2992bd7 100755 --- a/osmo-smdpp.py +++ b/osmo-smdpp.py @@ -218,8 +218,13 @@ ci_cert = None for x in pkid_list: ci_cert = self.ci_get_cert_for_pkid(x) - if ci_cert: + # we already support multiple CI cerfiticates but only one set of DPauth + DPpb keys. So we must + # make sure we choose a CI key-id which has issued both the eUICC as well as our own SM-DP side + # certs. + if ci_cert and cert_get_subject_key_id(ci_cert) == self.dp_auth.get_authority_key_identifier().key_identifier: break + else: + ci_cert = None if not ci_cert: raise ApiError('8.8.2', '3.1', 'None of the proposed Public Key Identifiers is supported by the SM-DP+') -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35685?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: I0b9130f06d501ca7d484063d56d606cfdd2544f4 Gerrit-Change-Number: 35685 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 0

[S] Change in pysim[master]: add contrib/eidtool.py: Tool for checking + computing EID checksum
by laforge 25 Jan '24

25 Jan '24

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/35682?usp=email ) Change subject: add contrib/eidtool.py: Tool for checking + computing EID checksum ...................................................................... add contrib/eidtool.py: Tool for checking + computing EID checksum Change-Id: If6c560a2de51718948fb99b816e080f2aff4d0ed --- A contrib/eidtool.py 1 file changed, 45 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/82/35682/1 diff --git a/contrib/eidtool.py b/contrib/eidtool.py new file mode 100755 index 0000000..1e2f568 --- /dev/null +++ b/contrib/eidtool.py @@ -0,0 +1,36 @@ +#!/usr/bin/env python3 + +import sys +import argparse + +from pySim.euicc import compute_eid_checksum, verify_eid_checksum + + +option_parser = argparse.ArgumentParser(description='EID tool') +group = option_parser.add_mutually_exclusive_group(required=True) +group.add_argument('--verify', help='Verify given EID csum') +group.add_argument('--compute', help='Generate EID csum') +option_parser.add_argument('--add', type=int, help='Add value to EID base before computing') + + +if __name__ == '__main__': + opts = option_parser.parse_args() + + if opts.verify: + res = verify_eid_checksum(opts.verify) + if res: + print("EID checksum verified successfully") + sys.exit(0) + else: + print("EID checksum invalid") + sys.exit(1) + elif opts.compute: + eid = opts.compute + if opts.add: + if len(eid) != 30: + print("EID base must be 30 digits when using --add") + sys.exit(2) + eid = str(int(eid) + int(opts.add)) + res = compute_eid_checksum(eid) + print(res) + -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35682?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: If6c560a2de51718948fb99b816e080f2aff4d0ed Gerrit-Change-Number: 35682 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 0