<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-hlr/+/21880">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">support the XOR algorithm for UMTS AKA<br><br>Test USIMs as specified by 3GPP use the XOR algorithm not only for 2G<br>but also for 3G. libosmocore includes the XOR-3G support since v1.3.0,<br>but osmo-hlr somehow never made use of it.<br><br>Change-Id: I3a452af9c18cd90d00ab4766d6bd1679456bc1a2<br>Closes: OS#4924<br>---<br>M src/db_hlr.c<br>M src/hlr_vty_subscr.c<br>M tests/auc/auc_test.c<br>M tests/auc/auc_test.err<br>4 files changed, 77 insertions(+), 8 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/80/21880/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/db_hlr.c b/src/db_hlr.c</span><br><span>index 83c2c51..6ba43c2 100644</span><br><span>--- a/src/db_hlr.c</span><br><span>+++ b/src/db_hlr.c</span><br><span>@@ -264,11 +264,11 @@</span><br><span> switch (aud->algo) {</span><br><span> case OSMO_AUTH_ALG_NONE:</span><br><span> case OSMO_AUTH_ALG_MILENAGE:</span><br><span style="color: hsl(120, 100%, 40%);">+ case OSMO_AUTH_ALG_XOR:</span><br><span> break;</span><br><span> case OSMO_AUTH_ALG_COMP128v1:</span><br><span> case OSMO_AUTH_ALG_COMP128v2:</span><br><span> case OSMO_AUTH_ALG_COMP128v3:</span><br><span style="color: hsl(0, 100%, 40%);">- case OSMO_AUTH_ALG_XOR:</span><br><span> LOGP(DAUC, LOGL_ERROR, "Cannot update auth tokens:"</span><br><span> " auth algo not suited for 3G: %s\n",</span><br><span> osmo_auth_alg_name(aud->algo));</span><br><span>diff --git a/src/hlr_vty_subscr.c b/src/hlr_vty_subscr.c</span><br><span>index a9262ba..6ce0191 100644</span><br><span>--- a/src/hlr_vty_subscr.c</span><br><span>+++ b/src/hlr_vty_subscr.c</span><br><span>@@ -355,9 +355,10 @@</span><br><span> "Use COMP128v3 algorithm\n" \</span><br><span> "Use XOR algorithm\n"</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#define AUTH_ALG_TYPES_3G "milenage"</span><br><span style="color: hsl(120, 100%, 40%);">+#define AUTH_ALG_TYPES_3G "(milenage|xor)"</span><br><span> #define AUTH_ALG_TYPES_3G_HELP \</span><br><span style="color: hsl(0, 100%, 40%);">- "Use Milenage algorithm\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "Use Milenage algorithm\n" \</span><br><span style="color: hsl(120, 100%, 40%);">+ "Use XOR algorithm\n"</span><br><span> </span><br><span> #define A38_XOR_MIN_KEY_LEN 12</span><br><span> #define A38_XOR_MAX_KEY_LEN 16</span><br><span>@@ -511,11 +512,11 @@</span><br><span> int rc;</span><br><span> const char *id_type = argv[0];</span><br><span> const char *id = argv[1];</span><br><span style="color: hsl(0, 100%, 40%);">- const char *alg_type = AUTH_ALG_TYPES_3G;</span><br><span style="color: hsl(0, 100%, 40%);">- const char *k = argv[2];</span><br><span style="color: hsl(0, 100%, 40%);">- bool opc_is_op = (strcasecmp("op", argv[3]) == 0);</span><br><span style="color: hsl(0, 100%, 40%);">- const char *op_opc = argv[4];</span><br><span style="color: hsl(0, 100%, 40%);">- int ind_bitlen = argc > 6? atoi(argv[6]) : 5;</span><br><span style="color: hsl(120, 100%, 40%);">+ const char *alg_type = argv[2];</span><br><span style="color: hsl(120, 100%, 40%);">+ const char *k = argv[3];</span><br><span style="color: hsl(120, 100%, 40%);">+ bool opc_is_op = (strcasecmp("op", argv[4]) == 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ const char *op_opc = argv[5];</span><br><span style="color: hsl(120, 100%, 40%);">+ int ind_bitlen = argc > 7? atoi(argv[7]) : 5;</span><br><span> struct sub_auth_data_str aud3g = {</span><br><span> .type = OSMO_AUTH_TYPE_UMTS,</span><br><span> .u.umts = {</span><br><span>diff --git a/tests/auc/auc_test.c b/tests/auc/auc_test.c</span><br><span>index cdbd0b7..db7edcb 100644</span><br><span>--- a/tests/auc/auc_test.c</span><br><span>+++ b/tests/auc/auc_test.c</span><br><span>@@ -454,6 +454,50 @@</span><br><span> comment_end();</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static void test_gen_vectors_3g_xor(void)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_sub_auth_data aud2g;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_sub_auth_data aud3g;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_auth_vector vec;</span><br><span style="color: hsl(120, 100%, 40%);">+ int rc;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ comment_start();</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ aud2g = (struct osmo_sub_auth_data){ 0 };</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ aud3g = (struct osmo_sub_auth_data){</span><br><span style="color: hsl(120, 100%, 40%);">+ .type = OSMO_AUTH_TYPE_UMTS,</span><br><span style="color: hsl(120, 100%, 40%);">+ .algo = OSMO_AUTH_ALG_XOR,</span><br><span style="color: hsl(120, 100%, 40%);">+ .u.umts.sqn = 0,</span><br><span style="color: hsl(120, 100%, 40%);">+ };</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_hexparse("000102030405060708090a0b0c0d0e0f",</span><br><span style="color: hsl(120, 100%, 40%);">+ aud3g.u.umts.k, sizeof(aud3g.u.umts.k));</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_hexparse("00000000000000000000000000000000",</span><br><span style="color: hsl(120, 100%, 40%);">+ aud3g.u.umts.opc, sizeof(aud3g.u.umts.opc));</span><br><span style="color: hsl(120, 100%, 40%);">+ next_rand("b5039c57e4a75051551d1a390a71ce48", true);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ vec = (struct osmo_auth_vector){ {0} };</span><br><span style="color: hsl(120, 100%, 40%);">+ VERBOSE_ASSERT(aud3g.u.umts.sqn, == 0, "%"PRIu64);</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = auc_compute_vectors(&vec, 1, &aud2g, &aud3g, NULL, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ VERBOSE_ASSERT(rc, == 1, "%d");</span><br><span style="color: hsl(120, 100%, 40%);">+ VERBOSE_ASSERT(aud3g.u.umts.sqn, == 0, "%"PRIu64);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ VEC_IS(&vec,</span><br><span style="color: hsl(120, 100%, 40%);">+ " rand: b5039c57e4a75051551d1a390a71ce48\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ " autn: 54e0a256565d0000b5029e54e0a25656\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ " ck: 029e54e0a256565d141032067cc047b5\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ " ik: 9e54e0a256565d141032067cc047b502\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ " res: b5029e54e0a256565d141032067cc047\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ " res_len: 10\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ " kc: 98e880384887f9fe\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ " sres: 0ec81877\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ " auth_types: 03000000\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ );</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ comment_end();</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> void test_gen_vectors_bad_args()</span><br><span> {</span><br><span> struct osmo_auth_vector vec;</span><br><span>@@ -622,6 +666,7 @@</span><br><span> test_gen_vectors_2g_only();</span><br><span> test_gen_vectors_2g_plus_3g();</span><br><span> test_gen_vectors_3g_only();</span><br><span style="color: hsl(120, 100%, 40%);">+ test_gen_vectors_3g_xor();</span><br><span> test_gen_vectors_bad_args();</span><br><span> </span><br><span> printf("Done\n");</span><br><span>diff --git a/tests/auc/auc_test.err b/tests/auc/auc_test.err</span><br><span>index 0a4d9af..f83e814 100644</span><br><span>--- a/tests/auc/auc_test.err</span><br><span>+++ b/tests/auc/auc_test.err</span><br><span>@@ -217,6 +217,29 @@</span><br><span> ===== test_gen_vectors_3g_only: SUCCESS</span><br><span> </span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+===== test_gen_vectors_3g_xor</span><br><span style="color: hsl(120, 100%, 40%);">+aud3g.u.umts.sqn == 0</span><br><span style="color: hsl(120, 100%, 40%);">+DAUC Computing 1 auth vector: 3G only (2G derived from 3G keys)</span><br><span style="color: hsl(120, 100%, 40%);">+DAUC 3G: k = 000102030405060708090a0b0c0d0e0f</span><br><span style="color: hsl(120, 100%, 40%);">+DAUC 3G: opc = 00000000000000000000000000000000</span><br><span style="color: hsl(120, 100%, 40%);">+DAUC 3G: for sqn ind 0, previous sqn was 0</span><br><span style="color: hsl(120, 100%, 40%);">+DAUC vector [0]: rand = b5039c57e4a75051551d1a390a71ce48</span><br><span style="color: hsl(120, 100%, 40%);">+DAUC vector [0]: sqn = 0</span><br><span style="color: hsl(120, 100%, 40%);">+DAUC vector [0]: autn = 54e0a256565d0000b5029e54e0a25656</span><br><span style="color: hsl(120, 100%, 40%);">+DAUC vector [0]: ck = 029e54e0a256565d141032067cc047b5</span><br><span style="color: hsl(120, 100%, 40%);">+DAUC vector [0]: ik = 9e54e0a256565d141032067cc047b502</span><br><span style="color: hsl(120, 100%, 40%);">+DAUC vector [0]: res = b5029e54e0a256565d141032067cc047</span><br><span style="color: hsl(120, 100%, 40%);">+DAUC vector [0]: res_len = 16</span><br><span style="color: hsl(120, 100%, 40%);">+DAUC vector [0]: deriving 2G from 3G</span><br><span style="color: hsl(120, 100%, 40%);">+DAUC vector [0]: kc = 98e880384887f9fe</span><br><span style="color: hsl(120, 100%, 40%);">+DAUC vector [0]: sres = 0ec81877</span><br><span style="color: hsl(120, 100%, 40%);">+DAUC vector [0]: auth_types = 0x3</span><br><span style="color: hsl(120, 100%, 40%);">+rc == 1</span><br><span style="color: hsl(120, 100%, 40%);">+aud3g.u.umts.sqn == 0</span><br><span style="color: hsl(120, 100%, 40%);">+vector matches expectations</span><br><span style="color: hsl(120, 100%, 40%);">+===== test_gen_vectors_3g_xor: SUCCESS</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> ===== test_gen_vectors_bad_args</span><br><span> </span><br><span> - no auth data (a)</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-hlr/+/21880">change 21880</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-hlr/+/21880"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-hlr </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I3a452af9c18cd90d00ab4766d6bd1679456bc1a2 </div>
<div style="display:none"> Gerrit-Change-Number: 21880 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>