diff options
| author | Harald Welte <laforge@gnumonks.org> | 2011-12-07 11:35:02 +0100 |
|---|---|---|
| committer | Harald Welte <laforge@gnumonks.org> | 2011-12-07 11:35:02 +0100 |
| commit | aae236245596743b6aff4b1b294c0e8d97b8190f (patch) | |
| tree | 7a84960ab3e424930676107f33ad23981b964834 /src | |
| parent | 57143a43619ccb229b35b4b4c7def737cb41a40a (diff) | |
auth_core: don't use anonymous unions to make certain gcc versions happy
Diffstat (limited to 'src')
| -rw-r--r-- | src/gsm/auth_comp128v1.c | 2 | ||||
| -rw-r--r-- | src/gsm/auth_milenage.c | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/gsm/auth_comp128v1.c b/src/gsm/auth_comp128v1.c index 2e1ad2c9..41aef71c 100644 --- a/src/gsm/auth_comp128v1.c +++ b/src/gsm/auth_comp128v1.c @@ -28,7 +28,7 @@ static int c128v1_gen_vec(struct osmo_auth_vector *vec, struct osmo_sub_auth_data *aud, const uint8_t *_rand) { - comp128(aud->gsm.ki, _rand, vec->sres, vec->kc); + comp128(aud->u.gsm.ki, _rand, vec->sres, vec->kc); vec->auth_types = OSMO_AUTH_TYPE_GSM; return 0; diff --git a/src/gsm/auth_milenage.c b/src/gsm/auth_milenage.c index f2d2ffa1..2a9ba334 100644 --- a/src/gsm/auth_milenage.c +++ b/src/gsm/auth_milenage.c @@ -62,17 +62,17 @@ static int milenage_gen_vec(struct osmo_auth_vector *vec, uint8_t sqn[6]; int rc; - sqn_u64_to_48bit(sqn, aud->umts.sqn); - milenage_generate(aud->umts.opc, aud->umts.amf, aud->umts.k, + sqn_u64_to_48bit(sqn, aud->u.umts.sqn); + milenage_generate(aud->u.umts.opc, aud->u.umts.amf, aud->u.umts.k, sqn, _rand, vec->autn, vec->ik, vec->ck, vec->res, &res_len); vec->res_len = res_len; - rc = gsm_milenage(aud->umts.opc, aud->umts.k, _rand, vec->sres, vec->kc); + rc = gsm_milenage(aud->u.umts.opc, aud->u.umts.k, _rand, vec->sres, vec->kc); if (rc < 0) return rc; vec->auth_types = OSMO_AUTH_TYPE_UMTS | OSMO_AUTH_TYPE_GSM; - aud->umts.sqn++; + aud->u.umts.sqn++; return 0; } @@ -85,12 +85,12 @@ static int milenage_gen_vec_auts(struct osmo_auth_vector *vec, uint8_t sqn_out[6]; int rc; - rc = milenage_auts(aud->umts.opc, aud->umts.k, + rc = milenage_auts(aud->u.umts.opc, aud->u.umts.k, rand_auts, auts, sqn_out); if (rc < 0) return rc; - aud->umts.sqn = sqn_48bit_to_u64(sqn_out) + 1; + aud->u.umts.sqn = sqn_48bit_to_u64(sqn_out) + 1; return milenage_gen_vec(vec, aud, _rand); } |