On Wed, Jun 04, 2014 at 06:21:54PM +0200, Max Suraev wrote:
Hi!
sorry for the late reply (and I also intend to reply for reviving
our wednesday meetings. I could talk about TCAP/MAP..)
> ---
> openbsc/src/libmsc/auth.c | 68
> +++++++++++++++++++----------------------------
> 1 file changed, 28 insertions(+), 40 deletions(-)
>
> diff --git a/openbsc/src/libmsc/auth.c b/openbsc/src/libmsc/auth.c
> index 10d8edf..ab84975 100644
> --- a/openbsc/src/libmsc/auth.c
> +++ b/openbsc/src/libmsc/auth.c
> @@ -25,46 +25,11 @@
> #include <openbsc/auth.h>
> #include <openbsc/gsm_data.h>
>
> -#include <osmocom/gsm/comp128.h>
> +#include <osmocom/crypt/auth.h>
>
> #include <stdlib.h>
>
>
> -static int
> -_use_xor(struct gsm_auth_info *ainfo, struct gsm_auth_tuple *atuple)
> -{
> -
> - for (i=0; i<4; i++)
> - atuple->sres[i] = atuple->rand[i] ^ ainfo->a3a8_ki[i];
> - for (i=4; i<12; i++)
> - atuple->kc[i-4] = atuple->rand[i] ^ ainfo->a3a8_ki[i];
> -
> - return 0;
> -}
> -
> -static int
> -_use_comp128_v1(struct gsm_auth_info *ainfo, struct gsm_auth_tuple *atuple)
> -{
> - if (ainfo->a3a8_ki_len != A38_COMP128_KEY_LEN) {
> - LOGP(DMM, LOGL_ERROR, "Invalid COMP128v1 key (len=%d) %s\n",
> - ainfo->a3a8_ki_len,
> - osmo_hexdump(ainfo->a3a8_ki, ainfo->a3a8_ki_len));
> - return -1;
> - }
> -
> - comp128(ainfo->a3a8_ki, atuple->rand, atuple->sres, atuple->kc);
> -
> - return 0;
> -}
> -
> /* Return values
> * -1 -> Internal error
> * 0 -> Not available
> @@ -76,6 +41,11 @@ int auth_get_tuple_for_subscr(struct gsm_auth_tuple
> *atuple,
> {
> struct gsm_auth_info ainfo;
> int i, rc;
> + static struct osmo_sub_auth_data auth = {
> + .type = OSMO_AUTH_TYPE_GSM
> + };
Why is that static?
>
> + memcpy(auth.u.gsm.ki, ainfo.a3a8_ki, sizeof(auth.u.gsm.ki));
> +
> + if (osmo_auth_gen_vec(vec, &auth, atuple->rand) < 0)
> + return -1;
> +
> + memcpy(atuple->sres, vec->sres, 4);
> + memcpy(atuple->kc, vec->kc, 8);
in terms of API, how hard would be an in-situ operation?
