Updated DiameterFW DTLS encryption model and bugfixes

P1sec · Jul 18, 2019 · 8ce8e14 · 8ce8e14
1 parent 9bb17a3
commit 8ce8e14
Show file tree

Hide file tree

Showing 6 changed files with 164 additions and 107 deletions.
diff --git a/sigfw/sigfw.sigfw/diameterfw.json b/sigfw/sigfw.sigfw/diameterfw.json
@@ -54,6 +54,7 @@
 				],
 				"application_id_whitelist": [
 					"0",
+					"11111111",
 					"16777251"
 				],
 				"command_code_blacklist": [

diff --git a/sigfw/sigfw.sigfw/diameterfw_1.json b/sigfw/sigfw.sigfw/diameterfw_1.json
@@ -51,6 +51,7 @@
 				],
 				"application_id_whitelist": [
 					"0",
+					"11111111",
 					"16777251"
 				],
 				"command_code_blacklist": [

diff --git a/sigfw/sigfw.sigfw/diameterfw_2.json b/sigfw/sigfw.sigfw/diameterfw_2.json
@@ -51,6 +51,7 @@
 				],
 				"application_id_whitelist": [
 					"0",
+					"11111111",
 					"16777251"
 				],
 				"command_code_blacklist": [

diff --git a/sigfw/sigfw.sigfw/src/main/java/diameterfw/DiameterClient.java b/sigfw/sigfw.sigfw/src/main/java/diameterfw/DiameterClient.java
@@ -276,7 +276,7 @@ private void sendNextRequest(int enumType) throws InternalException, IllegalDiam
             requestAvps.removeAvp(293);
 
             // example how to add AVP IMSI
-            byte[] b = hexStringToByteArray("31313131313131313131313131313131");
+            byte[] b = hexStringToByteArray("313131303131313131313131313131");
             requestAvps.addAvp(1, b, true, false);
 
             // example how to add grouped AVP
@@ -286,10 +286,10 @@ private void sendNextRequest(int enumType) throws InternalException, IllegalDiam
 
             // code , value , vendor, mandatory,protected,isUnsigned32
             // (Enumerated)
-            Avp exchangeType = requestAvps.addAvp(exchangeTypeCode, (long) enumType, vendorID, true, false, true);
+            //Avp exchangeType = requestAvps.addAvp(exchangeTypeCode, (long) enumType, vendorID, true, false, true);
 
             // code , value , vendor, mandatory,protected, isOctetString
-            Avp exchengeData = requestAvps.addAvp(exchangeDataCode, TO_SEND[(toSendIndex++)%(TO_SEND.length)], vendorID, true, false, false);
+            //Avp exchengeData = requestAvps.addAvp(exchangeDataCode, TO_SEND[(toSendIndex++)%(TO_SEND.length)], vendorID, true, false, false);
 
             // creation
             // send