osmocom
/
libosmocore
mirror of https://gerrit.osmocom.org/libosmocore
11
0
Fork 0
Code Issues Releases Wiki Activity

Deprecate comp128 

Mark function as deprecated to discourage its usage: people should use
generic API in osmocom/crypt/auth.h
This commit is contained in:
Max 2016-04-21 17:12:40 +02:00 committed by Harald Welte
parent fdb3d8ce78
commit 1f9d8183be
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/osmocom/gsm/comp128.h
View File

@ -8,11 +8,15 @@
#include <stdint.h> #include <stdint.h>
#include <osmocom/core/defs.h>
/* /*
* Performs the COMP128 algorithm (used as A3/A8) * Performs the COMP128v1 algorithm (used as A3/A8)
* ki : uint8_t [16] * ki : uint8_t [16]
* srand : uint8_t [16] * srand : uint8_t [16]
* sres : uint8_t [4] * sres : uint8_t [4]
* kc : uint8_t [8] * kc : uint8_t [8]
*/ */
void comp128(const uint8_t *ki, const uint8_t *srand, uint8_t *sres, uint8_t *kc); void comp128v1(const uint8_t *ki, const uint8_t *srand, uint8_t *sres, uint8_t *kc);
void comp128(const uint8_t *ki, const uint8_t *srand, uint8_t *sres, uint8_t *kc) OSMO_DEPRECATED("Use generic API from osmocom/crypt/auth.h instead");

2
src/gsm/auth_comp128v1.c
View File

@ -28,7 +28,7 @@ static int c128v1_gen_vec(struct osmo_auth_vector *vec,
struct osmo_sub_auth_data *aud, struct osmo_sub_auth_data *aud,
const uint8_t *_rand) const uint8_t *_rand)
{ {
comp128(aud->u.gsm.ki, _rand, vec->sres, vec->kc); comp128v1(aud->u.gsm.ki, _rand, vec->sres, vec->kc);
vec->auth_types = OSMO_AUTH_TYPE_GSM; vec->auth_types = OSMO_AUTH_TYPE_GSM;
return 0; return 0;

7
src/gsm/comp128.c
View File

@ -185,7 +185,7 @@ _comp128_permutation(uint8_t *x, uint8_t *bits)
} }
void void
comp128(const uint8_t *ki, const uint8_t *rand, uint8_t *sres, uint8_t *kc) comp128v1(const uint8_t *ki, const uint8_t *rand, uint8_t *sres, uint8_t *kc)
{ {
int i; int i;
uint8_t x[32], bits[128]; uint8_t x[32], bits[128];
@ -228,3 +228,8 @@ comp128(const uint8_t *ki, const uint8_t *rand, uint8_t *sres, uint8_t *kc)
kc[7] = 0; kc[7] = 0;
} }
void
comp128(const uint8_t *ki, const uint8_t *rand, uint8_t *sres, uint8_t *kc)
{
comp128v1(ki, rand, sres, kc);
}