update fourdot1 and snmp1218 pdu creation

CDOT-CV · Nov 13, 2023 · e1e6e75 · e1e6e75
1 parent 21a55bc
commit e1e6e75
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 3 deletions.
diff --git a/jpo-ode-svcs/src/main/java/us/dot/its/jpo/ode/OdeSvcsApplication.java b/jpo-ode-svcs/src/main/java/us/dot/its/jpo/ode/OdeSvcsApplication.java
@@ -27,6 +27,14 @@
 
 import org.snmp4j.security.AuthMD5;
 import org.snmp4j.security.AuthSHA;
+import org.snmp4j.security.AuthHMAC128SHA224;
+import org.snmp4j.security.AuthHMAC192SHA256;
+import org.snmp4j.security.AuthHMAC256SHA384;
+import org.snmp4j.security.AuthHMAC384SHA512;
+import org.snmp4j.security.PrivAES128;
+import org.snmp4j.security.PrivAES192;
+import org.snmp4j.security.PrivAES256;
+
 import org.snmp4j.security.SecurityProtocols;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.boot.SpringApplication;
@@ -50,7 +58,13 @@ public static void main(String[] args) throws MalformedObjectNameException, Inte
       mbs.registerMBean(mBean, name);
 
       SecurityProtocols.getInstance().addAuthenticationProtocol(new AuthSHA());
+      SecurityProtocols.getInstance().addAuthenticationProtocol(new AuthHMAC128SHA224());
+      SecurityProtocols.getInstance().addAuthenticationProtocol(new AuthHMAC192SHA256());
+      SecurityProtocols.getInstance().addAuthenticationProtocol(new AuthHMAC256SHA384());
+      SecurityProtocols.getInstance().addAuthenticationProtocol(new AuthHMAC384SHA512());
       SecurityProtocols.getInstance().addAuthenticationProtocol(new AuthMD5());
+      SecurityProtocols.getInstance().addPrivacyProtocol(new PrivAES128());
+
    }
 
    @Bean

diff --git a/jpo-ode-svcs/src/main/java/us/dot/its/jpo/ode/snmp/SnmpFourDot1Protocol.java b/jpo-ode-svcs/src/main/java/us/dot/its/jpo/ode/snmp/SnmpFourDot1Protocol.java
@@ -56,14 +56,14 @@ public static VariableBinding getVbRsuSrmTxInterval(int index, int interval) {
     public static VariableBinding getVbRsuSrmDeliveryStart(int index, String deliveryStart) throws ParseException {
         return new VariableBinding(
             new OID(rsu_srm_delivery_start_oid().concat(".").concat(Integer.toString(index))),
-            new OctetString(DatatypeConverter.parseHexBinary(SNMP.snmpTimestampFromIso(deliveryStart)))
+            new OctetString(DatatypeConverter.parseHexBinary(SNMP.fourOneSnmpTimestampFromIso(deliveryStart)))
         );
     }
 
     public static VariableBinding getVbRsuSrmDeliveryStop(int index, String deliveryStop) throws ParseException {
         return new VariableBinding(
             new OID(rsu_srm_delivery_stop_oid().concat(".").concat(Integer.toString(index))),
-            new OctetString(DatatypeConverter.parseHexBinary(SNMP.snmpTimestampFromIso(deliveryStop)))
+            new OctetString(DatatypeConverter.parseHexBinary(SNMP.fourOneSnmpTimestampFromIso(deliveryStop)))
         );
     }
 

diff --git a/jpo-ode-svcs/src/main/java/us/dot/its/jpo/ode/snmp/SnmpNTCIP1218Protocol.java b/jpo-ode-svcs/src/main/java/us/dot/its/jpo/ode/snmp/SnmpNTCIP1218Protocol.java
@@ -86,9 +86,10 @@ public static VariableBinding getVbRsuMsgRepeatPriority(int index) {
     }
 
     public static VariableBinding getVbRsuMsgRepeatOptions(int index) {
+        byte[] val = {(byte) 0xc0};
         return new VariableBinding(
             new OID(rsu_msg_repeat_options_oid().concat(".").concat(Integer.toString(index))),
-            new OctetString("C0")
+            new OctetString(val)
          );
     }