Bug fixed in ItsAid encoding

javasrc/adapter/org/etsi/its/adapter/ports/GnPort.java

@@ -105,7 +105,7 @@ public class GnPort extends ProtocolPort implements Runnable, IEthernetSpecific
                     byte[] securedBeaconHeader = buildSecuredBeacon(beaconHeader, tst, currentTime, false); 
 //                    triggerTime = currentTime;
                     // Send the secured beacon
-                    //System.out.println("GnPort: Call send " + ByteHelper.byteArrayToString(securedBeaconHeader));
+                    //TERFactory.getInstance().logDebug("GnPort: Call send " + ByteHelper.byteArrayToString(securedBeaconHeader));
                     send(securedBeaconHeader, params);
                 }
 /*                TODO Uncomment to get secured beacon*/
@@ -182,18 +182,8 @@ public class GnPort extends ProtocolPort implements Runnable, IEthernetSpecific
         byte[] b;
         if (itsAid < 128) {
             b = new byte[] { (byte)itsAid }; 
-        } else if (itsAid < Short.MAX_VALUE) {
-            b = ByteHelper.intToByteArray(itsAid, Short.SIZE / Byte.SIZE);
-            b = ByteHelper.concat(
-                SecurityHelper.getInstance().size2tls(b.length),
-                b
-            );
         } else {
-            b = ByteHelper.intToByteArray(itsAid, Integer.SIZE / Integer.SIZE);
-            b = ByteHelper.concat(
-                SecurityHelper.getInstance().size2tls(b.length),
-                b
-            );
+            b = SecurityHelper.getInstance().size2tls(itsAid);
         }
         headersField = ByteHelper.concat(
             headersField,

javasrc/adapter/org/etsi/its/adapter/ports/UpperTesterPort.java

@@ -589,18 +589,8 @@ public class UpperTesterPort extends AdapterPort implements IPort, IObservable {
         byte[] b;
         if (itsAid < 128) {
             b = new byte[] { (byte)itsAid }; 
-        } else if (itsAid < Short.MAX_VALUE) {
-            b = ByteHelper.intToByteArray(itsAid, Short.SIZE / Byte.SIZE);
-            b = ByteHelper.concat(
-                SecurityHelper.getInstance().size2tls(b.length),
-                b
-            );
         } else {
-            b = ByteHelper.intToByteArray(itsAid, Integer.SIZE / Integer.SIZE);
-            b = ByteHelper.concat(
-                SecurityHelper.getInstance().size2tls(b.length),
-                b
-            );
+            b = SecurityHelper.getInstance().size2tls(itsAid);
         }
         headersField = ByteHelper.concat(
             headersField,