<p>Hoernchen has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/24631">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">a5/4 support<br><br>Change-Id: Ib8e04fe79f30b443a54c38f395a7a3626ff97c45<br>Related: SYS#5324<br>---<br>M src/common/scheduler.c<br>M src/osmo-bts-trx/main.c<br>M tests/cipher/cipher_test.c<br>3 files changed, 5 insertions(+), 5 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/31/24631/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/common/scheduler.c b/src/common/scheduler.c</span><br><span>index 3ab94a2..5dd808d 100644</span><br><span>--- a/src/common/scheduler.c</span><br><span>+++ b/src/common/scheduler.c</span><br><span>@@ -1200,7 +1200,7 @@</span><br><span>  /* no algorithm given means a5/0 */</span><br><span>  if (algo <= 0)</span><br><span>            algo = 0;</span><br><span style="color: hsl(0, 100%, 40%);">-       else if (lchan->encr.key_len != 8) {</span><br><span style="color: hsl(120, 100%, 40%);">+       else if (lchan->encr.key_len > 16) {</span><br><span>           LOGPLCHAN(lchan, DL1C, LOGL_ERROR,</span><br><span>                     "Algo A5/%d not supported with given key_len=%u\n",</span><br><span>                        algo, lchan->encr.key_len);</span><br><span>diff --git a/src/osmo-bts-trx/main.c b/src/osmo-bts-trx/main.c</span><br><span>index 7134939..7c2fda8 100644</span><br><span>--- a/src/osmo-bts-trx/main.c</span><br><span>+++ b/src/osmo-bts-trx/main.c</span><br><span>@@ -127,7 +127,7 @@</span><br><span> </span><br><span>  bts->model_priv = bts_trx;</span><br><span>        bts->variant = BTS_OSMO_TRX;</span><br><span style="color: hsl(0, 100%, 40%);">- bts->support.ciphers = CIPHER_A5(1) | CIPHER_A5(2) | CIPHER_A5(3);</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->support.ciphers = CIPHER_A5(1) | CIPHER_A5(2) | CIPHER_A5(3) | CIPHER_A5(4);</span><br><span> </span><br><span>     /* The nominal value for each TRX is later overwritten through VTY cmd</span><br><span>        * 'nominal-tx-power' if present, otherwise through TRXC cmd NOMTXPOWER.</span><br><span>diff --git a/tests/cipher/cipher_test.c b/tests/cipher/cipher_test.c</span><br><span>index 9d78a88..9303ed2 100644</span><br><span>--- a/tests/cipher/cipher_test.c</span><br><span>+++ b/tests/cipher/cipher_test.c</span><br><span>@@ -50,14 +50,14 @@</span><br><span>          ASSERT_TRUE(bts_supports_cipher(bts, i) == 0);</span><br><span>       }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   /* checking default A5/1 to A5/3 support */</span><br><span style="color: hsl(0, 100%, 40%);">-     bts->support.ciphers = CIPHER_A5(1) | CIPHER_A5(2) | CIPHER_A5(3);</span><br><span style="color: hsl(120, 100%, 40%);">+ /* checking default A5/1 to A5/4 support */</span><br><span style="color: hsl(120, 100%, 40%);">+   bts->support.ciphers = CIPHER_A5(1) | CIPHER_A5(2) | CIPHER_A5(3) | CIPHER_A5(4);</span><br><span>         ASSERT_TRUE(bts_supports_cipher(bts, 0x0) == -ENOTSUP);</span><br><span>      ASSERT_TRUE(bts_supports_cipher(bts, 0x1) == 1); /* A5/0 */</span><br><span>  ASSERT_TRUE(bts_supports_cipher(bts, 0x2) == 1); /* A5/1 */</span><br><span>  ASSERT_TRUE(bts_supports_cipher(bts, 0x3) == 1); /* A5/2 */</span><br><span>  ASSERT_TRUE(bts_supports_cipher(bts, 0x4) == 1); /* A5/3 */</span><br><span style="color: hsl(0, 100%, 40%);">-     ASSERT_TRUE(bts_supports_cipher(bts, 0x5) == 0); /* A5/4 */</span><br><span style="color: hsl(120, 100%, 40%);">+   ASSERT_TRUE(bts_supports_cipher(bts, 0x5) == 1); /* A5/4 */</span><br><span>  ASSERT_TRUE(bts_supports_cipher(bts, 0x6) == 0); /* A5/5 */</span><br><span>  ASSERT_TRUE(bts_supports_cipher(bts, 0x7) == 0); /* A5/6 */</span><br><span>  ASSERT_TRUE(bts_supports_cipher(bts, 0x8) == 0); /* A5/7 */</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/24631">change 24631</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/osmo-bts/+/24631"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-bts </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ib8e04fe79f30b443a54c38f395a7a3626ff97c45 </div>
<div style="display:none"> Gerrit-Change-Number: 24631 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Hoernchen <ewild@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>