2 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the submitted one.


gmm: Rename s/ciph_auth/auth_ciph/

The procedure is called "Authentication and ciphering", not the other
way around.

Change-Id: I02c7edede8db8dbe94e129529ad8fb03fe1b4089
---
M include/osmocom/gprs/gmm/gmm_pdu.h
M include/osmocom/gprs/gmm/gmm_private.h
M src/gmm/gmm.c
M src/gmm/gmm_pdu.c
M src/gmm/gmm_prim.c
5 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/include/osmocom/gprs/gmm/gmm_pdu.h b/include/osmocom/gprs/gmm/gmm_pdu.h
index 249c94f..18a181c 100644
--- a/include/osmocom/gprs/gmm/gmm_pdu.h
+++ b/include/osmocom/gprs/gmm/gmm_pdu.h
@@ -31,7 +31,7 @@
 				 uint8_t mi_type,
 				 struct msgb *msg);
 
-int gprs_gmm_build_ciph_auth_resp(const struct gprs_gmm_entity *gmme,
+int gprs_gmm_build_auth_ciph_resp(const struct gprs_gmm_entity *gmme,
 				  const uint8_t *sres, struct msgb *msg);
 
 int gprs_gmm_build_detach_req(struct gprs_gmm_entity *gmme,
diff --git a/include/osmocom/gprs/gmm/gmm_private.h b/include/osmocom/gprs/gmm/gmm_private.h
index 48068d9..ac64ea1 100644
--- a/include/osmocom/gprs/gmm/gmm_private.h
+++ b/include/osmocom/gprs/gmm/gmm_private.h
@@ -131,7 +131,7 @@
 			   enum osmo_gprs_gmm_detach_ms_type detach_type,
 			   enum osmo_gprs_gmm_detach_poweroff_type poweroff_type);
 int gprs_gmm_tx_rau_req(struct gprs_gmm_entity *gmme, enum gprs_gmm_upd_type rau_type);
-int gprs_gmm_tx_ciph_auth_resp(const struct gprs_gmm_entity *gmme, const uint8_t *sres);
+int gprs_gmm_tx_auth_ciph_resp(const struct gprs_gmm_entity *gmme, const uint8_t *sres);
 
 int gprs_gmm_submit_gmmreg_attach_cnf(struct gprs_gmm_entity *gmme, bool accepted, uint8_t cause);
 int gprs_gmm_submit_gmmsm_establish_cnf(struct gprs_gmm_entity *gmme, bool accepted, uint8_t cause);
diff --git a/src/gmm/gmm.c b/src/gmm/gmm.c
index a99fe57..55b5d66 100644
--- a/src/gmm/gmm.c
+++ b/src/gmm/gmm.c
@@ -537,7 +537,7 @@
 
 /* Tx GMM Authentication and ciphering response, 9.4.10
  * sres can be NULL if no authentication was requested. */
-int gprs_gmm_tx_ciph_auth_resp(const struct gprs_gmm_entity *gmme, const uint8_t *sres)
+int gprs_gmm_tx_auth_ciph_resp(const struct gprs_gmm_entity *gmme, const uint8_t *sres)
 {
 	struct osmo_gprs_llc_prim *llc_prim;
 	int rc;
@@ -549,7 +549,7 @@
 			gmme->tlli, OSMO_GPRS_LLC_SAPI_GMM, NULL, GPRS_GMM_ALLOC_SIZE);
 	msg = llc_prim->oph.msg;
 	msg->l3h = msg->tail;
-	rc = gprs_gmm_build_ciph_auth_resp(gmme, sres, msg);
+	rc = gprs_gmm_build_auth_ciph_resp(gmme, sres, msg);
 	if (rc < 0) {
 		msgb_free(msg);
 		return -EBADMSG;
@@ -1216,7 +1216,7 @@
 			gmme->auth_ciph.req.ac_ref_nr = 0xff;
 			return rc;
 		}
-		rc = gprs_gmm_tx_ciph_auth_resp(gmme, NULL);
+		rc = gprs_gmm_tx_auth_ciph_resp(gmme, NULL);
 		/* invalidate active reference: */
 		gmme->auth_ciph.req.ac_ref_nr = 0xff;
 	}
diff --git a/src/gmm/gmm_pdu.c b/src/gmm/gmm_pdu.c
index d213e70..5ff7a20 100644
--- a/src/gmm/gmm_pdu.c
+++ b/src/gmm/gmm_pdu.c
@@ -413,7 +413,7 @@
 }
 
 /* Tx GMM Authentication and ciphering response, 9.4.10 */
-int gprs_gmm_build_ciph_auth_resp(const struct gprs_gmm_entity *gmme, const uint8_t *sres, struct msgb *msg)
+int gprs_gmm_build_auth_ciph_resp(const struct gprs_gmm_entity *gmme, const uint8_t *sres, struct msgb *msg)
 {
 	struct gsm48_hdr *gh;
 	struct gsm48_auth_ciph_resp *acr;
diff --git a/src/gmm/gmm_prim.c b/src/gmm/gmm_prim.c
index b6d8dac..bea8341 100644
--- a/src/gmm/gmm_prim.c
+++ b/src/gmm/gmm_prim.c
@@ -453,7 +453,7 @@
 		return rc;
 	}
 
-	rc = gprs_gmm_tx_ciph_auth_resp(gmme, gmm_prim->gmmreg.sim_auth_rsp.sres);
+	rc = gprs_gmm_tx_auth_ciph_resp(gmme, gmm_prim->gmmreg.sim_auth_rsp.sres);
 	/* invalidate active reference: */
 	gmme->auth_ciph.req.ac_ref_nr = 0xff;
 	return rc;

