Remove comp128 from public API - use osmocom/crypt/auth.h instead

Submitted by Max on June 1, 2015, 2:35 p.m.

Details

Message ID 1433169356-12908-1-git-send-email-max.suraev@fairwaves.co
State New
Headers show

Commit Message

Max June 1, 2015, 2:35 p.m.
Signed-off-by: Max <max.suraev@fairwaves.co>
---
 TODO-RELEASE                  | 1 +
 include/Makefile.am           | 6 +++---
 include/osmocom/gsm/comp128.h | 4 ++--
 src/gsm/auth_comp128v1.c      | 2 +-
 src/gsm/comp128.c             | 2 +-
 src/gsm/libosmogsm.map        | 1 -
 tests/comp128/comp128_test.c  | 1 -
 7 files changed, 8 insertions(+), 9 deletions(-)

Patch hide | download patch | download mbox

diff --git a/TODO-RELEASE b/TODO-RELEASE
index d03aa49..956b4be 100644
--- a/TODO-RELEASE
+++ b/TODO-RELEASE
@@ -1,2 +1,3 @@ 
 #library	what		description / commit summary line
+libosmogsm	api-change	remove comp128 from public API
 libosmogb	abi-change	bssgp: Fix bssgp_tx_fc_bvc parameter type
diff --git a/include/Makefile.am b/include/Makefile.am
index 52c6a38..b4da54e 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -51,8 +51,6 @@  nobase_include_HEADERS = \
                        osmocom/gsm/a5.h \
                        osmocom/gsm/abis_nm.h \
                        osmocom/gsm/apn.h \
-                       osmocom/gsm/comp128.h \
-                       osmocom/gsm/comp128v23.h \
                        osmocom/gsm/gan.h \
                        osmocom/gsm/gsm0341.h \
                        osmocom/gsm/gsm0411_smc.h \
@@ -121,7 +119,9 @@  endif
 
 noinst_HEADERS = \
 	osmocom/core/timer_compat.h \
-	osmocom/gsm/kasumi.h
+	osmocom/gsm/kasumi.h \
+	osmocom/gsm/comp128.h \
+	osmocom/gsm/comp128v23.h
 
 osmocom/core/bit%gen.h: osmocom/core/bitXXgen.h.tpl
 	$(AM_V_GEN)$(MKDIR_P) $(dir $@)
diff --git a/include/osmocom/gsm/comp128.h b/include/osmocom/gsm/comp128.h
index 33b997a..c45da37 100644
--- a/include/osmocom/gsm/comp128.h
+++ b/include/osmocom/gsm/comp128.h
@@ -9,10 +9,10 @@ 
 #include <stdint.h>
 
 /*
- * Performs the COMP128 algorithm (used as A3/A8)
+ * Performs the COMP128v1 algorithm (used as A3/A8)
  * ki    : uint8_t [16]
  * srand : uint8_t [16]
  * sres  : uint8_t [4]
  * 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);
diff --git a/src/gsm/auth_comp128v1.c b/src/gsm/auth_comp128v1.c
index 41aef71..c40027e 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->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;
 
 	return 0;
diff --git a/src/gsm/comp128.c b/src/gsm/comp128.c
index b7a2382..e36c20d 100644
--- a/src/gsm/comp128.c
+++ b/src/gsm/comp128.c
@@ -185,7 +185,7 @@  _comp128_permutation(uint8_t *x, uint8_t *bits)
 }
 
 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;
 	uint8_t x[32], bits[128];
diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map
index 22428a2..c80c15f 100644
--- a/src/gsm/libosmogsm.map
+++ b/src/gsm/libosmogsm.map
@@ -26,7 +26,6 @@  abis_nm_ipa_magic;
 
 osmo_sitype_strs;
 
-comp128;
 dbm2rxlev;
 
 gprs_cipher_gen_input_i;
diff --git a/tests/comp128/comp128_test.c b/tests/comp128/comp128_test.c
index eb6fb12..d6a6401 100644
--- a/tests/comp128/comp128_test.c
+++ b/tests/comp128/comp128_test.c
@@ -6,7 +6,6 @@ 
 
 #include <osmocom/core/bits.h>
 #include <osmocom/core/utils.h>
-#include <osmocom/gsm/comp128v23.h>
 #include <osmocom/crypt/auth.h>
 
 static struct osmo_sub_auth_data test_aux2 = {