Loading javasrc/adapter/org/etsi/its/adapter/Management.java +8 −2 Changes for javasrc/adapter/org/etsi/its/adapter/Management.java: 8 added lines, 2 removed lines. Original line number Diff line number Diff line Loading @@ -68,7 +68,8 @@ public class Management implements IManagementTA, IManagementLayers { /** * Enforce secured mode status */ private static final String TsEnforceSecuredMode = ((CharstringValue)TERFactory.getInstance().getTaParameter("TsEnforceSecuredMode")).getString(); //private static String TsEnforceSecuredMode = ((CharstringValue)TERFactory.getInstance().getTaParameter("TsEnforceSecuredMode")).getString(); private static String TsEnforceSecuredMode = "false"; /** * Secured root path to access certificates & private keys Loading Loading @@ -354,7 +355,12 @@ public class Management implements IManagementTA, IManagementLayers { @Override public void setSecuredMode(final byte[] securityData) { certificateId = ByteHelper.byteArrayWithLengthToString(ByteHelper.concat(ByteHelper.intToByteArray(securityData.length, 4), securityData)); certificateId = ByteHelper.byteArrayWithLengthToString(ByteHelper.concat(ByteHelper.intToByteArray(securityData.length - 1, 4), securityData)); if (securityData[securityData.length - 1] == 0x01) { TsEnforceSecuredMode = "true"; } else { TsEnforceSecuredMode = "false"; } setupSecuredMode(); } Loading javasrc/adapter/org/etsi/its/adapter/SecurityHelper.java +117 −110 File changed.Preview size limit exceeded, changes collapsed. Show changes javasrc/adapter/org/etsi/its/adapter/layers/GnLayer.java +9 −1 Changes for javasrc/adapter/org/etsi/its/adapter/layers/GnLayer.java: 9 added lines, 1 removed line. Original line number Diff line number Diff line Loading @@ -421,7 +421,15 @@ public class GnLayer extends Layer implements Runnable, IEthernetSpecific { // Other messages if(payloadLength > 0) { byte[] mpayload = new byte[payloadLength]; System.arraycopy(payload, commonHdr.length + 44/*Topology-Scoped Broadcast*/, mpayload, 0, payloadLength); int extendedHeader = 0; if (headerType == 1) { // Beacon extendedHeader = 24; } else if (headerType == 4) { // Geo Broadcast extendedHeader = 44; } else if (headerType == 5) { // Topology-Scoped Broadcast extendedHeader = 28; } // TODO To be continued System.arraycopy(payload, commonHdr.length + extendedHeader, mpayload, 0, payloadLength); //TERFactory.getInstance().logDebug("GnLayer.receive: Message =" + ByteHelper.byteArrayToString(mpayload)); lowerInfo.put(GN_NEXTHEADER, nextHeader); lowerInfo.put(GN_TYPE, headerType); Loading javasrc/adapter/org/etsi/its/adapter/ports/CamPort.java +1 −1 Changes for javasrc/adapter/org/etsi/its/adapter/ports/CamPort.java: 1 added line, 1 removed line. Original line number Diff line number Diff line Loading @@ -58,7 +58,7 @@ public class CamPort extends ProtocolPort { ); // Add security info to pass to the ATS if (lowerInfo.get(SecurityHelper.SEC_SSP) == null) { byte[] buf = new byte[16]; byte[] buf = new byte[32]; msgInd = ByteHelper.concat(msgInd, buf); } else { msgInd = ByteHelper.concat(msgInd, (byte[])lowerInfo.get(SecurityHelper.SEC_SSP)); Loading javasrc/adapter/org/etsi/its/adapter/ports/DenmPort.java +1 −1 Changes for javasrc/adapter/org/etsi/its/adapter/ports/DenmPort.java: 1 added line, 1 removed line. Original line number Diff line number Diff line Loading @@ -58,7 +58,7 @@ public class DenmPort extends ProtocolPort { ); // Add security info to pass to the ATS if (lowerInfo.get(SecurityHelper.SEC_SSP) == null) { byte[] buf = new byte[16]; byte[] buf = new byte[32]; msgInd = ByteHelper.concat(msgInd, buf); } else { msgInd = ByteHelper.concat(msgInd, (byte[])lowerInfo.get(SecurityHelper.SEC_SSP)); Loading Loading
javasrc/adapter/org/etsi/its/adapter/Management.java +8 −2 Changes for javasrc/adapter/org/etsi/its/adapter/Management.java: 8 added lines, 2 removed lines. Original line number Diff line number Diff line Loading @@ -68,7 +68,8 @@ public class Management implements IManagementTA, IManagementLayers { /** * Enforce secured mode status */ private static final String TsEnforceSecuredMode = ((CharstringValue)TERFactory.getInstance().getTaParameter("TsEnforceSecuredMode")).getString(); //private static String TsEnforceSecuredMode = ((CharstringValue)TERFactory.getInstance().getTaParameter("TsEnforceSecuredMode")).getString(); private static String TsEnforceSecuredMode = "false"; /** * Secured root path to access certificates & private keys Loading Loading @@ -354,7 +355,12 @@ public class Management implements IManagementTA, IManagementLayers { @Override public void setSecuredMode(final byte[] securityData) { certificateId = ByteHelper.byteArrayWithLengthToString(ByteHelper.concat(ByteHelper.intToByteArray(securityData.length, 4), securityData)); certificateId = ByteHelper.byteArrayWithLengthToString(ByteHelper.concat(ByteHelper.intToByteArray(securityData.length - 1, 4), securityData)); if (securityData[securityData.length - 1] == 0x01) { TsEnforceSecuredMode = "true"; } else { TsEnforceSecuredMode = "false"; } setupSecuredMode(); } Loading
javasrc/adapter/org/etsi/its/adapter/SecurityHelper.java +117 −110 File changed.Preview size limit exceeded, changes collapsed. Show changes
javasrc/adapter/org/etsi/its/adapter/layers/GnLayer.java +9 −1 Changes for javasrc/adapter/org/etsi/its/adapter/layers/GnLayer.java: 9 added lines, 1 removed line. Original line number Diff line number Diff line Loading @@ -421,7 +421,15 @@ public class GnLayer extends Layer implements Runnable, IEthernetSpecific { // Other messages if(payloadLength > 0) { byte[] mpayload = new byte[payloadLength]; System.arraycopy(payload, commonHdr.length + 44/*Topology-Scoped Broadcast*/, mpayload, 0, payloadLength); int extendedHeader = 0; if (headerType == 1) { // Beacon extendedHeader = 24; } else if (headerType == 4) { // Geo Broadcast extendedHeader = 44; } else if (headerType == 5) { // Topology-Scoped Broadcast extendedHeader = 28; } // TODO To be continued System.arraycopy(payload, commonHdr.length + extendedHeader, mpayload, 0, payloadLength); //TERFactory.getInstance().logDebug("GnLayer.receive: Message =" + ByteHelper.byteArrayToString(mpayload)); lowerInfo.put(GN_NEXTHEADER, nextHeader); lowerInfo.put(GN_TYPE, headerType); Loading
javasrc/adapter/org/etsi/its/adapter/ports/CamPort.java +1 −1 Changes for javasrc/adapter/org/etsi/its/adapter/ports/CamPort.java: 1 added line, 1 removed line. Original line number Diff line number Diff line Loading @@ -58,7 +58,7 @@ public class CamPort extends ProtocolPort { ); // Add security info to pass to the ATS if (lowerInfo.get(SecurityHelper.SEC_SSP) == null) { byte[] buf = new byte[16]; byte[] buf = new byte[32]; msgInd = ByteHelper.concat(msgInd, buf); } else { msgInd = ByteHelper.concat(msgInd, (byte[])lowerInfo.get(SecurityHelper.SEC_SSP)); Loading
javasrc/adapter/org/etsi/its/adapter/ports/DenmPort.java +1 −1 Changes for javasrc/adapter/org/etsi/its/adapter/ports/DenmPort.java: 1 added line, 1 removed line. Original line number Diff line number Diff line Loading @@ -58,7 +58,7 @@ public class DenmPort extends ProtocolPort { ); // Add security info to pass to the ATS if (lowerInfo.get(SecurityHelper.SEC_SSP) == null) { byte[] buf = new byte[16]; byte[] buf = new byte[32]; msgInd = ByteHelper.concat(msgInd, buf); } else { msgInd = ByteHelper.concat(msgInd, (byte[])lowerInfo.get(SecurityHelper.SEC_SSP)); Loading