Commit 5d079920 authored by garciay's avatar garciay

Upgrade Certificate from H:\STF517

Validate RSUsimulator against AtsSremSsem in non secured mode
parent d04ca2d5
...@@ -5,12 +5,17 @@ reuse=yes ...@@ -5,12 +5,17 @@ reuse=yes
format=hex format=hex
# Reference time point. The begining of the current year is used by default # Reference time point. The begining of the current year is used by default
#reftime=2015-01-01 #reftime=2016-01-01
# location of the IUT position # location of the IUT position
reflocation=51.4744200:5.6240500 reflocation= 43.552545:10.300891
# custom AID to be used to test GenericMessageProfile # custom AID to be used to test GenericMessageProfile
macro=CAM:36 macro=CAM:36
macro=DENM:37 macro=DENM:37
macro=GENERIC:39 macro=GENERIC:38
# local region: Italy
macro=RGN_LOCAL:380
# Other region: France
macro=RGN_OTHER:250
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<validity> <validity>
<restriction type="time" start="+0d" end="+365d"/> <restriction type="time" start="+0d" end="+365d"/>
<restriction type="region"> <restriction type="region">
<id dictionary="iso_3166_1" id="528" local="0"/> <!-- NL --> <id dictionary="iso_3166_1" id="RGN_LOCAL" local="0"/> <!-- Local region -->
</restriction> </restriction>
</validity> </validity>
<signature algorithm="0"/> <signature algorithm="0"/>
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
<validity> <validity>
<restriction type="time" start="+0d" end="+365d"/> <restriction type="time" start="+0d" end="+365d"/>
<restriction type="region"> <restriction type="region">
<id dictionary="iso_3166_1" id="250" local="0"/> <!-- France --> <id dictionary="iso_3166_1" id="RGN_LOCAL" local="0"/> <!-- Local region -->
</restriction> </restriction>
</validity> </validity>
<signature algorithm="0"/> <signature algorithm="0"/>
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
<validity> <validity>
<restriction type="time" start="+0d" end="+365d"/> <restriction type="time" start="+0d" end="+365d"/>
<restriction type="region"> <restriction type="region">
<id dictionary="iso_3166_1" id="250" local="1"/> <!-- France --> <id dictionary="iso_3166_1" id="RGN_LOCAL" local="1"/> <!-- Local Region -->
</restriction> </restriction>
</validity> </validity>
<signature algorithm="0"/> <signature algorithm="0"/>
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
<validity> <validity>
<restriction type="time" start="+0d" end="+365d"/> <restriction type="time" start="+0d" end="+365d"/>
<restriction type="region"> <restriction type="region">
<id dictionary="iso_3166_1" id="250" local="1"/> <!-- France --> <id dictionary="iso_3166_1" id="RGN_LOCAL" local="1"/> <!-- Local Region -->
</restriction> </restriction>
</validity> </validity>
<signature algorithm="0"/> <signature algorithm="0"/>
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<validity> <validity>
<restriction type="time" start="+0d" end="+365d"/> <restriction type="time" start="+0d" end="+365d"/>
<restriction type="region"> <restriction type="region">
<id dictionary="iso_3166_1" id="250" local="1"/> <!-- France --> <id dictionary="iso_3166_1" id="RGN_LOCAL" local="1"/> <!-- Local region -->
</restriction> </restriction>
</validity> </validity>
<signature algorithm="0"/> <signature algorithm="0"/>
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<validity> <validity>
<restriction type="time" start="+0d" end="+365d"/> <restriction type="time" start="+0d" end="+365d"/>
<restriction type="region"> <restriction type="region">
<id dictionary="iso_3166_1" id="250" local="1"/> <!-- France --> <id dictionary="iso_3166_1" id="RGN_LOCAL" local="1"/> <!-- Local Region -->
</restriction> </restriction>
</validity> </validity>
<signature algorithm="0"/> <signature algorithm="0"/>
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
<validity> <validity>
<restriction type="time" start="+0d" end="+365d"/> <restriction type="time" start="+0d" end="+365d"/>
<restriction type="region"> <restriction type="region">
<id dictionary="un_stats" id="250" local="0"/> <!-- France --> <id dictionary="un_stats" id="RGN_LOCAL" local="0"/> <!-- Local Region -->
</restriction> </restriction>
</validity> </validity>
<signature algorithm="0"/> <signature algorithm="0"/>
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
<validity> <validity>
<restriction type="time" start="-365d" end="+365d"/> <restriction type="time" start="-365d" end="+365d"/>
<restriction type="region"> <restriction type="region">
<id dictionary="iso_3166_1" id="250" local="1"/> <!-- France --> <id dictionary="iso_3166_1" id="RGN_LOCAL" local="1"/> <!-- Local Region -->
</restriction> </restriction>
</validity> </validity>
<signature algorithm="0"/> <signature algorithm="0"/>
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
<validity> <validity>
<restriction type="time" start="+0d" end="+365d"/> <restriction type="time" start="+0d" end="+365d"/>
<restriction type="region"> <restriction type="region">
<id dictionary="iso_3166_1" id="250" local="2"/> <!-- France --> <id dictionary="iso_3166_1" id="RGN_OTHER" local="2"/> <!-- Other Region -->
</restriction> </restriction>
</validity> </validity>
<signature algorithm="0"/> <signature algorithm="0"/>
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
<validity> <validity>
<restriction type="time" start="+0d" end="+365d"/> <restriction type="time" start="+0d" end="+365d"/>
<restriction type="region"> <restriction type="region">
<id dictionary="iso_3166_1" id="56" local="0"/> <!-- Belgium --> <id dictionary="iso_3166_1" id="RGN_OTHER" local="0"/> <!-- Other Region -->
</restriction> </restriction>
</validity> </validity>
<signature algorithm="0"/> <signature algorithm="0"/>
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
<validity> <validity>
<restriction type="time" start="+0d" end="+365d"/> <restriction type="time" start="+0d" end="+365d"/>
<restriction type="region"> <restriction type="region">
<id dictionary="iso_3166_1" id="250" local="0"/> <!-- France --> <id dictionary="iso_3166_1" id="RGN_LOCAL" local="0"/> <!-- Local Region -->
</restriction> </restriction>
</validity> </validity>
<signature algorithm="0"/> <signature algorithm="0"/>
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
<validity> <validity>
<restriction type="time" start="+0d" end="+365d"/> <restriction type="time" start="+0d" end="+365d"/>
<restriction type="region"> <restriction type="region">
<id dictionary="iso_3166_1" id="528" local="1"/> <!-- NL --> <id dictionary="iso_3166_1" id="RGN_LOCAL" local="1"/> <!-- Local Region -->
</restriction> </restriction>
</validity> </validity>
<signature algorithm="0"/> <signature algorithm="0"/>
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
<validity> <validity>
<restriction type="time" start="+0d" end="+365d"/> <restriction type="time" start="+0d" end="+365d"/>
<restriction type="region"> <restriction type="region">
<id dictionary="iso_3166_1" id="528" local="0"/> <!-- NL --> <id dictionary="iso_3166_1" id="RGN_LOCAL" local="0"/> <!-- Local Region -->
</restriction> </restriction>
</validity> </validity>
<signature algorithm="0"/> <signature algorithm="0"/>
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
<validity> <validity>
<restriction type="time" start="+0d" end="+365d"/> <restriction type="time" start="+0d" end="+365d"/>
<restriction type="region"> <restriction type="region">
<id dictionary="iso_3166_1" id="528" local="0"/> <!-- NL --> <id dictionary="iso_3166_1" id="RGN_LOCAL" local="0"/> <!-- Local Region -->
</restriction> </restriction>
</validity> </validity>
<signature algorithm="0"/> <signature algorithm="0"/>
......
<!-- Authorization ticket certificate with a polygonal region restriction <!-- Authorization ticket certificate with a identified region restriction
Center: 10km to the west from base point
Side length: 10km
--> -->
<certificate name="CERT_TS_MSG_13_06_BO_AT"> <certificate name="CERT_TS_MSG_13_06_BO_AT">
<version>2</version> <version>2</version>
...@@ -26,7 +24,7 @@ ...@@ -26,7 +24,7 @@
<validity> <validity>
<restriction type="time" start="+0d" end="+365d"/> <restriction type="time" start="+0d" end="+365d"/>
<restriction type="region"> <restriction type="region">
<id dictionary="iso_3166_1" id="56" local="0"/> <!-- Belgium --> <id dictionary="iso_3166_1" id="RGN_OTHER" local="0"/> <!-- Other Region -->
</restriction> </restriction>
</validity> </validity>
<signature algorithm="0"/> <signature algorithm="0"/>
......
outdir=../certificates outdir=../certificates
config=../gencerts.cfg
installdir=C:\Users\filatov\Documents\Dropbox\Yann\certificates\PLU installdir=C:\Users\filatov\Documents\Dropbox\Yann\certificates\PLU
distzip=$(outdir)/plu_ts_certificates.zip distzip=$(outdir)/plu_ts_certificates.zip
...@@ -8,9 +9,9 @@ distzip=$(outdir)/plu_ts_certificates.zip ...@@ -8,9 +9,9 @@ distzip=$(outdir)/plu_ts_certificates.zip
depdir=.deps depdir=.deps
keydir=$(outdir) keydir=$(outdir)
GENOPTS := -C config.cfg GENOPTS := -C "$(config)"
itscertgen="../../itscertgen.exe"
itscertgen="../itscertgen.exe"
profiles := $(wildcard CERT_*.xml) profiles := $(wildcard CERT_*.xml)
profiles_iut_at := $(wildcard CERT_IUT_*AT.xml) profiles_iut_at := $(wildcard CERT_IUT_*AT.xml)
profiles_other := $(filter-out $(profiles_iut_at), $(profiles)) profiles_other := $(filter-out $(profiles_iut_at), $(profiles))
......
...@@ -416,7 +416,6 @@ module ItsRSUsSimulator_Functions { ...@@ -416,7 +416,6 @@ module ItsRSUsSimulator_Functions {
if (ispresent(p_geoNetworkingPdu.gnPacket.packet.payload.decodedPayload.btpPacket.payload.decodedPayload)) { if (ispresent(p_geoNetworkingPdu.gnPacket.packet.payload.decodedPayload.btpPacket.payload.decodedPayload)) {
if (ischosen(p_geoNetworkingPdu.gnPacket.packet.payload.decodedPayload.btpPacket.payload.decodedPayload.sremPacket)) { if (ischosen(p_geoNetworkingPdu.gnPacket.packet.payload.decodedPayload.btpPacket.payload.decodedPayload.sremPacket)) {
var SignalRequestMessage v_signalRequestMessage := p_geoNetworkingPdu.gnPacket.packet.payload.decodedPayload.btpPacket.payload.decodedPayload.sremPacket.srm; var SignalRequestMessage v_signalRequestMessage := p_geoNetworkingPdu.gnPacket.packet.payload.decodedPayload.btpPacket.payload.decodedPayload.sremPacket.srm;
var template (value) SSEM v_ssem := vc_rsuMessagesValueList[PX_RSU_ID - 1].ssem;
var template (value) Payload v_payload; var template (value) Payload v_payload;
log(v_signalRequestMessage); log(v_signalRequestMessage);
...@@ -427,8 +426,9 @@ module ItsRSUsSimulator_Functions { ...@@ -427,8 +426,9 @@ module ItsRSUsSimulator_Functions {
bit2oct( bit2oct(
encvalue( encvalue(
valueof( valueof(
v_ssem m_ssem(
))), v_signalRequestMessage
)))),
PICS_SSEM_BTP_DESTINATION_PORT, PICS_SSEM_BTP_DESTINATION_PORT,
PICS_SSEM_BTP_SOURCE_PORT PICS_SSEM_BTP_SOURCE_PORT
) )
......
...@@ -95,6 +95,28 @@ module ItsRSUsSimulator_Templates { ...@@ -95,6 +95,28 @@ module ItsRSUsSimulator_Templates {
} }
} }
/**
* @desc Receive template for GeoNetworking Unicast Packet
* @param p_destinationShortPosVec Short position vector of destination
* @param p_seqNumber Sequence number of GeoUnicast packet
* @param p_nextHeader Id of next header
*/
template (present) GnNonSecuredPacket mw_geoNwTsbPacketWithNextHeader_srem(
in template (present) UInt16 p_seqNumber := ?,
in template (present) LongPosVector p_sourceLongPosVec := ?,
in template (value) NextHeader p_nextHeader
) modifies mw_geoNwTsbPacketWithNextHeader := {
payload := {
decodedPayload := {
btpPacket := mw_btpB(
PICS_SREM_BTP_DESTINATION_PORT,
PICS_SREM_BTP_SOURCE_PORT,
?
)
},
rawPayload := ?
}
}
} // End of group geoNetworkingTemplates } // End of group geoNetworkingTemplates
......
...@@ -54,18 +54,13 @@ module ItsRSUsSimulator_TestCases { ...@@ -54,18 +54,13 @@ module ItsRSUsSimulator_TestCases {
if (ispresent(vc_rsuMessagesValueList[PX_RSU_ID - 1].ivim)) { if (ispresent(vc_rsuMessagesValueList[PX_RSU_ID - 1].ivim)) {
tc_ivim.start; tc_ivim.start;
} }
log("Expected SREM:", mw_geoNwInd(
mw_geoNwPdu(
mw_geoNwBroadcastPacketWithNextHeader_srem(
?,
?,
e_btpB
))));
alt { alt {
[] geoNetworkingPort.receive( [] geoNetworkingPort.receive(
mw_geoNwInd( mw_geoNwInd(
mw_geoNwPdu( mw_geoNwPdu(
mw_geoNwBroadcastPacketWithNextHeader_srem( // FIXM Geobroadcast or TSB? mw_geoNwBroadcastPacketWithNextHeader_srem
mw_geoNwTsbPacketWithNextHeader_srem(
?, ?,
?, ?,
e_btpB e_btpB
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment