dexter has submitted this change. ( https://gerrit.osmocom.org/c/onomondo-eim/+/42947?usp=email )

Change subject: esipa: rename TransactionId to EimTransactionId where applicable ......................................................................

esipa: rename TransactionId to EimTransactionId where applicable

In SGP.32 V.1.2 all TransactionIds which are generated by the eIM are called now called "eimTransactionId". Let's make sure that we name the EimTransactionId variables and atoms (eimTransactionId) accordingly.

Change-Id: Ia97f96c27d5dc4405effd5266de4cdb797849699 Related: SYS#8100 --- M src/esipa_asn1_handler.erl M src/esipa_asn1_handler_utils.erl M src/esipa_rest_utils.erl 3 files changed, 18 insertions(+), 18 deletions(-)

Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved jolly: Looks good to me, but someone else must approve

diff --git a/src/esipa_asn1_handler.erl b/src/esipa_asn1_handler.erl index 82a4290..94389c7 100644 --- a/src/esipa_asn1_handler.erl +++ b/src/esipa_asn1_handler.erl @@ -292,12 +292,12 @@ profileDownloadData => {activationCode, ActivationCode} }}; {psmo, Order} -> - TransactionIdPsmo = rand:bytes(16), - mnesia_db_work:bind(Pid, TransactionIdPsmo), + EimTransactionId = rand:bytes(16), + mnesia_db_work:bind(Pid, EimTransactionId), EuiccPackageSigned = esipa_rest_utils:psmo_order_to_euiccPackageSigned( Order, EidValue, - TransactionIdPsmo + EimTransactionId ), case EuiccPackageSigned of error -> @@ -318,12 +318,12 @@ }} end; {eco, Order} -> - TransactionIdEco = rand:bytes(16), - mnesia_db_work:bind(Pid, TransactionIdEco), + EimTransactionId = rand:bytes(16), + mnesia_db_work:bind(Pid, EimTransactionId), EuiccPackageSigned = esipa_rest_utils:eco_order_to_euiccPackageSigned( Order, EidValue, - TransactionIdEco + EimTransactionId ), case EuiccPackageSigned of error -> diff --git a/src/esipa_asn1_handler_utils.erl b/src/esipa_asn1_handler_utils.erl index 2d537fd..f288592 100644 --- a/src/esipa_asn1_handler_utils.erl +++ b/src/esipa_asn1_handler_utils.erl @@ -8,7 +8,7 @@

-export([handle_euiccPackageResult/3]).

-transactionId_from_euiccPackageResult(EuiccPackageResult) -> +eimTransactionId_from_euiccPackageResult(EuiccPackageResult) -> case EuiccPackageResult of {euiccPackageResultSigned, EuiccPackageResultSigned} -> EuiccPackageResultDataSigned = maps:get( @@ -24,7 +24,7 @@ none end.

-process_euiccPackageResult(Pid, EuiccPackageResult, EsipaReq, TransactionId) -> +process_euiccPackageResult(Pid, EuiccPackageResult, EsipaReq, EimTransactionId) -> WorkBind = fun(Map) -> case maps:find(eimTransactionId, Map) of {ok, Value} -> @@ -35,7 +35,7 @@ end,

CheckCounterValue = fun(Map) -> - {EidValue, _, _} = mnesia_db_work:pickup(Pid, TransactionId), + {EidValue, _, _} = mnesia_db_work:pickup(Pid, EimTransactionId), CounterValueIpad = maps:get(counterValue, Map), {ok, CounterValueEim} = mnesia_db_euicc:param_get(EidValue, counterValue), case CounterValueIpad of @@ -88,11 +88,11 @@ % Handle an EuiccPackageResult, this includes everything from the handling of the work items in mnesia_db, down to % signature checks and the generation of an appropriate outcome for the REST API. handle_euiccPackageResult(Pid, EuiccPackageResult, EsipaReq) -> - TransactionId = transactionId_from_euiccPackageResult(EuiccPackageResult), - {EidValue, _, _} = mnesia_db_work:pickup(Pid, TransactionId), + EimTransactionId = eimTransactionId_from_euiccPackageResult(EuiccPackageResult), + {EidValue, _, _} = mnesia_db_work:pickup(Pid, EimTransactionId), case crypto_utils:verify_euiccPackageResultSigned(EuiccPackageResult, EidValue) of ok -> - process_euiccPackageResult(Pid, EuiccPackageResult, EsipaReq, TransactionId); + process_euiccPackageResult(Pid, EuiccPackageResult, EsipaReq, EimTransactionId); _ -> mnesia_db_work:finish( Pid, [{[{procedureError, euiccSignatureInvalid}]}], EsipaReq diff --git a/src/esipa_rest_utils.erl b/src/esipa_rest_utils.erl index 78939ab..e88c58b 100644 --- a/src/esipa_rest_utils.erl +++ b/src/esipa_rest_utils.erl @@ -183,7 +183,7 @@ error end.

-format_euicc_EuiccPackageSigned(EuiccPackage, EidValue, TransactionId) -> +format_euicc_EuiccPackageSigned(EuiccPackage, EidValue, EimTransactionId) -> case EuiccPackage of error -> % The EuiccPackage was not generated properly @@ -195,13 +195,13 @@ eimId => list_to_binary(EimId), eidValue => EidValue, counterValue => CounterValue, - transactionId => TransactionId, + eimTransactionId => EimTransactionId, euiccPackage => EuiccPackage } end.

% Generate an euiccPackageSigned from a PSMO Order (JSON REST API) -psmo_order_to_euiccPackageSigned(Order, EidValue, TransactionId) -> +psmo_order_to_euiccPackageSigned(Order, EidValue, EimTransactionId) -> Order2Psmo = fun(PsmoOrder) -> case PsmoOrder of {[{<<"enable">>, Psmo}]} -> @@ -244,7 +244,7 @@ error end,

- format_euicc_EuiccPackageSigned(EuiccPackage, EidValue, TransactionId). + format_euicc_EuiccPackageSigned(EuiccPackage, EidValue, EimTransactionId).

eco_to_asn_addEim(Eco) -> case Eco of @@ -289,7 +289,7 @@ end.

% Generate an euiccPackageSigned from a eCO Order (JSON REST API) -eco_order_to_euiccPackageSigned(Order, EidValue, TransactionId) -> +eco_order_to_euiccPackageSigned(Order, EidValue, EimTransactionId) -> Order2Eco = fun(EcoOrder) -> case EcoOrder of {[{<<"addEim">>, Eco}]} -> @@ -322,7 +322,7 @@ error end,

- format_euicc_EuiccPackageSigned(EuiccPackage, EidValue, TransactionId). + format_euicc_EuiccPackageSigned(EuiccPackage, EidValue, EimTransactionId).

memberOrNil(Key, Map) -> case maps:is_key(Key, Map) of