[MERGED] osmo-msc[master]: remove dead code in auth.h / auth.c

historical

Harald Welte has submitted this change and it was merged.

Change subject: remove dead code in auth.h / auth.c
......................................................................


remove dead code in auth.h / auth.c

Change-Id: I57e3b79a95a35c4783dc3775a88d15f13cbec13e
Related: OS#2528
---
M include/osmocom/msc/Makefile.am
D include/osmocom/msc/auth.h
M src/libmsc/Makefile.am
D src/libmsc/auth.c
M src/libmsc/gsm_04_08.c
5 files changed, 0 insertions(+), 65 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified

diff --git a/include/osmocom/msc/Makefile.am b/include/osmocom/msc/Makefile.am
index 0adc746..9c82d2f 100644
--- a/include/osmocom/msc/Makefile.am
+++ b/include/osmocom/msc/Makefile.am
@@ -1,7 +1,6 @@
 noinst_HEADERS = \
 	a_iface.h \
 	a_iface_bssap.h \
-	auth.h \
 	bsc_api.h \
 	bsc_msc.h \
 	bsc_rll.h \
diff --git a/include/osmocom/msc/auth.h b/include/osmocom/msc/auth.h
deleted file mode 100644
index b314bbf..0000000
--- a/include/osmocom/msc/auth.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#ifndef _AUTH_H
-#define _AUTH_H
-
-#include <osmocom/core/utils.h>
-
-struct gsm_auth_tuple;
-
-enum auth_action {
-	AUTH_ERROR		= -1,	/* Internal error */
-	AUTH_NOT_AVAIL		= 0,	/* No auth tuple available */
-	AUTH_DO_AUTH_THEN_CIPH	= 1,	/* Firsth authenticate, then cipher */
-	AUTH_DO_CIPH		= 2,	/* Only ciphering */
-	AUTH_DO_AUTH		= 3,	/* Only authentication, no ciphering */
-};
-
-extern const struct value_string auth_action_names[];
-static inline const char *auth_action_str(enum auth_action a)
-{
-	return get_value_string(auth_action_names, a);
-}
-
-#endif /* _AUTH_H */
diff --git a/src/libmsc/Makefile.am b/src/libmsc/Makefile.am
index 6449948..8ae0e18 100644
--- a/src/libmsc/Makefile.am
+++ b/src/libmsc/Makefile.am
@@ -28,7 +28,6 @@
 libmsc_a_SOURCES = \
 	a_iface.c \
 	a_iface_bssap.c \
-	auth.c \
 	msc_vty.c \
 	db.c \
 	gsm_04_08.c \
diff --git a/src/libmsc/auth.c b/src/libmsc/auth.c
deleted file mode 100644
index 7c78c6e..0000000
--- a/src/libmsc/auth.c
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Authentication related functions */
-
-/*
- * (C) 2010 by Sylvain Munaut <tnt at 246tNt.com>
- *
- * All Rights Reserved
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#include <osmocom/msc/db.h>
-#include <osmocom/msc/debug.h>
-#include <osmocom/msc/auth.h>
-#include <osmocom/msc/gsm_data.h>
-
-#include <osmocom/gsm/comp128.h>
-#include <osmocom/core/utils.h>
-
-#include <stdlib.h>
-
-const struct value_string auth_action_names[] = {
-	OSMO_VALUE_STRING(AUTH_ERROR),
-	OSMO_VALUE_STRING(AUTH_NOT_AVAIL),
-	OSMO_VALUE_STRING(AUTH_DO_AUTH_THEN_CIPH),
-	OSMO_VALUE_STRING(AUTH_DO_CIPH),
-	OSMO_VALUE_STRING(AUTH_DO_AUTH),
-	{ 0, NULL }
-};
diff --git a/src/libmsc/gsm_04_08.c b/src/libmsc/gsm_04_08.c
index 7afd0c7..126a216 100644
--- a/src/libmsc/gsm_04_08.c
+++ b/src/libmsc/gsm_04_08.c
@@ -34,7 +34,6 @@
 
 #include "bscconfig.h"
 
-#include <osmocom/msc/auth.h>
 #include <osmocom/msc/db.h>
 #include <osmocom/msc/debug.h>
 #include <osmocom/msc/gsm_data.h>

-- 
To view, visit https://gerrit.osmocom.org/6055
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I57e3b79a95a35c4783dc3775a88d15f13cbec13e
Gerrit-PatchSet: 1
Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-Owner: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder

