bts: ciphering tests
Change-Id: If450e36cfd8cde713f304e57ec09bc1239bdf7ea
diff --git a/bsc/MSC_ConnectionHandler.ttcn b/bsc/MSC_ConnectionHandler.ttcn
index e648427..efd68a3 100644
--- a/bsc/MSC_ConnectionHandler.ttcn
+++ b/bsc/MSC_ConnectionHandler.ttcn
@@ -395,42 +395,42 @@
}
/* Convert the chipher representation on BSSMAP to the representation used on RSL */
-function f_chipher_mode_bssmap_to_rsl(OCT1 alg_bssmap) return OCT1
+function f_chipher_mode_bssmap_to_rsl(OCT1 alg_bssmap) return RSL_AlgId
{
/* A5 0 */
if (alg_bssmap == '01'O) {
- return '01'O;
+ return RSL_ALG_ID_A5_0;
}
/* A5 1 */
else if (alg_bssmap == '02'O) {
- return '02'O;
+ return RSL_ALG_ID_A5_1;
}
/* A5 2 */
else if (alg_bssmap == '04'O) {
- return '03'O;
+ return RSL_ALG_ID_A5_2;
}
/* A5 3 */
else if (alg_bssmap == '08'O) {
- return '04'O;
+ return RSL_ALG_ID_A5_3;
}
/* A5 4 */
else if (alg_bssmap == '10'O) {
- return '05'O;
+ return RSL_ALG_ID_A5_4;
}
/* A5 5 */
else if (alg_bssmap == '20'O) {
- return '06'O;
+ return RSL_ALG_ID_A5_5;
}
/* A5 6 */
else if (alg_bssmap == '40'O) {
- return '07'O;
+ return RSL_ALG_ID_A5_6;
}
/* A5 7 */
else if (alg_bssmap == '80'O) {
- return '08'O;
+ return RSL_ALG_ID_A5_7;
} else {
setverdict(fail, "Unexpected Encryption Algorithm");
- return '00'O;
+ return RSL_ALG_ID_A5_0;
}
}
@@ -438,7 +438,7 @@
runs on MSC_ConnHdlr {
var PDU_BSSAP bssap;
var RSL_Message rsl;
- var OCT1 alg_rsl;
+ var RSL_AlgId alg_rsl;
if (isvalue(kc128)) {
BSSAP.send(ts_BSSMAP_CipherModeCmdKc128(alg, key, valueof(kc128)));