<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/10986">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  Vadim Yanitskiy: Looks good to me, but someone else must approve
  Harald Welte: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">msc_vlr_tests: cosmetically tweak perm algo printing<br><br>In the msc_vlr_tests, instead of printing the algo IDs, rather print the<br>corresponding A5/n name, for clarity.<br><br>Change-Id: Ic00f1e54490650bcb40170647b8ffd52ede23fd3<br>---<br>M tests/msc_vlr/msc_vlr_test_gsm_ciph.err<br>M tests/msc_vlr/msc_vlr_tests.c<br>2 files changed, 13 insertions(+), 13 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/tests/msc_vlr/msc_vlr_test_gsm_ciph.err b/tests/msc_vlr/msc_vlr_test_gsm_ciph.err</span><br><span>index 71e34a8..6a00669 100644</span><br><span>--- a/tests/msc_vlr/msc_vlr_test_gsm_ciph.err</span><br><span>+++ b/tests/msc_vlr/msc_vlr_test_gsm_ciph.err</span><br><span>@@ -68,7 +68,7 @@</span><br><span> DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_AUTH}: Set Ciphering Mode</span><br><span> DMM -> CIPHER MODE COMMAND IMSI:901700000004620</span><br><span> - sending Ciphering Mode Command for IMSI:901700000004620: include_imeisv=0</span><br><span style="color: hsl(0, 100%, 40%);">-- ...perm algo: 2</span><br><span style="color: hsl(120, 100%, 40%);">+- ...perm algo: A5/1</span><br><span> - ...key: 61855fb81fc2a800</span><br><span> DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_AUTH}: state_chg to VLR_ULA_S_WAIT_CIPH</span><br><span> DREF IMSI:901700000004620: MSC conn use - dtap == 0 (0x0: )</span><br><span>@@ -238,7 +238,7 @@</span><br><span> DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_WAIT_AUTH}: Set Ciphering Mode</span><br><span> DMM -> CIPHER MODE COMMAND MSISDN:46071</span><br><span> - sending Ciphering Mode Command for MSISDN:46071: include_imeisv=0</span><br><span style="color: hsl(0, 100%, 40%);">-- ...perm algo: 2</span><br><span style="color: hsl(120, 100%, 40%);">+- ...perm algo: A5/1</span><br><span> - ...key: 07fa7502e07e1c00</span><br><span> DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_WAIT_AUTH}: state_chg to PR_ARQ_S_WAIT_CIPH</span><br><span> DREF MSISDN:46071: MSC conn use - dtap == 0 (0x0: )</span><br><span>@@ -376,7 +376,7 @@</span><br><span> DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_WAIT_AUTH}: Set Ciphering Mode</span><br><span> DMM -> CIPHER MODE COMMAND MSISDN:46071</span><br><span> - sending Ciphering Mode Command for MSISDN:46071: include_imeisv=0</span><br><span style="color: hsl(0, 100%, 40%);">-- ...perm algo: 2</span><br><span style="color: hsl(120, 100%, 40%);">+- ...perm algo: A5/1</span><br><span> - ...key: e2b234f807886400</span><br><span> DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_WAIT_AUTH}: state_chg to PR_ARQ_S_WAIT_CIPH</span><br><span> DREF MSISDN:46071: MSC conn use - dtap == 0 (0x0: )</span><br><span>@@ -571,7 +571,7 @@</span><br><span> DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_AUTH}: Set Ciphering Mode</span><br><span> DMM -> CIPHER MODE COMMAND IMSI:901700000004620</span><br><span> - sending Ciphering Mode Command for IMSI:901700000004620: include_imeisv=0</span><br><span style="color: hsl(0, 100%, 40%);">-- ...perm algo: 2</span><br><span style="color: hsl(120, 100%, 40%);">+- ...perm algo: A5/1</span><br><span> - ...key: 61855fb81fc2a800</span><br><span> DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_AUTH}: state_chg to VLR_ULA_S_WAIT_CIPH</span><br><span> DREF IMSI:901700000004620: MSC conn use - dtap == 0 (0x0: )</span><br><span>@@ -778,7 +778,7 @@</span><br><span> DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:50462976){PR_ARQ_S_WAIT_AUTH}: Set Ciphering Mode</span><br><span> DMM -> CIPHER MODE COMMAND MSISDN:46071</span><br><span> - sending Ciphering Mode Command for MSISDN:46071: include_imeisv=0</span><br><span style="color: hsl(0, 100%, 40%);">-- ...perm algo: 2</span><br><span style="color: hsl(120, 100%, 40%);">+- ...perm algo: A5/1</span><br><span> - ...key: 07fa7502e07e1c00</span><br><span> DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:50462976){PR_ARQ_S_WAIT_AUTH}: state_chg to PR_ARQ_S_WAIT_CIPH</span><br><span> DREF MSISDN:46071: MSC conn use - dtap == 0 (0x0: )</span><br><span>@@ -916,7 +916,7 @@</span><br><span> DVLR Process_Access_Request_VLR(PAGING_RESP:50462976){PR_ARQ_S_WAIT_AUTH}: Set Ciphering Mode</span><br><span> DMM -> CIPHER MODE COMMAND MSISDN:46071</span><br><span> - sending Ciphering Mode Command for MSISDN:46071: include_imeisv=0</span><br><span style="color: hsl(0, 100%, 40%);">-- ...perm algo: 2</span><br><span style="color: hsl(120, 100%, 40%);">+- ...perm algo: A5/1</span><br><span> - ...key: e2b234f807886400</span><br><span> DVLR Process_Access_Request_VLR(PAGING_RESP:50462976){PR_ARQ_S_WAIT_AUTH}: state_chg to PR_ARQ_S_WAIT_CIPH</span><br><span> DREF MSISDN:46071: MSC conn use - dtap == 0 (0x0: )</span><br><span>@@ -1111,7 +1111,7 @@</span><br><span> DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_AUTH}: Set Ciphering Mode</span><br><span> DMM -> CIPHER MODE COMMAND IMSI:901700000004620</span><br><span> - sending Ciphering Mode Command for IMSI:901700000004620: include_imeisv=0</span><br><span style="color: hsl(0, 100%, 40%);">-- ...perm algo: 2</span><br><span style="color: hsl(120, 100%, 40%);">+- ...perm algo: A5/1</span><br><span> - ...key: 61855fb81fc2a800</span><br><span> DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_AUTH}: state_chg to VLR_ULA_S_WAIT_CIPH</span><br><span> DREF IMSI:901700000004620: MSC conn use - dtap == 0 (0x0: )</span><br><span>@@ -1352,7 +1352,7 @@</span><br><span> DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_AUTH}: Set Ciphering Mode</span><br><span> DMM -> CIPHER MODE COMMAND IMSI:901700000004620</span><br><span> - sending Ciphering Mode Command for IMSI:901700000004620: include_imeisv=1</span><br><span style="color: hsl(0, 100%, 40%);">-- ...perm algo: 2</span><br><span style="color: hsl(120, 100%, 40%);">+- ...perm algo: A5/1</span><br><span> - ...key: 61855fb81fc2a800</span><br><span> DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_AUTH}: state_chg to VLR_ULA_S_WAIT_CIPH</span><br><span> DREF IMSI:901700000004620: MSC conn use - dtap == 0 (0x0: )</span><br><span>@@ -1582,7 +1582,7 @@</span><br><span> DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_AUTH}: Set Ciphering Mode</span><br><span> DMM -> CIPHER MODE COMMAND IMSI:901700000004620</span><br><span> - sending Ciphering Mode Command for IMSI:901700000004620: include_imeisv=0</span><br><span style="color: hsl(0, 100%, 40%);">-- ...perm algo: 2</span><br><span style="color: hsl(120, 100%, 40%);">+- ...perm algo: A5/1</span><br><span> - ...key: 61855fb81fc2a800</span><br><span> DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_AUTH}: state_chg to VLR_ULA_S_WAIT_CIPH</span><br><span> DREF IMSI:901700000004620: MSC conn use - dtap == 0 (0x0: )</span><br><span>@@ -1856,7 +1856,7 @@</span><br><span> DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_WAIT_AUTH}: Set Ciphering Mode</span><br><span> DMM -> CIPHER MODE COMMAND IMSI:901700000010650</span><br><span> - sending Ciphering Mode Command for IMSI:901700000010650: include_imeisv=0</span><br><span style="color: hsl(0, 100%, 40%);">-- ...perm algo: 2</span><br><span style="color: hsl(120, 100%, 40%);">+- ...perm algo: A5/1</span><br><span> - ...key: 7a75f0ac9b844400</span><br><span> DVLR vlr_lu_fsm(LU:901700000010650){VLR_ULA_S_WAIT_AUTH}: state_chg to VLR_ULA_S_WAIT_CIPH</span><br><span> DREF IMSI:901700000010650: MSC conn use - dtap == 0 (0x0: )</span><br><span>@@ -2015,7 +2015,7 @@</span><br><span> DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000010650){PR_ARQ_S_WAIT_AUTH}: Set Ciphering Mode</span><br><span> DMM -> CIPHER MODE COMMAND MSISDN:42342</span><br><span> - sending Ciphering Mode Command for MSISDN:42342: include_imeisv=0</span><br><span style="color: hsl(0, 100%, 40%);">-- ...perm algo: 2</span><br><span style="color: hsl(120, 100%, 40%);">+- ...perm algo: A5/1</span><br><span> - ...key: da149b11d473f400</span><br><span> DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000010650){PR_ARQ_S_WAIT_AUTH}: state_chg to PR_ARQ_S_WAIT_CIPH</span><br><span> DREF MSISDN:42342: MSC conn use - dtap == 0 (0x0: )</span><br><span>@@ -2143,7 +2143,7 @@</span><br><span> DVLR Process_Access_Request_VLR(PAGING_RESP:901700000010650){PR_ARQ_S_WAIT_AUTH}: Set Ciphering Mode</span><br><span> DMM -> CIPHER MODE COMMAND MSISDN:42342</span><br><span> - sending Ciphering Mode Command for MSISDN:42342: include_imeisv=0</span><br><span style="color: hsl(0, 100%, 40%);">-- ...perm algo: 2</span><br><span style="color: hsl(120, 100%, 40%);">+- ...perm algo: A5/1</span><br><span> - ...key: 26ec67fad3073000</span><br><span> DVLR Process_Access_Request_VLR(PAGING_RESP:901700000010650){PR_ARQ_S_WAIT_AUTH}: state_chg to PR_ARQ_S_WAIT_CIPH</span><br><span> DREF MSISDN:42342: MSC conn use - dtap == 0 (0x0: )</span><br><span>diff --git a/tests/msc_vlr/msc_vlr_tests.c b/tests/msc_vlr/msc_vlr_tests.c</span><br><span>index f8551dd..bf1b200 100644</span><br><span>--- a/tests/msc_vlr/msc_vlr_tests.c</span><br><span>+++ b/tests/msc_vlr/msc_vlr_tests.c</span><br><span>@@ -723,7 +723,7 @@</span><br><span>  btw("sending Ciphering Mode Command for %s: include_imeisv=%d",</span><br><span>        vlr_subscr_name(conn->vsub), include_imeisv);</span><br><span>         for (i = 0; i < ei->perm_algo_len; i++)</span><br><span style="color: hsl(0, 100%, 40%);">-           btw("...perm algo: %u", ei->perm_algo[i]);</span><br><span style="color: hsl(120, 100%, 40%);">+               btw("...perm algo: A5/%u", ei->perm_algo[i] - 1);</span><br><span>       OSMO_ASSERT(ei->key_len <= sizeof(ei->key));</span><br><span>        btw("...key: %s", osmo_hexdump_nospc(ei->key, ei->key_len));</span><br><span>         cipher_mode_cmd_sent = true;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10986">change 10986</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/10986"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-msc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Ic00f1e54490650bcb40170647b8ffd52ede23fd3 </div>
<div style="display:none"> Gerrit-Change-Number: 10986 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Vadim Yanitskiy <axilirator@gmail.com> </div>