aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeels Hofmeyr <neels@hofmeyr.de>2017-12-14 20:58:54 +0100
committerNeels Hofmeyr <neels@hofmeyr.de>2017-12-20 00:10:34 +0100
commit84c2f43d00af200eb2b1a58a566e3ed69e767904 (patch)
tree299a490791d811b039b85dc215ad875ceb948155
parent63f68ccc4cdee6e8de2e4e63d456d4c340af5b51 (diff)
fix debug log: put 'deriving 2G from 3G' in proper place
Don't log "deriving 2G from 3G" when we're actually calculating separately; log it when we're actually deriving from 3G. Add log "calculating 2G separately" in the right place. The test output changes show that each test said "separate 2G" at the top while logging "deriving 2G from 3G" further down, which was obviously wrong. Change-Id: I6679d7ef8fdcae39a0c2aff7ac638e63dddb10dc
Diffstat
-rw-r--r--src/auc.c3
-rw-r--r--tests/auc/auc_test.err13
-rw-r--r--tests/auc/auc_ts_55_205_test_sets.err19
3 files changed, 32 insertions, 3 deletions
diff --git a/src/auc.c b/src/auc.c
index f55b377..79c3918 100644
--- a/src/auc.c
+++ b/src/auc.c
@@ -144,6 +144,7 @@ int auc_compute_vectors(struct osmo_auth_vector *vec, unsigned int num_vec,
if (!aud2g) {
/* use the 2G tokens from 3G keys */
+ DBGP("vector [%u]: deriving 2G from 3G\n", i);
DBGVB(kc);
DBGVB(sres);
DBGVV("0x%x", auth_types);
@@ -151,7 +152,7 @@ int auc_compute_vectors(struct osmo_auth_vector *vec, unsigned int num_vec,
}
/* calculate 2G separately */
- DBGP("vector [%u]: deriving 2G from 3G\n", i);
+ DBGP("vector [%u]: calculating 2G separately\n", i);
rc = osmo_auth_gen_vec(&vtmp, aud2g, rand);
if (rc < 0) {
diff --git a/tests/auc/auc_test.err b/tests/auc/auc_test.err
index 5263d04..0a4d9af 100644
--- a/tests/auc/auc_test.err
+++ b/tests/auc/auc_test.err
@@ -35,7 +35,7 @@ DAUC vector [0]: ck = f64735036e5871319c679f4742a75ea1
DAUC vector [0]: ik = 27497388b6cb044648f396aa155b95ef
DAUC vector [0]: res = e229c19e791f2e410000000000000000
DAUC vector [0]: res_len = 8
-DAUC vector [0]: deriving 2G from 3G
+DAUC vector [0]: calculating 2G separately
DAUC vector [0]: kc = 241a5b16aeb8e400
DAUC vector [0]: sres = 429d5b27
DAUC vector [0]: auth_types = 0x3
@@ -55,7 +55,7 @@ DAUC vector [0]: ck = f64735036e5871319c679f4742a75ea1
DAUC vector [0]: ik = 27497388b6cb044648f396aa155b95ef
DAUC vector [0]: res = e229c19e791f2e410000000000000000
DAUC vector [0]: res_len = 8
-DAUC vector [0]: deriving 2G from 3G
+DAUC vector [0]: calculating 2G separately
DAUC vector [0]: kc = 241a5b16aeb8e400
DAUC vector [0]: sres = 429d5b27
DAUC vector [0]: auth_types = 0x3
@@ -78,6 +78,7 @@ DAUC vector [0]: ck = f64735036e5871319c679f4742a75ea1
DAUC vector [0]: ik = 27497388b6cb044648f396aa155b95ef
DAUC vector [0]: res = e229c19e791f2e410000000000000000
DAUC vector [0]: res_len = 8
+DAUC vector [0]: deriving 2G from 3G
DAUC vector [0]: kc = 059a4f668f6fbe39
DAUC vector [0]: sres = 9b36efdf
DAUC vector [0]: auth_types = 0x3
@@ -96,6 +97,7 @@ DAUC vector [0]: ck = f64735036e5871319c679f4742a75ea1
DAUC vector [0]: ik = 27497388b6cb044648f396aa155b95ef
DAUC vector [0]: res = e229c19e791f2e410000000000000000
DAUC vector [0]: res_len = 8
+DAUC vector [0]: deriving 2G from 3G
DAUC vector [0]: kc = 059a4f668f6fbe39
DAUC vector [0]: sres = 9b36efdf
DAUC vector [0]: auth_types = 0x3
@@ -117,6 +119,7 @@ DAUC vector [0]: ck = e9922bd036718ed9e40bd1d02c3b81a5
DAUC vector [0]: ik = f19c20ca863137f8892326d959ec5e01
DAUC vector [0]: res = 9af5a557902d2db80000000000000000
DAUC vector [0]: res_len = 8
+DAUC vector [0]: deriving 2G from 3G
DAUC vector [0]: kc = 7526fc13c5976685
DAUC vector [0]: sres = 0ad888ef
DAUC vector [0]: auth_types = 0x3
@@ -137,6 +140,7 @@ DAUC vector [0]: ck = e9922bd036718ed9e40bd1d02c3b81a5
DAUC vector [0]: ik = f19c20ca863137f8892326d959ec5e01
DAUC vector [0]: res = 9af5a557902d2db80000000000000000
DAUC vector [0]: res_len = 8
+DAUC vector [0]: deriving 2G from 3G
DAUC vector [0]: kc = 7526fc13c5976685
DAUC vector [0]: sres = 0ad888ef
DAUC vector [0]: auth_types = 0x3
@@ -147,6 +151,7 @@ DAUC vector [1]: ck = 3686f05df057d1899c66ae4eb18cf941
DAUC vector [1]: ik = 79f21ed53bcb47787de57d136ff803a5
DAUC vector [1]: res = 43023475cb29292c0000000000000000
DAUC vector [1]: res_len = 8
+DAUC vector [1]: deriving 2G from 3G
DAUC vector [1]: kc = aef73dd515e86c15
DAUC vector [1]: sres = 882b1d59
DAUC vector [1]: auth_types = 0x3
@@ -157,6 +162,7 @@ DAUC vector [2]: ck = d86c3191a36fc0602e48202ef2080964
DAUC vector [2]: ik = 648dab72016181406243420649e63dc9
DAUC vector [2]: res = 010cab11cc63a6e40000000000000000
DAUC vector [2]: res_len = 8
+DAUC vector [2]: deriving 2G from 3G
DAUC vector [2]: kc = f0eaf8cb19e0758d
DAUC vector [2]: sres = cd6f0df5
DAUC vector [2]: auth_types = 0x3
@@ -179,6 +185,7 @@ DAUC vector [0]: ck = e9922bd036718ed9e40bd1d02c3b81a5
DAUC vector [0]: ik = f19c20ca863137f8892326d959ec5e01
DAUC vector [0]: res = 9af5a557902d2db80000000000000000
DAUC vector [0]: res_len = 8
+DAUC vector [0]: deriving 2G from 3G
DAUC vector [0]: kc = 7526fc13c5976685
DAUC vector [0]: sres = 0ad888ef
DAUC vector [0]: auth_types = 0x3
@@ -189,6 +196,7 @@ DAUC vector [1]: ck = 3686f05df057d1899c66ae4eb18cf941
DAUC vector [1]: ik = 79f21ed53bcb47787de57d136ff803a5
DAUC vector [1]: res = 43023475cb29292c0000000000000000
DAUC vector [1]: res_len = 8
+DAUC vector [1]: deriving 2G from 3G
DAUC vector [1]: kc = aef73dd515e86c15
DAUC vector [1]: sres = 882b1d59
DAUC vector [1]: auth_types = 0x3
@@ -199,6 +207,7 @@ DAUC vector [2]: ck = d86c3191a36fc0602e48202ef2080964
DAUC vector [2]: ik = 648dab72016181406243420649e63dc9
DAUC vector [2]: res = 010cab11cc63a6e40000000000000000
DAUC vector [2]: res_len = 8
+DAUC vector [2]: deriving 2G from 3G
DAUC vector [2]: kc = f0eaf8cb19e0758d
DAUC vector [2]: sres = cd6f0df5
DAUC vector [2]: auth_types = 0x3
diff --git a/tests/auc/auc_ts_55_205_test_sets.err b/tests/auc/auc_ts_55_205_test_sets.err
index 1c5ad60..b0f83ae 100644
--- a/tests/auc/auc_ts_55_205_test_sets.err
+++ b/tests/auc/auc_ts_55_205_test_sets.err
@@ -12,6 +12,7 @@ DAUC vector [0]: ck = b40ba9a3c58b2a05bbf0d987b21bf8cb
DAUC vector [0]: ik = f769bcd751044604127672711c6d3441
DAUC vector [0]: res = a54211d5e3ba50bf0000000000000000
DAUC vector [0]: res_len = 8
+DAUC vector [0]: deriving 2G from 3G
DAUC vector [0]: kc = eae4be823af9a08b
DAUC vector [0]: sres = 46f8416a
DAUC vector [0]: auth_types = 0x3
@@ -34,6 +35,7 @@ DAUC vector [0]: ck = 5dbdbb2954e8f3cde665b046179a5098
DAUC vector [0]: ik = 59a92d3b476a0443487055cf88b2307b
DAUC vector [0]: res = 8011c48c0c214ed20000000000000000
DAUC vector [0]: res_len = 8
+DAUC vector [0]: deriving 2G from 3G
DAUC vector [0]: kc = aa01739b8caa976d
DAUC vector [0]: sres = 8c308a5e
DAUC vector [0]: auth_types = 0x3
@@ -56,6 +58,7 @@ DAUC vector [0]: ck = e203edb3971574f5a94b0d61b816345d
DAUC vector [0]: ik = 0c4524adeac041c4dd830d20854fc46b
DAUC vector [0]: res = f365cd683cd92e960000000000000000
DAUC vector [0]: res_len = 8
+DAUC vector [0]: deriving 2G from 3G
DAUC vector [0]: kc = 9a8ec95f408cc507
DAUC vector [0]: sres = cfbce3fe
DAUC vector [0]: auth_types = 0x3
@@ -78,6 +81,7 @@ DAUC vector [0]: ck = 7657766b373d1c2138f307e3de9242f9
DAUC vector [0]: ik = 1c42e960d89b8fa99f2744e0708ccb53
DAUC vector [0]: res = 5860fc1bce351e7e0000000000000000
DAUC vector [0]: res_len = 8
+DAUC vector [0]: deriving 2G from 3G
DAUC vector [0]: kc = cdc1dc0841b81a22
DAUC vector [0]: sres = 9655e265
DAUC vector [0]: auth_types = 0x3
@@ -100,6 +104,7 @@ DAUC vector [0]: ck = 3f8c7587fe8e4b233af676aede30ba3b
DAUC vector [0]: ik = a7466cc1e6b2a1337d49d3b66e95d7b4
DAUC vector [0]: res = 16c8233f05a0ac280000000000000000
DAUC vector [0]: res_len = 8
+DAUC vector [0]: deriving 2G from 3G
DAUC vector [0]: kc = df75bc5ea899879f
DAUC vector [0]: sres = 13688f17
DAUC vector [0]: auth_types = 0x3
@@ -122,6 +127,7 @@ DAUC vector [0]: ck = 4cd0846020f8fa0731dd47cbdc6be411
DAUC vector [0]: ik = 88ab80a415f15c73711254a1d388f696
DAUC vector [0]: res = 8c25a16cd918a1df0000000000000000
DAUC vector [0]: res_len = 8
+DAUC vector [0]: deriving 2G from 3G
DAUC vector [0]: kc = 84b417ae3aeab4f3
DAUC vector [0]: sres = 553d00b3
DAUC vector [0]: auth_types = 0x3
@@ -144,6 +150,7 @@ DAUC vector [0]: ck = 10f05bab75a99a5fbb98a9c287679c3b
DAUC vector [0]: ik = f9ec0865eb32f22369cade40c59c3a44
DAUC vector [0]: res = a63241e1ffc3e5ab0000000000000000
DAUC vector [0]: res_len = 8
+DAUC vector [0]: deriving 2G from 3G
DAUC vector [0]: kc = 3b4e244cdc60ce03
DAUC vector [0]: sres = 59f1a44a
DAUC vector [0]: auth_types = 0x3
@@ -166,6 +173,7 @@ DAUC vector [0]: ck = 71236b7129f9b22ab77ea7a54c96da22
DAUC vector [0]: ik = 90527ebaa5588968db41727325a04d9e
DAUC vector [0]: res = 4a90b2171ac83a760000000000000000
DAUC vector [0]: res_len = 8
+DAUC vector [0]: deriving 2G from 3G
DAUC vector [0]: kc = 8d4ec01de597acfe
DAUC vector [0]: sres = 50588861
DAUC vector [0]: auth_types = 0x3
@@ -188,6 +196,7 @@ DAUC vector [0]: ck = 08cef6d004ec61471a3c3cda048137fa
DAUC vector [0]: ik = ed0318ca5deb9206272f6e8fa64ba411
DAUC vector [0]: res = 4bc2212d8624910a0000000000000000
DAUC vector [0]: res_len = 8
+DAUC vector [0]: deriving 2G from 3G
DAUC vector [0]: kc = d8debc4ffbcd60aa
DAUC vector [0]: sres = cde6b027
DAUC vector [0]: auth_types = 0x3
@@ -210,6 +219,7 @@ DAUC vector [0]: ck = 69b1cae7c7429d975e245cacb05a517c
DAUC vector [0]: ik = 74f24e8c26df58e1b38d7dcd4f1b7fbd
DAUC vector [0]: res = 6fc30fee6d1235230000000000000000
DAUC vector [0]: res_len = 8
+DAUC vector [0]: deriving 2G from 3G
DAUC vector [0]: kc = f0eaa50a1edcebb7
DAUC vector [0]: sres = 02d13acd
DAUC vector [0]: auth_types = 0x3
@@ -232,6 +242,7 @@ DAUC vector [0]: ck = 908c43f0569cb8f74bc971e706c36c5f
DAUC vector [0]: ik = c251df0d888dd9329bcf46655b226e40
DAUC vector [0]: res = aefa357beac2a87a0000000000000000
DAUC vector [0]: res_len = 8
+DAUC vector [0]: deriving 2G from 3G
DAUC vector [0]: kc = 82dbab7f83f063da
DAUC vector [0]: sres = 44389d01
DAUC vector [0]: auth_types = 0x3
@@ -254,6 +265,7 @@ DAUC vector [0]: ck = 44c0f23c5493cfd241e48f197e1d1012
DAUC vector [0]: ik = 0c9fb81613884c2535dd0eabf3b440d8
DAUC vector [0]: res = 98dbbd099b3b408d0000000000000000
DAUC vector [0]: res_len = 8
+DAUC vector [0]: deriving 2G from 3G
DAUC vector [0]: kc = 3c66cb98cab2d33d
DAUC vector [0]: sres = 03e0fd84
DAUC vector [0]: auth_types = 0x3
@@ -276,6 +288,7 @@ DAUC vector [0]: ck = 5af86b80edb70df5292cc1121cbad50c
DAUC vector [0]: ik = 7f4d6ae7440e18789a8b75ad3f42f03a
DAUC vector [0]: res = af4a411e1139f2c20000000000000000
DAUC vector [0]: res_len = 8
+DAUC vector [0]: deriving 2G from 3G
DAUC vector [0]: kc = 9612b5d88a4130bb
DAUC vector [0]: sres = be73b3dc
DAUC vector [0]: auth_types = 0x3
@@ -298,6 +311,7 @@ DAUC vector [0]: ck = 3f8c3f3ccf7625bf77fc94bcfd22fd26
DAUC vector [0]: ik = abcbae8fd46115e9961a55d0da5f2078
DAUC vector [0]: res = 7bffa5c2f41fbc050000000000000000
DAUC vector [0]: res_len = 8
+DAUC vector [0]: deriving 2G from 3G
DAUC vector [0]: kc = 75a150df3c6aed08
DAUC vector [0]: sres = 8fe019c7
DAUC vector [0]: auth_types = 0x3
@@ -320,6 +334,7 @@ DAUC vector [0]: ck = d42b2d615e49a03ac275a5aef97af892
DAUC vector [0]: ik = 0b3f8d024fe6bfafaa982b8f82e319c2
DAUC vector [0]: res = 7e3f44c7591f6f450000000000000000
DAUC vector [0]: res_len = 8
+DAUC vector [0]: deriving 2G from 3G
DAUC vector [0]: kc = b7f92e426a36fec5
DAUC vector [0]: sres = 27202b82
DAUC vector [0]: auth_types = 0x3
@@ -342,6 +357,7 @@ DAUC vector [0]: ck = 6edaf99e5bd9f85d5f36d91c1272fb4b
DAUC vector [0]: ik = d61c853c280dd9c46f297baec386de17
DAUC vector [0]: res = 70f6bdb9ad21525f0000000000000000
DAUC vector [0]: res_len = 8
+DAUC vector [0]: deriving 2G from 3G
DAUC vector [0]: kc = 88d9de10a22004c5
DAUC vector [0]: sres = ddd7efe6
DAUC vector [0]: auth_types = 0x3
@@ -364,6 +380,7 @@ DAUC vector [0]: ck = 66195dbed0313274c5ca7766615fa25e
DAUC vector [0]: ik = 66bec707eb2afc476d7408a8f2927b36
DAUC vector [0]: res = 479dd25c20792d630000000000000000
DAUC vector [0]: res_len = 8
+DAUC vector [0]: deriving 2G from 3G
DAUC vector [0]: kc = a819e577a8d6175b
DAUC vector [0]: sres = 67e4ff3f
DAUC vector [0]: auth_types = 0x3
@@ -386,6 +403,7 @@ DAUC vector [0]: ck = 5349fbe098649f948f5d2e973a81c00f
DAUC vector [0]: ik = 9744871ad32bf9bbd1dd5ce54e3e2e5a
DAUC vector [0]: res = 28d7b0f2a2ec3de50000000000000000
DAUC vector [0]: res_len = 8
+DAUC vector [0]: deriving 2G from 3G
DAUC vector [0]: kc = 9a8d0e883ff0887a
DAUC vector [0]: sres = 8a3b8d17
DAUC vector [0]: auth_types = 0x3
@@ -408,6 +426,7 @@ DAUC vector [0]: ck = b5f2da03883b69f96bf52e029ed9ac45
DAUC vector [0]: ik = b4721368bc16ea67875c5598688bb0ef
DAUC vector [0]: res = a95100e2760952cd0000000000000000
DAUC vector [0]: res_len = 8
+DAUC vector [0]: deriving 2G from 3G
DAUC vector [0]: kc = ed29b2f1c27f9f34
DAUC vector [0]: sres = df58522f
DAUC vector [0]: auth_types = 0x3
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-23 07:10:40 +0000