<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/12404">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Harald Welte: Looks good to me, approved
Neels Hofmeyr: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">err log: fully log MS supported A5 algos on mismatch<br><br>Change-Id: Icb18e0f0bb420de066e7eb8fc683f192ba2a7368<br>---<br>M src/libmsc/gsm_04_08.c<br>1 file changed, 38 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/libmsc/gsm_04_08.c b/src/libmsc/gsm_04_08.c</span><br><span>index 4baf996..7a485c7 100644</span><br><span>--- a/src/libmsc/gsm_04_08.c</span><br><span>+++ b/src/libmsc/gsm_04_08.c</span><br><span>@@ -118,6 +118,41 @@</span><br><span> return classmark2_is_r99(cm->classmark2, cm->classmark2_len);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static const char *classmark_a5_name(const struct gsm_classmark *cm)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ static char buf[128];</span><br><span style="color: hsl(120, 100%, 40%);">+ char cm1[42];</span><br><span style="color: hsl(120, 100%, 40%);">+ char cm2[42];</span><br><span style="color: hsl(120, 100%, 40%);">+ char cm3[42];</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (cm->classmark1_set)</span><br><span style="color: hsl(120, 100%, 40%);">+ snprintf(cm1, sizeof(cm1), "cm1{a5/1=%s}",</span><br><span style="color: hsl(120, 100%, 40%);">+ cm->classmark1.a5_1 ? "not-supported":"supported" /* inverted logic */);</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ snprintf(cm1, sizeof(cm1), "no-cm1");</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (cm->classmark2_len >= 3)</span><br><span style="color: hsl(120, 100%, 40%);">+ snprintf(cm2, sizeof(cm2), " cm2{0x%x=%s%s}",</span><br><span style="color: hsl(120, 100%, 40%);">+ cm->classmark2[2],</span><br><span style="color: hsl(120, 100%, 40%);">+ cm->classmark2[2] & 0x1 ? " A5/2" : "",</span><br><span style="color: hsl(120, 100%, 40%);">+ cm->classmark2[2] & 0x2 ? " A5/3" : "");</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ snprintf(cm2, sizeof(cm2), " no-cm2");</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (cm->classmark3_len >= 1)</span><br><span style="color: hsl(120, 100%, 40%);">+ snprintf(cm3, sizeof(cm3), " cm3{0x%x=%s%s%s%s}",</span><br><span style="color: hsl(120, 100%, 40%);">+ cm->classmark3[0],</span><br><span style="color: hsl(120, 100%, 40%);">+ cm->classmark3[0] & (1 << 0) ? " A5/4" : "",</span><br><span style="color: hsl(120, 100%, 40%);">+ cm->classmark3[0] & (1 << 1) ? " A5/5" : "",</span><br><span style="color: hsl(120, 100%, 40%);">+ cm->classmark3[0] & (1 << 2) ? " A5/6" : "",</span><br><span style="color: hsl(120, 100%, 40%);">+ cm->classmark3[0] & (1 << 3) ? " A5/7" : "");</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ snprintf(cm3, sizeof(cm3), " no-cm3");</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ snprintf(buf, sizeof(buf), "%s%s%s", cm1, cm2, cm3);</span><br><span style="color: hsl(120, 100%, 40%);">+ return buf;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* Determine if the given CLASSMARK (1/2/3) value permits a given A5/n cipher.</span><br><span> * Return 1 when the given A5/n is permitted, 0 when not, and negative if the respective MS CLASSMARK is</span><br><span> * not known, where the negative number indicates the classmark type: -2 means Classmark 2 is not</span><br><span>@@ -1617,8 +1652,9 @@</span><br><span> </span><br><span> if (ei.perm_algo_len == 0) {</span><br><span> LOGP(DMM, LOGL_ERROR, "%s: cannot start ciphering, no intersection "</span><br><span style="color: hsl(0, 100%, 40%);">- "between MSC-configured and MS-supported A5 algorithms\n",</span><br><span style="color: hsl(0, 100%, 40%);">- vlr_subscr_name(conn->vsub));</span><br><span style="color: hsl(120, 100%, 40%);">+ "between MSC-configured and MS-supported A5 algorithms. MSC: %x MS: %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ vlr_subscr_name(conn->vsub), net->a5_encryption_mask,</span><br><span style="color: hsl(120, 100%, 40%);">+ classmark_a5_name(&conn->vsub->classmark));</span><br><span> return -ENOTSUP;</span><br><span> }</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12404">change 12404</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/12404"/><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: Icb18e0f0bb420de066e7eb8fc683f192ba2a7368 </div>
<div style="display:none"> Gerrit-Change-Number: 12404 </div>
<div style="display:none"> Gerrit-PatchSet: 13 </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: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Vadim Yanitskiy <axilirator@gmail.com> </div>