<p>dexter has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/pysim/+/23999">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">utils: fix mcc/mnc encoding in dec_plmn (EF_PLMNsel)<br><br>The dec_plmn function takes an hexstring and returns the decoded MCC and<br>MNC as integer values. The result is then used by the json encoder in<br>EF_PLMNsel, which means the json output will contrary to the input, use<br>integer values instead of strings.<br><br>This is not correct since there may be leading zeros (e.g. mnc 01 and<br>001 both exist are different) which must be retained in order to know<br>the correct length of the MNC.<br><br>Related: OS#4963<br>Change-Id: I393e04836814d992d2a6d0a4e4e01850976d6e81<br>---<br>M pySim/utils.py<br>M tests/test_utils.py<br>2 files changed, 55 insertions(+), 5 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/99/23999/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/pySim/utils.py b/pySim/utils.py</span><br><span>index 6034da4..ac28624 100644</span><br><span>--- a/pySim/utils.py</span><br><span>+++ b/pySim/utils.py</span><br><span>@@ -136,14 +136,35 @@</span><br><span> </span><br><span> def enc_plmn(mcc:str, mnc:str):</span><br><span> """Converts integer MCC/MNC into 3 bytes for EF"""</span><br><span style="color: hsl(0, 100%, 40%);">- if len(mnc) == 2:</span><br><span style="color: hsl(0, 100%, 40%);">- mnc += "F" # pad to 3 digits if needed</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ # Make sure there are no excess whitespaces in the input</span><br><span style="color: hsl(120, 100%, 40%);">+ # parameters</span><br><span style="color: hsl(120, 100%, 40%);">+ mcc = mcc.strip()</span><br><span style="color: hsl(120, 100%, 40%);">+ mnc = mnc.strip()</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ # Make sure that MCC/MNC are correctly padded with leading</span><br><span style="color: hsl(120, 100%, 40%);">+ # zeros or 'F', depending on the length.</span><br><span style="color: hsl(120, 100%, 40%);">+ if len(mnc) == 0:</span><br><span style="color: hsl(120, 100%, 40%);">+ mnc = "FFF"</span><br><span style="color: hsl(120, 100%, 40%);">+ elif len(mnc) == 1:</span><br><span style="color: hsl(120, 100%, 40%);">+ mnc = "F0" + mnc</span><br><span style="color: hsl(120, 100%, 40%);">+ elif len(mnc) == 2:</span><br><span style="color: hsl(120, 100%, 40%);">+ mnc += "F"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if len(mcc) == 0:</span><br><span style="color: hsl(120, 100%, 40%);">+ mcc = "FFF"</span><br><span style="color: hsl(120, 100%, 40%);">+ elif len(mcc) == 1:</span><br><span style="color: hsl(120, 100%, 40%);">+ mcc = "00" + mcc</span><br><span style="color: hsl(120, 100%, 40%);">+ elif len(mcc) == 2:</span><br><span style="color: hsl(120, 100%, 40%);">+ mcc = "0" + mcc</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> return (mcc[1] + mcc[0]) + (mnc[2] + mcc[2]) + (mnc[1] + mnc[0])</span><br><span> </span><br><span> def dec_plmn(threehexbytes:Hexstr) -> dict:</span><br><span style="color: hsl(0, 100%, 40%);">- res = {'mcc': 0, 'mnc': 0 }</span><br><span style="color: hsl(0, 100%, 40%);">- res['mcc'] = dec_mcc_from_plmn(threehexbytes)</span><br><span style="color: hsl(0, 100%, 40%);">- res['mnc'] = dec_mnc_from_plmn(threehexbytes)</span><br><span style="color: hsl(120, 100%, 40%);">+ res = {'mcc': "0", 'mnc': "0" }</span><br><span style="color: hsl(120, 100%, 40%);">+ dec_mcc_from_plmn_str(threehexbytes)</span><br><span style="color: hsl(120, 100%, 40%);">+ res['mcc'] = dec_mcc_from_plmn_str(threehexbytes)</span><br><span style="color: hsl(120, 100%, 40%);">+ res['mnc'] = dec_mnc_from_plmn_str(threehexbytes)</span><br><span> return res</span><br><span> </span><br><span> def dec_spn(ef):</span><br><span>@@ -172,6 +193,13 @@</span><br><span> return 0xFFF # 4095</span><br><span> return derive_mcc(digit1, digit2, digit3)</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+def dec_mcc_from_plmn_str(plmn:Hexstr) -> str:</span><br><span style="color: hsl(120, 100%, 40%);">+ digit1 = plmn[1] # 1st byte, LSB</span><br><span style="color: hsl(120, 100%, 40%);">+ digit2 = plmn[0] # 1st byte, MSB</span><br><span style="color: hsl(120, 100%, 40%);">+ digit3 = plmn[3] # 2nd byte, LSB</span><br><span style="color: hsl(120, 100%, 40%);">+ res = digit1 + digit2 + digit3</span><br><span style="color: hsl(120, 100%, 40%);">+ return res.upper().strip("F")</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> def dec_mnc_from_plmn(plmn:Hexstr) -> int:</span><br><span> ia = h2i(plmn)</span><br><span> digit1 = ia[2] & 0x0F # 3rd byte, LSB</span><br><span>@@ -181,6 +209,13 @@</span><br><span> return 0xFFF # 4095</span><br><span> return derive_mnc(digit1, digit2, digit3)</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+def dec_mnc_from_plmn_str(plmn:Hexstr) -> str:</span><br><span style="color: hsl(120, 100%, 40%);">+ digit1 = plmn[5] # 3rd byte, LSB</span><br><span style="color: hsl(120, 100%, 40%);">+ digit2 = plmn[4] # 3rd byte, MSB</span><br><span style="color: hsl(120, 100%, 40%);">+ digit3 = plmn[2] # 2nd byte, MSB</span><br><span style="color: hsl(120, 100%, 40%);">+ res = digit1 + digit2 + digit3</span><br><span style="color: hsl(120, 100%, 40%);">+ return res.upper().strip("F")</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> def dec_act(twohexbytes:Hexstr) -> List[str]:</span><br><span> act_list = [</span><br><span> {'bit': 15, 'name': "UTRAN"},</span><br><span>diff --git a/tests/test_utils.py b/tests/test_utils.py</span><br><span>index 71c0eb0..b70b17b 100755</span><br><span>--- a/tests/test_utils.py</span><br><span>+++ b/tests/test_utils.py</span><br><span>@@ -37,6 +37,12 @@</span><br><span> def testDecMCCfromPLMN_unused(self):</span><br><span> self.assertEqual(utils.dec_mcc_from_plmn("ff0f00"), 4095)</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ def testDecMCCfromPLMN_str(self):</span><br><span style="color: hsl(120, 100%, 40%);">+ self.assertEqual(utils.dec_mcc_from_plmn_str("92f501"), "295")</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ def testDecMCCfromPLMN_unused_str(self):</span><br><span style="color: hsl(120, 100%, 40%);">+ self.assertEqual(utils.dec_mcc_from_plmn_str("ff0f00"), "")</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> def testDecMNCfromPLMN_twoDigitMNC(self):</span><br><span> self.assertEqual(utils.dec_mnc_from_plmn("92f501"), 10)</span><br><span> </span><br><span>@@ -46,6 +52,15 @@</span><br><span> def testDecMNCfromPLMN_unused(self):</span><br><span> self.assertEqual(utils.dec_mnc_from_plmn("00f0ff"), 4095)</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ def testDecMNCfromPLMN_twoDigitMNC_str(self):</span><br><span style="color: hsl(120, 100%, 40%);">+ self.assertEqual(utils.dec_mnc_from_plmn_str("92f501"), "10")</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ def testDecMNCfromPLMN_threeDigitMNC_str(self):</span><br><span style="color: hsl(120, 100%, 40%);">+ self.assertEqual(utils.dec_mnc_from_plmn_str("031263"), "361")</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ def testDecMNCfromPLMN_unused_str(self):</span><br><span style="color: hsl(120, 100%, 40%);">+ self.assertEqual(utils.dec_mnc_from_plmn_str("00f0ff"), "")</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> def test_enc_plmn(self):</span><br><span> with self.subTest("2-digit MCC"):</span><br><span> self.assertEqual(utils.enc_plmn("001", "01F"), "00F110")</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/pysim/+/23999">change 23999</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/pysim/+/23999"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: pysim </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I393e04836814d992d2a6d0a4e4e01850976d6e81 </div>
<div style="display:none"> Gerrit-Change-Number: 23999 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>