diff --git a/modeling/SysMLSec/SysMLSecTutorial.xml b/modeling/SysMLSec/SysMLSecTutorial.xml
index 2ac12787e65b19585c449fd1e63f99d5f3fa421f..7f8cde8044b5863981e99be4c98c393fb9373bf3 100644
--- a/modeling/SysMLSec/SysMLSecTutorial.xml
+++ b/modeling/SysMLSec/SysMLSecTutorial.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
<TURTLEGMODELING version="1.0beta">
@@ -43,7 +43,7 @@
<SUBCOMPONENT type="5707" id="11" >
<father id="17" num="0" />
<cdparam x="1005" y="537" />
-<sizeparam width="10" height="10" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="10" height="10" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="1005" maxX="1005" minY="540" maxY="540" />
<infoparam name="value " value="SecurityProtocolDesign" />
@@ -89,27 +89,27 @@
</COMPONENT>
<SUBCOMPONENT type="5707" id="29" >
<father id="38" num="0" />
-<cdparam x="818" y="297" />
-<sizeparam width="10" height="10" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="818" y="267" />
+<sizeparam width="10" height="10" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="905" maxX="905" minY="295" maxY="295" />
-<infoparam name="value " value="NonSecureArchitectureWithSecureFV" />
+<cdrectangleparam minX="905" maxX="905" minY="265" maxY="265" />
+<infoparam name="value " value="NonSecureArchitectureWithNonSecureFV" />
</SUBCOMPONENT>
<SUBCOMPONENT type="5707" id="30" >
<father id="38" num="1" />
<cdparam x="818" y="282" />
-<sizeparam width="10" height="10" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="10" height="10" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="905" maxX="905" minY="280" maxY="280" />
<infoparam name="value " value="SecureArchitectureWithNonSecureFV" />
</SUBCOMPONENT>
<SUBCOMPONENT type="5707" id="31" >
<father id="38" num="2" />
-<cdparam x="818" y="267" />
-<sizeparam width="10" height="10" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="818" y="297" />
+<sizeparam width="10" height="10" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="905" maxX="905" minY="265" maxY="265" />
-<infoparam name="value " value="NonSecureArchitectureWithNonSecureFV" />
+<cdrectangleparam minX="905" maxX="905" minY="295" maxY="295" />
+<infoparam name="value " value="NonSecureArchitectureWithSecureFV" />
</SUBCOMPONENT>
<COMPONENT type="5709" id="46" >
@@ -125,27 +125,27 @@
</COMPONENT>
<SUBCOMPONENT type="5707" id="39" >
<father id="46" num="0" />
-<cdparam x="1155" y="171" />
-<sizeparam width="10" height="10" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="1155" y="141" />
+<sizeparam width="10" height="10" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="1155" maxX="1155" minY="170" maxY="170" />
-<infoparam name="value " value="NonSecureArchitectureWithSecureFV" />
+<cdrectangleparam minX="1155" maxX="1155" minY="140" maxY="140" />
+<infoparam name="value " value="NonSecureArchitectureWithNonSecureFV" />
</SUBCOMPONENT>
<SUBCOMPONENT type="5707" id="40" >
<father id="46" num="1" />
<cdparam x="1155" y="156" />
-<sizeparam width="10" height="10" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="10" height="10" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="1155" maxX="1155" minY="155" maxY="155" />
<infoparam name="value " value="SecureArchitectureWithNonSecureFV" />
</SUBCOMPONENT>
<SUBCOMPONENT type="5707" id="41" >
<father id="46" num="2" />
-<cdparam x="1155" y="141" />
-<sizeparam width="10" height="10" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="1155" y="171" />
+<sizeparam width="10" height="10" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="1155" maxX="1155" minY="140" maxY="140" />
-<infoparam name="value " value="NonSecureArchitectureWithNonSecureFV" />
+<cdrectangleparam minX="1155" maxX="1155" minY="170" maxY="170" />
+<infoparam name="value " value="NonSecureArchitectureWithSecureFV" />
</SUBCOMPONENT>
<COMPONENT type="5713" id="53" >
@@ -161,19 +161,19 @@
</COMPONENT>
<SUBCOMPONENT type="5707" id="47" >
<father id="53" num="0" />
-<cdparam x="655" y="155" />
-<sizeparam width="10" height="10" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="655" y="140" />
+<sizeparam width="10" height="10" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="655" maxX="655" minY="155" maxY="155" />
-<infoparam name="value " value="SecureFV" />
+<cdrectangleparam minX="655" maxX="655" minY="140" maxY="140" />
+<infoparam name="value " value="NonSecureFV" />
</SUBCOMPONENT>
<SUBCOMPONENT type="5707" id="48" >
<father id="53" num="1" />
-<cdparam x="655" y="140" />
-<sizeparam width="10" height="10" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="655" y="155" />
+<sizeparam width="10" height="10" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="655" maxX="655" minY="140" maxY="140" />
-<infoparam name="value " value="NonSecureFV" />
+<cdrectangleparam minX="655" maxX="655" minY="155" maxY="155" />
+<infoparam name="value " value="SecureFV" />
</SUBCOMPONENT>
<COMPONENT type="5712" id="60" >
@@ -191,13 +191,13 @@
<SUBCOMPONENT type="5707" id="54" >
<father id="60" num="0" />
<cdparam x="355" y="440" />
-<sizeparam width="10" height="10" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="10" height="10" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="355" maxX="355" minY="440" maxY="440" />
<infoparam name="value " value="RetrieveData" />
</SUBCOMPONENT>
-<COMPONENT type="5702" id="68" >
+<COMPONENT type="5702" id="70" >
<cdparam x="350" y="200" />
<sizeparam width="200" height="70" minWidth="10" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -209,220 +209,222 @@
<TGConnectingPoint num="3" id="65" />
<TGConnectingPoint num="4" id="66" />
<TGConnectingPoint num="5" id="67" />
+<TGConnectingPoint num="6" id="68" />
+<TGConnectingPoint num="7" id="69" />
</COMPONENT>
<SUBCOMPONENT type="5707" id="61" >
-<father id="68" num="0" />
+<father id="70" num="0" />
<cdparam x="355" y="240" />
-<sizeparam width="10" height="10" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="10" height="10" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="355" maxX="355" minY="240" maxY="240" />
<infoparam name="value " value="SecurityRequirements" />
</SUBCOMPONENT>
-<COMPONENT type="5701" id="73" >
+<COMPONENT type="5701" id="75" >
<cdparam x="50" y="300" />
<sizeparam width="200" height="70" minWidth="10" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="TGComponent" value="Assumptions" />
-<TGConnectingPoint num="0" id="69" />
-<TGConnectingPoint num="1" id="70" />
-<TGConnectingPoint num="2" id="71" />
-<TGConnectingPoint num="3" id="72" />
+<TGConnectingPoint num="0" id="71" />
+<TGConnectingPoint num="1" id="72" />
+<TGConnectingPoint num="2" id="73" />
+<TGConnectingPoint num="3" id="74" />
</COMPONENT>
-<COMPONENT type="304" id="90" >
+<COMPONENT type="304" id="92" >
<cdparam x="630" y="63" />
<sizeparam width="836" height="252" minWidth="20" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="Info" value="SW/HW Partitioning" />
-<TGConnectingPoint num="0" id="74" />
-<TGConnectingPoint num="1" id="75" />
-<TGConnectingPoint num="2" id="76" />
-<TGConnectingPoint num="3" id="77" />
-<TGConnectingPoint num="4" id="78" />
-<TGConnectingPoint num="5" id="79" />
-<TGConnectingPoint num="6" id="80" />
-<TGConnectingPoint num="7" id="81" />
-<TGConnectingPoint num="8" id="82" />
-<TGConnectingPoint num="9" id="83" />
-<TGConnectingPoint num="10" id="84" />
-<TGConnectingPoint num="11" id="85" />
-<TGConnectingPoint num="12" id="86" />
-<TGConnectingPoint num="13" id="87" />
-<TGConnectingPoint num="14" id="88" />
-<TGConnectingPoint num="15" id="89" />
+<TGConnectingPoint num="0" id="76" />
+<TGConnectingPoint num="1" id="77" />
+<TGConnectingPoint num="2" id="78" />
+<TGConnectingPoint num="3" id="79" />
+<TGConnectingPoint num="4" id="80" />
+<TGConnectingPoint num="5" id="81" />
+<TGConnectingPoint num="6" id="82" />
+<TGConnectingPoint num="7" id="83" />
+<TGConnectingPoint num="8" id="84" />
+<TGConnectingPoint num="9" id="85" />
+<TGConnectingPoint num="10" id="86" />
+<TGConnectingPoint num="11" id="87" />
+<TGConnectingPoint num="12" id="88" />
+<TGConnectingPoint num="13" id="89" />
+<TGConnectingPoint num="14" id="90" />
+<TGConnectingPoint num="15" id="91" />
<extraparam>
<TextColor value="-1" />
<FillColor value="-1" />
</extraparam>
</COMPONENT>
-<COMPONENT type="304" id="107" >
+<COMPONENT type="304" id="109" >
<cdparam x="630" y="375" />
<sizeparam width="750" height="325" minWidth="20" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="Info" value="SW Design" />
-<TGConnectingPoint num="0" id="91" />
-<TGConnectingPoint num="1" id="92" />
-<TGConnectingPoint num="2" id="93" />
-<TGConnectingPoint num="3" id="94" />
-<TGConnectingPoint num="4" id="95" />
-<TGConnectingPoint num="5" id="96" />
-<TGConnectingPoint num="6" id="97" />
-<TGConnectingPoint num="7" id="98" />
-<TGConnectingPoint num="8" id="99" />
-<TGConnectingPoint num="9" id="100" />
-<TGConnectingPoint num="10" id="101" />
-<TGConnectingPoint num="11" id="102" />
-<TGConnectingPoint num="12" id="103" />
-<TGConnectingPoint num="13" id="104" />
-<TGConnectingPoint num="14" id="105" />
-<TGConnectingPoint num="15" id="106" />
+<TGConnectingPoint num="0" id="93" />
+<TGConnectingPoint num="1" id="94" />
+<TGConnectingPoint num="2" id="95" />
+<TGConnectingPoint num="3" id="96" />
+<TGConnectingPoint num="4" id="97" />
+<TGConnectingPoint num="5" id="98" />
+<TGConnectingPoint num="6" id="99" />
+<TGConnectingPoint num="7" id="100" />
+<TGConnectingPoint num="8" id="101" />
+<TGConnectingPoint num="9" id="102" />
+<TGConnectingPoint num="10" id="103" />
+<TGConnectingPoint num="11" id="104" />
+<TGConnectingPoint num="12" id="105" />
+<TGConnectingPoint num="13" id="106" />
+<TGConnectingPoint num="14" id="107" />
+<TGConnectingPoint num="15" id="108" />
<extraparam>
<TextColor value="-1" />
<FillColor value="-1" />
</extraparam>
</COMPONENT>
-<COMPONENT type="304" id="124" >
+<COMPONENT type="304" id="126" >
<cdparam x="330" y="169" />
<sizeparam width="241" height="340" minWidth="20" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="Info" value="Req and attacks" />
-<TGConnectingPoint num="0" id="108" />
-<TGConnectingPoint num="1" id="109" />
-<TGConnectingPoint num="2" id="110" />
-<TGConnectingPoint num="3" id="111" />
-<TGConnectingPoint num="4" id="112" />
-<TGConnectingPoint num="5" id="113" />
-<TGConnectingPoint num="6" id="114" />
-<TGConnectingPoint num="7" id="115" />
-<TGConnectingPoint num="8" id="116" />
-<TGConnectingPoint num="9" id="117" />
-<TGConnectingPoint num="10" id="118" />
-<TGConnectingPoint num="11" id="119" />
-<TGConnectingPoint num="12" id="120" />
-<TGConnectingPoint num="13" id="121" />
-<TGConnectingPoint num="14" id="122" />
-<TGConnectingPoint num="15" id="123" />
+<TGConnectingPoint num="0" id="110" />
+<TGConnectingPoint num="1" id="111" />
+<TGConnectingPoint num="2" id="112" />
+<TGConnectingPoint num="3" id="113" />
+<TGConnectingPoint num="4" id="114" />
+<TGConnectingPoint num="5" id="115" />
+<TGConnectingPoint num="6" id="116" />
+<TGConnectingPoint num="7" id="117" />
+<TGConnectingPoint num="8" id="118" />
+<TGConnectingPoint num="9" id="119" />
+<TGConnectingPoint num="10" id="120" />
+<TGConnectingPoint num="11" id="121" />
+<TGConnectingPoint num="12" id="122" />
+<TGConnectingPoint num="13" id="123" />
+<TGConnectingPoint num="14" id="124" />
+<TGConnectingPoint num="15" id="125" />
<extraparam>
<TextColor value="-1" />
<FillColor value="-1" />
</extraparam>
</COMPONENT>
-<CONNECTOR type="6004" id="126" >
+<CONNECTOR type="6004" id="128" >
<cdparam x="1250" y="170" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="<<deriveReqt>>" />
-<TGConnectingPoint num="0" id="125" />
+<TGConnectingPoint num="0" id="127" />
<P1 x="1299" y="170" id="42" />
<P2 x="1105" y="227" id="33" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="6004" id="128" >
+<CONNECTOR type="6004" id="130" >
<cdparam x="1000" y="170" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="<<deriveReqt>>" />
-<TGConnectingPoint num="0" id="127" />
+<TGConnectingPoint num="0" id="129" />
<P1 x="1000" y="170" id="24" />
<P2 x="1022" y="227" id="34" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="6004" id="130" >
+<CONNECTOR type="6004" id="132" >
<cdparam x="750" y="170" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="<<deriveReqt>>" />
-<TGConnectingPoint num="0" id="129" />
+<TGConnectingPoint num="0" id="131" />
<P1 x="762" y="170" id="49" />
<P2 x="938" y="227" id="32" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="5718" id="136" >
+<CONNECTOR type="5718" id="138" >
<cdparam x="550" y="235" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="<<deriveReqt>>" />
-<TGConnectingPoint num="0" id="133" />
-<TGConnectingPoint num="1" id="134" />
-<TGConnectingPoint num="2" id="135" />
+<TGConnectingPoint num="0" id="135" />
+<TGConnectingPoint num="1" id="136" />
+<TGConnectingPoint num="2" id="137" />
<P1 x="550" y="235" id="62" />
<P2 x="740" y="500" id="1" />
<Point x="595" y="235" />
<Point x="595" y="450" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="131" >
-<father id="136" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="133" >
+<father id="138" num="0" />
<cdparam x="595" y="235" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="1" height="1" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="point " value="null" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="132" >
-<father id="136" num="1" />
+<SUBCOMPONENT type="-1" id="134" >
+<father id="138" num="1" />
<cdparam x="595" y="450" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="1" height="1" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="point " value="null" />
</SUBCOMPONENT>
-<CONNECTOR type="5718" id="140" >
+<CONNECTOR type="5718" id="142" >
<cdparam x="1040" y="570" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="<<deriveReqt>>" />
-<TGConnectingPoint num="0" id="138" />
-<TGConnectingPoint num="1" id="139" />
+<TGConnectingPoint num="0" id="140" />
+<TGConnectingPoint num="1" id="141" />
<P1 x="1058" y="570" id="13" />
<P2 x="1100" y="635" id="6" />
<Point x="1060" y="625" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="137" >
-<father id="140" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="139" >
+<father id="142" num="0" />
<cdparam x="1060" y="625" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="1" height="1" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="point " value="null" />
</SUBCOMPONENT>
-<CONNECTOR type="5718" id="144" >
+<CONNECTOR type="5718" id="146" >
<cdparam x="960" y="470" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="<<deriveReqt>>" />
-<TGConnectingPoint num="0" id="142" />
-<TGConnectingPoint num="1" id="143" />
+<TGConnectingPoint num="0" id="144" />
+<TGConnectingPoint num="1" id="145" />
<P1 x="960" y="470" id="19" />
<P2 x="1000" y="533" id="12" />
<Point x="960" y="525" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="141" >
-<father id="144" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="143" >
+<father id="146" num="0" />
<cdparam x="960" y="525" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="1" height="1" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="point " value="null" />
</SUBCOMPONENT>
-<CONNECTOR type="5718" id="146" >
+<CONNECTOR type="5718" id="148" >
<cdparam x="470" y="400" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="<<deriveReqt>>" />
-<TGConnectingPoint num="0" id="145" />
+<TGConnectingPoint num="0" id="147" />
<P1 x="470" y="400" id="56" />
<P2 x="470" y="270" id="64" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="5718" id="148" >
+<CONNECTOR type="5718" id="150" >
<cdparam x="410" y="270" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="<<deriveReqt>>" />
-<TGConnectingPoint num="0" id="147" />
+<TGConnectingPoint num="0" id="149" />
<P1 x="410" y="270" id="63" />
<P2 x="410" y="400" id="55" />
<AutomaticDrawing data="true" />
@@ -437,61 +439,61 @@
<Modeling type="Avatar Requirement" nameTab="SecurityRequirements" >
<AvatarRDPanel name="AVATAR RD" minX="10" maxX="2500" minY="10" maxY="1500" zoom="1.0" >
-<COMPONENT type="5200" id="192" >
+<COMPONENT type="5200" id="194" >
<cdparam x="186" y="322" />
<sizeparam width="368" height="106" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="219" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="Requirement" value="ConfidentialityBetweenT1andT2" />
-<TGConnectingPoint num="0" id="149" />
-<TGConnectingPoint num="1" id="150" />
-<TGConnectingPoint num="2" id="151" />
-<TGConnectingPoint num="3" id="152" />
-<TGConnectingPoint num="4" id="153" />
-<TGConnectingPoint num="5" id="154" />
-<TGConnectingPoint num="6" id="155" />
-<TGConnectingPoint num="7" id="156" />
-<TGConnectingPoint num="8" id="157" />
-<TGConnectingPoint num="9" id="158" />
-<TGConnectingPoint num="10" id="159" />
-<TGConnectingPoint num="11" id="160" />
-<TGConnectingPoint num="12" id="161" />
-<TGConnectingPoint num="13" id="162" />
-<TGConnectingPoint num="14" id="163" />
-<TGConnectingPoint num="15" id="164" />
-<TGConnectingPoint num="16" id="165" />
-<TGConnectingPoint num="17" id="166" />
-<TGConnectingPoint num="18" id="167" />
-<TGConnectingPoint num="19" id="168" />
-<TGConnectingPoint num="20" id="169" />
-<TGConnectingPoint num="21" id="170" />
-<TGConnectingPoint num="22" id="171" />
-<TGConnectingPoint num="23" id="172" />
-<TGConnectingPoint num="24" id="173" />
-<TGConnectingPoint num="25" id="174" />
-<TGConnectingPoint num="26" id="175" />
-<TGConnectingPoint num="27" id="176" />
-<TGConnectingPoint num="28" id="177" />
-<TGConnectingPoint num="29" id="178" />
-<TGConnectingPoint num="30" id="179" />
-<TGConnectingPoint num="31" id="180" />
-<TGConnectingPoint num="32" id="181" />
-<TGConnectingPoint num="33" id="182" />
-<TGConnectingPoint num="34" id="183" />
-<TGConnectingPoint num="35" id="184" />
-<TGConnectingPoint num="36" id="185" />
-<TGConnectingPoint num="37" id="186" />
-<TGConnectingPoint num="38" id="187" />
-<TGConnectingPoint num="39" id="188" />
-<TGConnectingPoint num="40" id="189" />
-<TGConnectingPoint num="41" id="190" />
-<TGConnectingPoint num="42" id="191" />
+<TGConnectingPoint num="0" id="151" />
+<TGConnectingPoint num="1" id="152" />
+<TGConnectingPoint num="2" id="153" />
+<TGConnectingPoint num="3" id="154" />
+<TGConnectingPoint num="4" id="155" />
+<TGConnectingPoint num="5" id="156" />
+<TGConnectingPoint num="6" id="157" />
+<TGConnectingPoint num="7" id="158" />
+<TGConnectingPoint num="8" id="159" />
+<TGConnectingPoint num="9" id="160" />
+<TGConnectingPoint num="10" id="161" />
+<TGConnectingPoint num="11" id="162" />
+<TGConnectingPoint num="12" id="163" />
+<TGConnectingPoint num="13" id="164" />
+<TGConnectingPoint num="14" id="165" />
+<TGConnectingPoint num="15" id="166" />
+<TGConnectingPoint num="16" id="167" />
+<TGConnectingPoint num="17" id="168" />
+<TGConnectingPoint num="18" id="169" />
+<TGConnectingPoint num="19" id="170" />
+<TGConnectingPoint num="20" id="171" />
+<TGConnectingPoint num="21" id="172" />
+<TGConnectingPoint num="22" id="173" />
+<TGConnectingPoint num="23" id="174" />
+<TGConnectingPoint num="24" id="175" />
+<TGConnectingPoint num="25" id="176" />
+<TGConnectingPoint num="26" id="177" />
+<TGConnectingPoint num="27" id="178" />
+<TGConnectingPoint num="28" id="179" />
+<TGConnectingPoint num="29" id="180" />
+<TGConnectingPoint num="30" id="181" />
+<TGConnectingPoint num="31" id="182" />
+<TGConnectingPoint num="32" id="183" />
+<TGConnectingPoint num="33" id="184" />
+<TGConnectingPoint num="34" id="185" />
+<TGConnectingPoint num="35" id="186" />
+<TGConnectingPoint num="36" id="187" />
+<TGConnectingPoint num="37" id="188" />
+<TGConnectingPoint num="38" id="189" />
+<TGConnectingPoint num="39" id="190" />
+<TGConnectingPoint num="40" id="191" />
+<TGConnectingPoint num="41" id="192" />
+<TGConnectingPoint num="42" id="193" />
<extraparam>
<textline data="Requirement description:" />
<textline data="Double-click to edit" />
<kind data="Confidentiality" />
<criticality data="Medium" />
-<reqType data="0" />
+<reqType data="Requirement" color="-1773070" />
<id data="1" />
<satisfied data="false" />
<verified data="false" />
@@ -501,61 +503,61 @@
</extraparam>
</COMPONENT>
-<COMPONENT type="5200" id="236" >
+<COMPONENT type="5200" id="238" >
<cdparam x="183" y="121" />
<sizeparam width="374" height="132" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="155" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="Requirement" value="CommunicationSecurity" />
-<TGConnectingPoint num="0" id="193" />
-<TGConnectingPoint num="1" id="194" />
-<TGConnectingPoint num="2" id="195" />
-<TGConnectingPoint num="3" id="196" />
-<TGConnectingPoint num="4" id="197" />
-<TGConnectingPoint num="5" id="198" />
-<TGConnectingPoint num="6" id="199" />
-<TGConnectingPoint num="7" id="200" />
-<TGConnectingPoint num="8" id="201" />
-<TGConnectingPoint num="9" id="202" />
-<TGConnectingPoint num="10" id="203" />
-<TGConnectingPoint num="11" id="204" />
-<TGConnectingPoint num="12" id="205" />
-<TGConnectingPoint num="13" id="206" />
-<TGConnectingPoint num="14" id="207" />
-<TGConnectingPoint num="15" id="208" />
-<TGConnectingPoint num="16" id="209" />
-<TGConnectingPoint num="17" id="210" />
-<TGConnectingPoint num="18" id="211" />
-<TGConnectingPoint num="19" id="212" />
-<TGConnectingPoint num="20" id="213" />
-<TGConnectingPoint num="21" id="214" />
-<TGConnectingPoint num="22" id="215" />
-<TGConnectingPoint num="23" id="216" />
-<TGConnectingPoint num="24" id="217" />
-<TGConnectingPoint num="25" id="218" />
-<TGConnectingPoint num="26" id="219" />
-<TGConnectingPoint num="27" id="220" />
-<TGConnectingPoint num="28" id="221" />
-<TGConnectingPoint num="29" id="222" />
-<TGConnectingPoint num="30" id="223" />
-<TGConnectingPoint num="31" id="224" />
-<TGConnectingPoint num="32" id="225" />
-<TGConnectingPoint num="33" id="226" />
-<TGConnectingPoint num="34" id="227" />
-<TGConnectingPoint num="35" id="228" />
-<TGConnectingPoint num="36" id="229" />
-<TGConnectingPoint num="37" id="230" />
-<TGConnectingPoint num="38" id="231" />
-<TGConnectingPoint num="39" id="232" />
-<TGConnectingPoint num="40" id="233" />
-<TGConnectingPoint num="41" id="234" />
-<TGConnectingPoint num="42" id="235" />
+<TGConnectingPoint num="0" id="195" />
+<TGConnectingPoint num="1" id="196" />
+<TGConnectingPoint num="2" id="197" />
+<TGConnectingPoint num="3" id="198" />
+<TGConnectingPoint num="4" id="199" />
+<TGConnectingPoint num="5" id="200" />
+<TGConnectingPoint num="6" id="201" />
+<TGConnectingPoint num="7" id="202" />
+<TGConnectingPoint num="8" id="203" />
+<TGConnectingPoint num="9" id="204" />
+<TGConnectingPoint num="10" id="205" />
+<TGConnectingPoint num="11" id="206" />
+<TGConnectingPoint num="12" id="207" />
+<TGConnectingPoint num="13" id="208" />
+<TGConnectingPoint num="14" id="209" />
+<TGConnectingPoint num="15" id="210" />
+<TGConnectingPoint num="16" id="211" />
+<TGConnectingPoint num="17" id="212" />
+<TGConnectingPoint num="18" id="213" />
+<TGConnectingPoint num="19" id="214" />
+<TGConnectingPoint num="20" id="215" />
+<TGConnectingPoint num="21" id="216" />
+<TGConnectingPoint num="22" id="217" />
+<TGConnectingPoint num="23" id="218" />
+<TGConnectingPoint num="24" id="219" />
+<TGConnectingPoint num="25" id="220" />
+<TGConnectingPoint num="26" id="221" />
+<TGConnectingPoint num="27" id="222" />
+<TGConnectingPoint num="28" id="223" />
+<TGConnectingPoint num="29" id="224" />
+<TGConnectingPoint num="30" id="225" />
+<TGConnectingPoint num="31" id="226" />
+<TGConnectingPoint num="32" id="227" />
+<TGConnectingPoint num="33" id="228" />
+<TGConnectingPoint num="34" id="229" />
+<TGConnectingPoint num="35" id="230" />
+<TGConnectingPoint num="36" id="231" />
+<TGConnectingPoint num="37" id="232" />
+<TGConnectingPoint num="38" id="233" />
+<TGConnectingPoint num="39" id="234" />
+<TGConnectingPoint num="40" id="235" />
+<TGConnectingPoint num="41" id="236" />
+<TGConnectingPoint num="42" id="237" />
<extraparam>
<textline data="The data exchanged between functional tasks" />
<textline data=" must be confidential" />
<kind data="Confidentiality" />
<criticality data="Medium" />
-<reqType data="0" />
+<reqType data="Requirement" color="-1773070" />
<id data="0" />
<satisfied data="false" />
<verified data="false" />
@@ -565,13 +567,13 @@
</extraparam>
</COMPONENT>
-<CONNECTOR type="5206" id="238" >
+<CONNECTOR type="5206" id="240" >
<cdparam x="366" y="349" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="<<refine>>" />
-<TGConnectingPoint num="0" id="237" />
-<P1 x="370" y="322" id="156" />
-<P2 x="370" y="253" id="203" />
+<TGConnectingPoint num="0" id="239" />
+<P1 x="370" y="322" id="158" />
+<P2 x="370" y="253" id="205" />
<AutomaticDrawing data="true" />
</CONNECTOR>
@@ -584,69 +586,69 @@
<Modeling type="AttackTree" nameTab="RetrieveData" >
<AttackTreeDiagramPanel name="Attack Tree" minX="10" maxX="2500" minY="10" maxY="1500" zoom="1.0" >
-<CONNECTOR type="137" id="240" >
+<CONNECTOR type="137" id="242" >
<cdparam x="175" y="420" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="" />
-<TGConnectingPoint num="0" id="239" />
-<P1 x="213" y="391" id="249" />
-<P2 x="213" y="341" id="353" />
+<TGConnectingPoint num="0" id="241" />
+<P1 x="213" y="391" id="251" />
+<P2 x="213" y="341" id="355" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="137" id="242" >
+<CONNECTOR type="137" id="244" >
<cdparam x="594" y="318" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="" />
-<TGConnectingPoint num="0" id="241" />
-<P1 x="603" y="318" id="289" />
-<P2 x="703" y="318" id="263" />
+<TGConnectingPoint num="0" id="243" />
+<P1 x="603" y="318" id="291" />
+<P2 x="703" y="318" id="265" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="133" id="244" >
+<CONNECTOR type="133" id="246" >
<cdparam x="480" y="302" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="2" />
-<TGConnectingPoint num="0" id="243" />
-<P1 x="511" y="298" id="279" />
-<P2 x="420" y="227" id="311" />
+<TGConnectingPoint num="0" id="245" />
+<P1 x="511" y="298" id="281" />
+<P2 x="420" y="227" id="313" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="133" id="246" >
+<CONNECTOR type="133" id="248" >
<cdparam x="383" y="177" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="" />
-<TGConnectingPoint num="0" id="245" />
-<P1 x="383" y="177" id="300" />
-<P2 x="383" y="133" id="316" />
+<TGConnectingPoint num="0" id="247" />
+<P1 x="383" y="177" id="302" />
+<P2 x="383" y="133" id="318" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="133" id="248" >
+<CONNECTOR type="133" id="250" >
<cdparam x="233" y="301" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="1" />
-<TGConnectingPoint num="0" id="247" />
-<P1 x="241" y="301" id="343" />
-<P2 x="345" y="227" id="310" />
+<TGConnectingPoint num="0" id="249" />
+<P1 x="241" y="301" id="345" />
+<P2 x="345" y="227" id="312" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<COMPONENT type="1403" id="261" >
+<COMPONENT type="1403" id="263" >
<cdparam x="131" y="391" />
-<sizeparam width="164" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="164" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="TGComponent" value="PrivateBus" />
-<TGConnectingPoint num="0" id="249" />
-<TGConnectingPoint num="1" id="250" />
-<TGConnectingPoint num="2" id="251" />
-<TGConnectingPoint num="3" id="252" />
-<TGConnectingPoint num="4" id="253" />
-<TGConnectingPoint num="5" id="254" />
-<TGConnectingPoint num="6" id="255" />
-<TGConnectingPoint num="7" id="256" />
-<TGConnectingPoint num="8" id="257" />
-<TGConnectingPoint num="9" id="258" />
-<TGConnectingPoint num="10" id="259" />
-<TGConnectingPoint num="11" id="260" />
+<TGConnectingPoint num="0" id="251" />
+<TGConnectingPoint num="1" id="252" />
+<TGConnectingPoint num="2" id="253" />
+<TGConnectingPoint num="3" id="254" />
+<TGConnectingPoint num="4" id="255" />
+<TGConnectingPoint num="5" id="256" />
+<TGConnectingPoint num="6" id="257" />
+<TGConnectingPoint num="7" id="258" />
+<TGConnectingPoint num="8" id="259" />
+<TGConnectingPoint num="9" id="260" />
+<TGConnectingPoint num="10" id="261" />
+<TGConnectingPoint num="11" id="262" />
<extraparam>
<textline data="The bus is made unaccessible to the attaker" />
<textline data="- bus on chip" />
@@ -656,156 +658,156 @@
</extraparam>
</COMPONENT>
-<COMPONENT type="1403" id="274" >
+<COMPONENT type="1403" id="276" >
<cdparam x="715" y="298" />
-<sizeparam width="164" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="164" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="TGComponent" value="Ciphering" />
-<TGConnectingPoint num="0" id="262" />
-<TGConnectingPoint num="1" id="263" />
-<TGConnectingPoint num="2" id="264" />
-<TGConnectingPoint num="3" id="265" />
-<TGConnectingPoint num="4" id="266" />
-<TGConnectingPoint num="5" id="267" />
-<TGConnectingPoint num="6" id="268" />
-<TGConnectingPoint num="7" id="269" />
-<TGConnectingPoint num="8" id="270" />
-<TGConnectingPoint num="9" id="271" />
-<TGConnectingPoint num="10" id="272" />
-<TGConnectingPoint num="11" id="273" />
+<TGConnectingPoint num="0" id="264" />
+<TGConnectingPoint num="1" id="265" />
+<TGConnectingPoint num="2" id="266" />
+<TGConnectingPoint num="3" id="267" />
+<TGConnectingPoint num="4" id="268" />
+<TGConnectingPoint num="5" id="269" />
+<TGConnectingPoint num="6" id="270" />
+<TGConnectingPoint num="7" id="271" />
+<TGConnectingPoint num="8" id="272" />
+<TGConnectingPoint num="9" id="273" />
+<TGConnectingPoint num="10" id="274" />
+<TGConnectingPoint num="11" id="275" />
<extraparam>
<textline data="See SecureFV" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1401" id="299" >
+<COMPONENT type="1401" id="301" >
<cdparam x="481" y="298" />
-<sizeparam width="122" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="122" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="TGComponent" value="ReadDataOnBus" />
-<TGConnectingPoint num="0" id="275" />
-<TGConnectingPoint num="1" id="276" />
-<TGConnectingPoint num="2" id="277" />
-<TGConnectingPoint num="3" id="278" />
-<TGConnectingPoint num="4" id="279" />
-<TGConnectingPoint num="5" id="280" />
-<TGConnectingPoint num="6" id="281" />
-<TGConnectingPoint num="7" id="282" />
-<TGConnectingPoint num="8" id="283" />
-<TGConnectingPoint num="9" id="284" />
-<TGConnectingPoint num="10" id="285" />
-<TGConnectingPoint num="11" id="286" />
-<TGConnectingPoint num="12" id="287" />
-<TGConnectingPoint num="13" id="288" />
-<TGConnectingPoint num="14" id="289" />
-<TGConnectingPoint num="15" id="290" />
-<TGConnectingPoint num="16" id="291" />
-<TGConnectingPoint num="17" id="292" />
-<TGConnectingPoint num="18" id="293" />
-<TGConnectingPoint num="19" id="294" />
-<TGConnectingPoint num="20" id="295" />
-<TGConnectingPoint num="21" id="296" />
-<TGConnectingPoint num="22" id="297" />
-<TGConnectingPoint num="23" id="298" />
+<TGConnectingPoint num="0" id="277" />
+<TGConnectingPoint num="1" id="278" />
+<TGConnectingPoint num="2" id="279" />
+<TGConnectingPoint num="3" id="280" />
+<TGConnectingPoint num="4" id="281" />
+<TGConnectingPoint num="5" id="282" />
+<TGConnectingPoint num="6" id="283" />
+<TGConnectingPoint num="7" id="284" />
+<TGConnectingPoint num="8" id="285" />
+<TGConnectingPoint num="9" id="286" />
+<TGConnectingPoint num="10" id="287" />
+<TGConnectingPoint num="11" id="288" />
+<TGConnectingPoint num="12" id="289" />
+<TGConnectingPoint num="13" id="290" />
+<TGConnectingPoint num="14" id="291" />
+<TGConnectingPoint num="15" id="292" />
+<TGConnectingPoint num="16" id="293" />
+<TGConnectingPoint num="17" id="294" />
+<TGConnectingPoint num="18" id="295" />
+<TGConnectingPoint num="19" id="296" />
+<TGConnectingPoint num="20" id="297" />
+<TGConnectingPoint num="21" id="298" />
+<TGConnectingPoint num="22" id="299" />
+<TGConnectingPoint num="23" id="300" />
<extraparam>
<info description="Implemented in SecureFV" root="false" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1402" id="312" >
+<COMPONENT type="1402" id="314" >
<cdparam x="308" y="177" />
-<sizeparam width="150" height="50" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="150" height="50" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="TGComponent" value="<<SEQUENCE>>" />
-<TGConnectingPoint num="0" id="300" />
-<TGConnectingPoint num="1" id="301" />
-<TGConnectingPoint num="2" id="302" />
-<TGConnectingPoint num="3" id="303" />
-<TGConnectingPoint num="4" id="304" />
-<TGConnectingPoint num="5" id="305" />
-<TGConnectingPoint num="6" id="306" />
-<TGConnectingPoint num="7" id="307" />
-<TGConnectingPoint num="8" id="308" />
-<TGConnectingPoint num="9" id="309" />
-<TGConnectingPoint num="10" id="310" />
-<TGConnectingPoint num="11" id="311" />
+<TGConnectingPoint num="0" id="302" />
+<TGConnectingPoint num="1" id="303" />
+<TGConnectingPoint num="2" id="304" />
+<TGConnectingPoint num="3" id="305" />
+<TGConnectingPoint num="4" id="306" />
+<TGConnectingPoint num="5" id="307" />
+<TGConnectingPoint num="6" id="308" />
+<TGConnectingPoint num="7" id="309" />
+<TGConnectingPoint num="8" id="310" />
+<TGConnectingPoint num="9" id="311" />
+<TGConnectingPoint num="10" id="312" />
+<TGConnectingPoint num="11" id="313" />
<extraparam>
<info equation="" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1401" id="337" >
+<COMPONENT type="1401" id="339" >
<cdparam x="296" y="93" />
-<sizeparam width="175" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="175" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="TGComponent" value="RetrieveConfidentialData" />
-<TGConnectingPoint num="0" id="313" />
-<TGConnectingPoint num="1" id="314" />
-<TGConnectingPoint num="2" id="315" />
-<TGConnectingPoint num="3" id="316" />
-<TGConnectingPoint num="4" id="317" />
-<TGConnectingPoint num="5" id="318" />
-<TGConnectingPoint num="6" id="319" />
-<TGConnectingPoint num="7" id="320" />
-<TGConnectingPoint num="8" id="321" />
-<TGConnectingPoint num="9" id="322" />
-<TGConnectingPoint num="10" id="323" />
-<TGConnectingPoint num="11" id="324" />
-<TGConnectingPoint num="12" id="325" />
-<TGConnectingPoint num="13" id="326" />
-<TGConnectingPoint num="14" id="327" />
-<TGConnectingPoint num="15" id="328" />
-<TGConnectingPoint num="16" id="329" />
-<TGConnectingPoint num="17" id="330" />
-<TGConnectingPoint num="18" id="331" />
-<TGConnectingPoint num="19" id="332" />
-<TGConnectingPoint num="20" id="333" />
-<TGConnectingPoint num="21" id="334" />
-<TGConnectingPoint num="22" id="335" />
-<TGConnectingPoint num="23" id="336" />
+<TGConnectingPoint num="0" id="315" />
+<TGConnectingPoint num="1" id="316" />
+<TGConnectingPoint num="2" id="317" />
+<TGConnectingPoint num="3" id="318" />
+<TGConnectingPoint num="4" id="319" />
+<TGConnectingPoint num="5" id="320" />
+<TGConnectingPoint num="6" id="321" />
+<TGConnectingPoint num="7" id="322" />
+<TGConnectingPoint num="8" id="323" />
+<TGConnectingPoint num="9" id="324" />
+<TGConnectingPoint num="10" id="325" />
+<TGConnectingPoint num="11" id="326" />
+<TGConnectingPoint num="12" id="327" />
+<TGConnectingPoint num="13" id="328" />
+<TGConnectingPoint num="14" id="329" />
+<TGConnectingPoint num="15" id="330" />
+<TGConnectingPoint num="16" id="331" />
+<TGConnectingPoint num="17" id="332" />
+<TGConnectingPoint num="18" id="333" />
+<TGConnectingPoint num="19" id="334" />
+<TGConnectingPoint num="20" id="335" />
+<TGConnectingPoint num="21" id="336" />
+<TGConnectingPoint num="22" id="337" />
+<TGConnectingPoint num="23" id="338" />
<accessibility />
<extraparam>
<info description="" root="true" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1401" id="362" >
+<COMPONENT type="1401" id="364" >
<cdparam x="157" y="301" />
-<sizeparam width="112" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="112" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="TGComponent" value="ConnectOnBus" />
-<TGConnectingPoint num="0" id="338" />
-<TGConnectingPoint num="1" id="339" />
-<TGConnectingPoint num="2" id="340" />
-<TGConnectingPoint num="3" id="341" />
-<TGConnectingPoint num="4" id="342" />
-<TGConnectingPoint num="5" id="343" />
-<TGConnectingPoint num="6" id="344" />
-<TGConnectingPoint num="7" id="345" />
-<TGConnectingPoint num="8" id="346" />
-<TGConnectingPoint num="9" id="347" />
-<TGConnectingPoint num="10" id="348" />
-<TGConnectingPoint num="11" id="349" />
-<TGConnectingPoint num="12" id="350" />
-<TGConnectingPoint num="13" id="351" />
-<TGConnectingPoint num="14" id="352" />
-<TGConnectingPoint num="15" id="353" />
-<TGConnectingPoint num="16" id="354" />
-<TGConnectingPoint num="17" id="355" />
-<TGConnectingPoint num="18" id="356" />
-<TGConnectingPoint num="19" id="357" />
-<TGConnectingPoint num="20" id="358" />
-<TGConnectingPoint num="21" id="359" />
-<TGConnectingPoint num="22" id="360" />
-<TGConnectingPoint num="23" id="361" />
+<TGConnectingPoint num="0" id="340" />
+<TGConnectingPoint num="1" id="341" />
+<TGConnectingPoint num="2" id="342" />
+<TGConnectingPoint num="3" id="343" />
+<TGConnectingPoint num="4" id="344" />
+<TGConnectingPoint num="5" id="345" />
+<TGConnectingPoint num="6" id="346" />
+<TGConnectingPoint num="7" id="347" />
+<TGConnectingPoint num="8" id="348" />
+<TGConnectingPoint num="9" id="349" />
+<TGConnectingPoint num="10" id="350" />
+<TGConnectingPoint num="11" id="351" />
+<TGConnectingPoint num="12" id="352" />
+<TGConnectingPoint num="13" id="353" />
+<TGConnectingPoint num="14" id="354" />
+<TGConnectingPoint num="15" id="355" />
+<TGConnectingPoint num="16" id="356" />
+<TGConnectingPoint num="17" id="357" />
+<TGConnectingPoint num="18" id="358" />
+<TGConnectingPoint num="19" id="359" />
+<TGConnectingPoint num="20" id="360" />
+<TGConnectingPoint num="21" id="361" />
+<TGConnectingPoint num="22" id="362" />
+<TGConnectingPoint num="23" id="363" />
<extraparam>
<info description="implemented in SecureArchitectureWithNonSecureFV" root="false" />
</extraparam>
@@ -819,43 +821,43 @@
-<Modeling type="TML Component Design" nameTab="NonSecureFV" >
+<Modeling type="TML Component Design" nameTab="NonSecureFV" tabs="TML Component Task Diagram$T2$T1" >
<TMLComponentTaskDiagramPanel name="TML Component Task Diagram" minX="10" maxX="2500" minY="10" maxY="1500" channels="true" events="true" requests="true" zoom="1.0" >
-<CONNECTOR type="126" id="363" >
+<CONNECTOR type="126" id="365" >
<cdparam x="419" y="198" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="406" y="185" id="375" />
-<P2 x="565" y="185" id="364" />
+<P1 x="406" y="185" id="377" />
+<P2 x="565" y="185" id="366" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<COMPONENT type="1202" id="374" >
+<COMPONENT type="1202" id="376" >
<cdparam x="565" y="132" />
<sizeparam width="200" height="150" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="Primitive component" value="T2" />
-<TGConnectingPoint num="0" id="366" />
-<TGConnectingPoint num="1" id="367" />
-<TGConnectingPoint num="2" id="368" />
-<TGConnectingPoint num="3" id="369" />
-<TGConnectingPoint num="4" id="370" />
-<TGConnectingPoint num="5" id="371" />
-<TGConnectingPoint num="6" id="372" />
-<TGConnectingPoint num="7" id="373" />
+<TGConnectingPoint num="0" id="368" />
+<TGConnectingPoint num="1" id="369" />
+<TGConnectingPoint num="2" id="370" />
+<TGConnectingPoint num="3" id="371" />
+<TGConnectingPoint num="4" id="372" />
+<TGConnectingPoint num="5" id="373" />
+<TGConnectingPoint num="6" id="374" />
+<TGConnectingPoint num="7" id="375" />
<extraparam>
-<Data isAttacker="No" />
+<Data isAttacker="No" Operation="" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1203" id="365" >
-<father id="374" num="0" />
-<reference id="236" />
+<SUBCOMPONENT type="1203" id="367" >
+<father id="376" num="0" />
+<reference id="238" />
<cdparam x="552" y="185" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="137" />
<infoparam name="Primitive port" value="Channel comm" />
-<TGConnectingPoint num="0" id="364" />
+<TGConnectingPoint num="0" id="366" />
<extraparam>
<Prop commName="comm" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="40" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
@@ -866,33 +868,33 @@
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="1202" id="385" >
+<COMPONENT type="1202" id="387" >
<cdparam x="206" y="130" />
<sizeparam width="200" height="150" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="Primitive component" value="T1" />
-<TGConnectingPoint num="0" id="377" />
-<TGConnectingPoint num="1" id="378" />
-<TGConnectingPoint num="2" id="379" />
-<TGConnectingPoint num="3" id="380" />
-<TGConnectingPoint num="4" id="381" />
-<TGConnectingPoint num="5" id="382" />
-<TGConnectingPoint num="6" id="383" />
-<TGConnectingPoint num="7" id="384" />
+<TGConnectingPoint num="0" id="379" />
+<TGConnectingPoint num="1" id="380" />
+<TGConnectingPoint num="2" id="381" />
+<TGConnectingPoint num="3" id="382" />
+<TGConnectingPoint num="4" id="383" />
+<TGConnectingPoint num="5" id="384" />
+<TGConnectingPoint num="6" id="385" />
+<TGConnectingPoint num="7" id="386" />
<extraparam>
-<Data isAttacker="No" />
+<Data isAttacker="No" Operation="" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1203" id="376" >
-<father id="385" num="0" />
-<reference id="236" />
+<SUBCOMPONENT type="1203" id="378" >
+<father id="387" num="0" />
+<reference id="238" />
<cdparam x="393" y="185" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="137" />
<infoparam name="Primitive port" value="Channel comm" />
-<TGConnectingPoint num="0" id="375" />
+<TGConnectingPoint num="0" id="377" />
<extraparam>
<Prop commName="comm" commType="0" origin="true" finite="false" blocking="true" maxSamples="8" widthSamples="40" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="true" checkConfStatus="1" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
@@ -907,102 +909,104 @@
</TMLComponentTaskDiagramPanel>
<TMLActivityDiagramPanel name="T2" minX="10" maxX="2500" minY="10" maxY="1500" >
-<COMPONENT type="1001" id="387" >
+<COMPONENT type="1001" id="389" >
<cdparam x="406" y="194" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="20" height="20" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="386" />
+<TGConnectingPoint num="0" id="388" />
</COMPONENT>
-<COMPONENT type="1009" id="390" >
+<COMPONENT type="1009" id="392" >
<cdparam x="382" y="118" />
-<sizeparam width="69" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="69" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
+<enabled value="true" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="read channel" value="comm(1) " />
-<TGConnectingPoint num="0" id="388" />
-<TGConnectingPoint num="1" id="389" />
+<TGConnectingPoint num="0" id="390" />
+<TGConnectingPoint num="1" id="391" />
<extraparam>
-<Data channelName="comm" nbOfSamples="1" secPattern="" isAttacker="No" />
+<Data channelName="comm" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1000" id="392" >
+<COMPONENT type="1000" id="394" >
<cdparam x="409" y="54" />
-<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="391" />
+<TGConnectingPoint num="0" id="393" />
</COMPONENT>
-<CONNECTOR type="115" id="393" >
+<CONNECTOR type="115" id="395" >
<cdparam x="407" y="70" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="416" y="74" id="391" />
-<P2 x="416" y="113" id="388" />
+<P1 x="416" y="69" id="393" />
+<P2 x="416" y="113" id="390" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="394" >
+<CONNECTOR type="115" id="396" >
<cdparam x="416" y="143" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="416" y="143" id="389" />
-<P2 x="416" y="189" id="386" />
+<P1 x="416" y="143" id="391" />
+<P2 x="416" y="189" id="388" />
<AutomaticDrawing data="true" />
</CONNECTOR>
</TMLActivityDiagramPanel>
<TMLActivityDiagramPanel name="T1" minX="10" maxX="2500" minY="10" maxY="1500" >
-<COMPONENT type="1001" id="396" >
+<COMPONENT type="1001" id="398" >
<cdparam x="404" y="175" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="20" height="20" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="395" />
+<TGConnectingPoint num="0" id="397" />
</COMPONENT>
-<COMPONENT type="1006" id="399" >
+<COMPONENT type="1006" id="401" >
<cdparam x="382" y="111" />
-<sizeparam width="65" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="65" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
+<enabled value="true" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="write channel" value="comm(1)" />
-<TGConnectingPoint num="0" id="397" />
-<TGConnectingPoint num="1" id="398" />
+<TGConnectingPoint num="0" id="399" />
+<TGConnectingPoint num="1" id="400" />
<extraparam>
-<Data channelName="comm" nbOfSamples="1" secPattern="" isAttacker="No" />
+<Data channelName="comm" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1000" id="401" >
+<COMPONENT type="1000" id="403" >
<cdparam x="407" y="51" />
-<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="400" />
+<TGConnectingPoint num="0" id="402" />
</COMPONENT>
-<CONNECTOR type="115" id="402" >
+<CONNECTOR type="115" id="404" >
<cdparam x="407" y="70" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="414" y="71" id="400" />
-<P2 x="414" y="106" id="397" />
+<P1 x="414" y="66" id="402" />
+<P2 x="414" y="106" id="399" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="403" >
+<CONNECTOR type="115" id="405" >
<cdparam x="414" y="136" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="414" y="136" id="398" />
-<P2 x="414" y="170" id="395" />
+<P1 x="414" y="136" id="400" />
+<P2 x="414" y="170" id="397" />
<AutomaticDrawing data="true" />
</CONNECTOR>
@@ -1015,256 +1019,256 @@
<Modeling type="TML Architecture" nameTab="NonSecureArchitectureWithNonSecureFV" >
<TMLArchiDiagramPanel name="DIPLODOCUS architecture and mapping Diagram" minX="10" maxX="2500" minY="10" maxY="1500" attributes="0" masterClockFrequency="200" >
-<COMPONENT type="1105" id="437" >
+<COMPONENT type="1105" id="439" >
<cdparam x="592" y="493" />
<sizeparam width="205" height="139" minWidth="100" minHeight="35" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="MainMemory" value="name" />
-<TGConnectingPoint num="0" id="413" />
-<TGConnectingPoint num="1" id="414" />
-<TGConnectingPoint num="2" id="415" />
-<TGConnectingPoint num="3" id="416" />
-<TGConnectingPoint num="4" id="417" />
-<TGConnectingPoint num="5" id="418" />
-<TGConnectingPoint num="6" id="419" />
-<TGConnectingPoint num="7" id="420" />
-<TGConnectingPoint num="8" id="421" />
-<TGConnectingPoint num="9" id="422" />
-<TGConnectingPoint num="10" id="423" />
-<TGConnectingPoint num="11" id="424" />
-<TGConnectingPoint num="12" id="425" />
-<TGConnectingPoint num="13" id="426" />
-<TGConnectingPoint num="14" id="427" />
-<TGConnectingPoint num="15" id="428" />
-<TGConnectingPoint num="16" id="429" />
-<TGConnectingPoint num="17" id="430" />
-<TGConnectingPoint num="18" id="431" />
-<TGConnectingPoint num="19" id="432" />
-<TGConnectingPoint num="20" id="433" />
-<TGConnectingPoint num="21" id="434" />
-<TGConnectingPoint num="22" id="435" />
-<TGConnectingPoint num="23" id="436" />
+<TGConnectingPoint num="0" id="415" />
+<TGConnectingPoint num="1" id="416" />
+<TGConnectingPoint num="2" id="417" />
+<TGConnectingPoint num="3" id="418" />
+<TGConnectingPoint num="4" id="419" />
+<TGConnectingPoint num="5" id="420" />
+<TGConnectingPoint num="6" id="421" />
+<TGConnectingPoint num="7" id="422" />
+<TGConnectingPoint num="8" id="423" />
+<TGConnectingPoint num="9" id="424" />
+<TGConnectingPoint num="10" id="425" />
+<TGConnectingPoint num="11" id="426" />
+<TGConnectingPoint num="12" id="427" />
+<TGConnectingPoint num="13" id="428" />
+<TGConnectingPoint num="14" id="429" />
+<TGConnectingPoint num="15" id="430" />
+<TGConnectingPoint num="16" id="431" />
+<TGConnectingPoint num="17" id="432" />
+<TGConnectingPoint num="18" id="433" />
+<TGConnectingPoint num="19" id="434" />
+<TGConnectingPoint num="20" id="435" />
+<TGConnectingPoint num="21" id="436" />
+<TGConnectingPoint num="22" id="437" />
+<TGConnectingPoint num="23" id="438" />
<extraparam>
<info stereotype="MEMORY" nodeName="MainMemory" />
<attributes byteDataSize="4" memorySize="1024" clockRatio="1" bufferType="0" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1103" id="412" >
-<father id="437" num="0" />
+<SUBCOMPONENT type="1103" id="414" >
+<father id="439" num="0" />
<cdparam x="614" y="545" />
-<sizeparam width="164" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="164" height="40" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="41" minY="0" maxY="99" />
<infoparam name="TGComponent" value="NonSecureFV::comm" />
-<TGConnectingPoint num="0" id="404" />
-<TGConnectingPoint num="1" id="405" />
-<TGConnectingPoint num="2" id="406" />
-<TGConnectingPoint num="3" id="407" />
-<TGConnectingPoint num="4" id="408" />
-<TGConnectingPoint num="5" id="409" />
-<TGConnectingPoint num="6" id="410" />
-<TGConnectingPoint num="7" id="411" />
+<TGConnectingPoint num="0" id="406" />
+<TGConnectingPoint num="1" id="407" />
+<TGConnectingPoint num="2" id="408" />
+<TGConnectingPoint num="3" id="409" />
+<TGConnectingPoint num="4" id="410" />
+<TGConnectingPoint num="5" id="411" />
+<TGConnectingPoint num="6" id="412" />
+<TGConnectingPoint num="7" id="413" />
<extraparam>
<info value="NonSecureFV::comm" communicationName="comm" referenceCommunicationName="NonSecureFV" priority="0" typeName="channel" />
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="1102" id="471" >
+<COMPONENT type="1102" id="473" >
<cdparam x="569" y="357" />
<sizeparam width="250" height="96" minWidth="100" minHeight="50" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="MainBus" value="name" />
-<TGConnectingPoint num="0" id="447" />
-<TGConnectingPoint num="1" id="448" />
-<TGConnectingPoint num="2" id="449" />
-<TGConnectingPoint num="3" id="450" />
-<TGConnectingPoint num="4" id="451" />
-<TGConnectingPoint num="5" id="452" />
-<TGConnectingPoint num="6" id="453" />
-<TGConnectingPoint num="7" id="454" />
-<TGConnectingPoint num="8" id="455" />
-<TGConnectingPoint num="9" id="456" />
-<TGConnectingPoint num="10" id="457" />
-<TGConnectingPoint num="11" id="458" />
-<TGConnectingPoint num="12" id="459" />
-<TGConnectingPoint num="13" id="460" />
-<TGConnectingPoint num="14" id="461" />
-<TGConnectingPoint num="15" id="462" />
-<TGConnectingPoint num="16" id="463" />
-<TGConnectingPoint num="17" id="464" />
-<TGConnectingPoint num="18" id="465" />
-<TGConnectingPoint num="19" id="466" />
-<TGConnectingPoint num="20" id="467" />
-<TGConnectingPoint num="21" id="468" />
-<TGConnectingPoint num="22" id="469" />
-<TGConnectingPoint num="23" id="470" />
+<TGConnectingPoint num="0" id="449" />
+<TGConnectingPoint num="1" id="450" />
+<TGConnectingPoint num="2" id="451" />
+<TGConnectingPoint num="3" id="452" />
+<TGConnectingPoint num="4" id="453" />
+<TGConnectingPoint num="5" id="454" />
+<TGConnectingPoint num="6" id="455" />
+<TGConnectingPoint num="7" id="456" />
+<TGConnectingPoint num="8" id="457" />
+<TGConnectingPoint num="9" id="458" />
+<TGConnectingPoint num="10" id="459" />
+<TGConnectingPoint num="11" id="460" />
+<TGConnectingPoint num="12" id="461" />
+<TGConnectingPoint num="13" id="462" />
+<TGConnectingPoint num="14" id="463" />
+<TGConnectingPoint num="15" id="464" />
+<TGConnectingPoint num="16" id="465" />
+<TGConnectingPoint num="17" id="466" />
+<TGConnectingPoint num="18" id="467" />
+<TGConnectingPoint num="19" id="468" />
+<TGConnectingPoint num="20" id="469" />
+<TGConnectingPoint num="21" id="470" />
+<TGConnectingPoint num="22" id="471" />
+<TGConnectingPoint num="23" id="472" />
<extraparam>
<info stereotype="BUS-RR" nodeName="MainBus" />
<attributes byteDataSize="4" arbitrationPolicy="0" sliceTime="10000" pipelineSize="1" clockRatio="1" privacy="0" referenceAttack="null" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1103" id="446" >
-<father id="471" num="0" />
+<SUBCOMPONENT type="1103" id="448" >
+<father id="473" num="0" />
<cdparam x="609" y="398" />
-<sizeparam width="164" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="164" height="40" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="86" minY="0" maxY="56" />
<infoparam name="TGComponent" value="NonSecureFV::comm" />
-<TGConnectingPoint num="0" id="438" />
-<TGConnectingPoint num="1" id="439" />
-<TGConnectingPoint num="2" id="440" />
-<TGConnectingPoint num="3" id="441" />
-<TGConnectingPoint num="4" id="442" />
-<TGConnectingPoint num="5" id="443" />
-<TGConnectingPoint num="6" id="444" />
-<TGConnectingPoint num="7" id="445" />
+<TGConnectingPoint num="0" id="440" />
+<TGConnectingPoint num="1" id="441" />
+<TGConnectingPoint num="2" id="442" />
+<TGConnectingPoint num="3" id="443" />
+<TGConnectingPoint num="4" id="444" />
+<TGConnectingPoint num="5" id="445" />
+<TGConnectingPoint num="6" id="446" />
+<TGConnectingPoint num="7" id="447" />
<extraparam>
<info value="NonSecureFV::comm" communicationName="comm" referenceCommunicationName="NonSecureFV" priority="0" typeName="channel" />
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="1100" id="505" >
+<COMPONENT type="1100" id="507" >
<cdparam x="891" y="137" />
<sizeparam width="250" height="200" minWidth="150" minHeight="100" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="CPU2" value="name" />
-<TGConnectingPoint num="0" id="481" />
-<TGConnectingPoint num="1" id="482" />
-<TGConnectingPoint num="2" id="483" />
-<TGConnectingPoint num="3" id="484" />
-<TGConnectingPoint num="4" id="485" />
-<TGConnectingPoint num="5" id="486" />
-<TGConnectingPoint num="6" id="487" />
-<TGConnectingPoint num="7" id="488" />
-<TGConnectingPoint num="8" id="489" />
-<TGConnectingPoint num="9" id="490" />
-<TGConnectingPoint num="10" id="491" />
-<TGConnectingPoint num="11" id="492" />
-<TGConnectingPoint num="12" id="493" />
-<TGConnectingPoint num="13" id="494" />
-<TGConnectingPoint num="14" id="495" />
-<TGConnectingPoint num="15" id="496" />
-<TGConnectingPoint num="16" id="497" />
-<TGConnectingPoint num="17" id="498" />
-<TGConnectingPoint num="18" id="499" />
-<TGConnectingPoint num="19" id="500" />
-<TGConnectingPoint num="20" id="501" />
-<TGConnectingPoint num="21" id="502" />
-<TGConnectingPoint num="22" id="503" />
-<TGConnectingPoint num="23" id="504" />
+<TGConnectingPoint num="0" id="483" />
+<TGConnectingPoint num="1" id="484" />
+<TGConnectingPoint num="2" id="485" />
+<TGConnectingPoint num="3" id="486" />
+<TGConnectingPoint num="4" id="487" />
+<TGConnectingPoint num="5" id="488" />
+<TGConnectingPoint num="6" id="489" />
+<TGConnectingPoint num="7" id="490" />
+<TGConnectingPoint num="8" id="491" />
+<TGConnectingPoint num="9" id="492" />
+<TGConnectingPoint num="10" id="493" />
+<TGConnectingPoint num="11" id="494" />
+<TGConnectingPoint num="12" id="495" />
+<TGConnectingPoint num="13" id="496" />
+<TGConnectingPoint num="14" id="497" />
+<TGConnectingPoint num="15" id="498" />
+<TGConnectingPoint num="16" id="499" />
+<TGConnectingPoint num="17" id="500" />
+<TGConnectingPoint num="18" id="501" />
+<TGConnectingPoint num="19" id="502" />
+<TGConnectingPoint num="20" id="503" />
+<TGConnectingPoint num="21" id="504" />
+<TGConnectingPoint num="22" id="505" />
+<TGConnectingPoint num="23" id="506" />
<extraparam>
<info stereotype="CPURR" nodeName="CPU2" />
-<attributes nbOfCores="1" byteDataSize="4" schedulingPolicy="0" sliceTime="10000" goIdleTime="10" maxConsecutiveIdleCycles="10" pipelineSize="5" taskSwitchingTime="20" branchingPredictionPenalty="2" cacheMiss="5" execiTime="1" execcTime="1" clockRatio="1" MECType="0" encryption="0"/>
+<attributes nbOfCores="1" byteDataSize="4" schedulingPolicy="0" sliceTime="10000" goIdleTime="10" maxConsecutiveIdleCycles="10" pipelineSize="5" taskSwitchingTime="20" branchingPredictionPenalty="2" cacheMiss="5" execiTime="1" execcTime="1" clockRatio="1" operation="" MECType="0" encryption="0"/>
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1101" id="480" >
-<father id="505" num="0" />
+<SUBCOMPONENT type="1101" id="482" >
+<father id="507" num="0" />
<cdparam x="933" y="219" />
-<sizeparam width="142" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="142" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="108" minY="0" maxY="160" />
<infoparam name="TGComponent" value="NonSecureFV::T2" />
-<TGConnectingPoint num="0" id="472" />
-<TGConnectingPoint num="1" id="473" />
-<TGConnectingPoint num="2" id="474" />
-<TGConnectingPoint num="3" id="475" />
-<TGConnectingPoint num="4" id="476" />
-<TGConnectingPoint num="5" id="477" />
-<TGConnectingPoint num="6" id="478" />
-<TGConnectingPoint num="7" id="479" />
+<TGConnectingPoint num="0" id="474" />
+<TGConnectingPoint num="1" id="475" />
+<TGConnectingPoint num="2" id="476" />
+<TGConnectingPoint num="3" id="477" />
+<TGConnectingPoint num="4" id="478" />
+<TGConnectingPoint num="5" id="479" />
+<TGConnectingPoint num="6" id="480" />
+<TGConnectingPoint num="7" id="481" />
<extraparam>
-<info value="NonSecureFV::T2" taskName="T2" referenceTaskName="NonSecureFV" priority="0" operation="T2" fatherComponentMECType="0" />
+<info value="NonSecureFV::T2" taskName="T2" referenceTaskName="NonSecureFV" priority="0" operationMEC="T2" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="1100" id="539" >
+<COMPONENT type="1100" id="541" >
<cdparam x="236" y="144" />
<sizeparam width="250" height="200" minWidth="150" minHeight="100" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="CPU1" value="name" />
-<TGConnectingPoint num="0" id="515" />
-<TGConnectingPoint num="1" id="516" />
-<TGConnectingPoint num="2" id="517" />
-<TGConnectingPoint num="3" id="518" />
-<TGConnectingPoint num="4" id="519" />
-<TGConnectingPoint num="5" id="520" />
-<TGConnectingPoint num="6" id="521" />
-<TGConnectingPoint num="7" id="522" />
-<TGConnectingPoint num="8" id="523" />
-<TGConnectingPoint num="9" id="524" />
-<TGConnectingPoint num="10" id="525" />
-<TGConnectingPoint num="11" id="526" />
-<TGConnectingPoint num="12" id="527" />
-<TGConnectingPoint num="13" id="528" />
-<TGConnectingPoint num="14" id="529" />
-<TGConnectingPoint num="15" id="530" />
-<TGConnectingPoint num="16" id="531" />
-<TGConnectingPoint num="17" id="532" />
-<TGConnectingPoint num="18" id="533" />
-<TGConnectingPoint num="19" id="534" />
-<TGConnectingPoint num="20" id="535" />
-<TGConnectingPoint num="21" id="536" />
-<TGConnectingPoint num="22" id="537" />
-<TGConnectingPoint num="23" id="538" />
+<TGConnectingPoint num="0" id="517" />
+<TGConnectingPoint num="1" id="518" />
+<TGConnectingPoint num="2" id="519" />
+<TGConnectingPoint num="3" id="520" />
+<TGConnectingPoint num="4" id="521" />
+<TGConnectingPoint num="5" id="522" />
+<TGConnectingPoint num="6" id="523" />
+<TGConnectingPoint num="7" id="524" />
+<TGConnectingPoint num="8" id="525" />
+<TGConnectingPoint num="9" id="526" />
+<TGConnectingPoint num="10" id="527" />
+<TGConnectingPoint num="11" id="528" />
+<TGConnectingPoint num="12" id="529" />
+<TGConnectingPoint num="13" id="530" />
+<TGConnectingPoint num="14" id="531" />
+<TGConnectingPoint num="15" id="532" />
+<TGConnectingPoint num="16" id="533" />
+<TGConnectingPoint num="17" id="534" />
+<TGConnectingPoint num="18" id="535" />
+<TGConnectingPoint num="19" id="536" />
+<TGConnectingPoint num="20" id="537" />
+<TGConnectingPoint num="21" id="538" />
+<TGConnectingPoint num="22" id="539" />
+<TGConnectingPoint num="23" id="540" />
<extraparam>
<info stereotype="CPURR" nodeName="CPU1" />
-<attributes nbOfCores="1" byteDataSize="4" schedulingPolicy="0" sliceTime="10000" goIdleTime="10" maxConsecutiveIdleCycles="10" pipelineSize="5" taskSwitchingTime="20" branchingPredictionPenalty="2" cacheMiss="5" execiTime="1" execcTime="1" clockRatio="1" MECType="0" encryption="0"/>
+<attributes nbOfCores="1" byteDataSize="4" schedulingPolicy="0" sliceTime="10000" goIdleTime="10" maxConsecutiveIdleCycles="10" pipelineSize="5" taskSwitchingTime="20" branchingPredictionPenalty="2" cacheMiss="5" execiTime="1" execcTime="1" clockRatio="1" operation="" MECType="0" encryption="0"/>
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1101" id="514" >
-<father id="539" num="0" />
+<SUBCOMPONENT type="1101" id="516" >
+<father id="541" num="0" />
<cdparam x="288" y="213" />
-<sizeparam width="142" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="142" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="108" minY="0" maxY="160" />
<infoparam name="TGComponent" value="NonSecureFV::T1" />
-<TGConnectingPoint num="0" id="506" />
-<TGConnectingPoint num="1" id="507" />
-<TGConnectingPoint num="2" id="508" />
-<TGConnectingPoint num="3" id="509" />
-<TGConnectingPoint num="4" id="510" />
-<TGConnectingPoint num="5" id="511" />
-<TGConnectingPoint num="6" id="512" />
-<TGConnectingPoint num="7" id="513" />
+<TGConnectingPoint num="0" id="508" />
+<TGConnectingPoint num="1" id="509" />
+<TGConnectingPoint num="2" id="510" />
+<TGConnectingPoint num="3" id="511" />
+<TGConnectingPoint num="4" id="512" />
+<TGConnectingPoint num="5" id="513" />
+<TGConnectingPoint num="6" id="514" />
+<TGConnectingPoint num="7" id="515" />
<extraparam>
-<info value="NonSecureFV::T1" taskName="T1" referenceTaskName="NonSecureFV" priority="0" operation="T2" fatherComponentMECType="0" />
+<info value="NonSecureFV::T1" taskName="T1" referenceTaskName="NonSecureFV" priority="0" operationMEC="T2" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="125" id="540" >
+<CONNECTOR type="125" id="542" >
<cdparam x="944" y="315" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="{info}" />
-<P1 x="953" y="337" id="495" />
-<P2 x="819" y="381" id="458" />
+<P1 x="953" y="337" id="497" />
+<P2 x="819" y="381" id="460" />
<AutomaticDrawing data="true" />
<extraparam>
<info priority="0" />
<spy value="false" />
</extraparam>
</CONNECTOR>
-<CONNECTOR type="125" id="541" >
+<CONNECTOR type="125" id="543" >
<cdparam x="423" y="323" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="{info}" />
-<P1 x="423" y="344" id="530" />
-<P2 x="569" y="381" id="457" />
+<P1 x="423" y="344" id="532" />
+<P2 x="569" y="381" id="459" />
<AutomaticDrawing data="true" />
<extraparam>
<info priority="0" />
<spy value="false" />
</extraparam>
</CONNECTOR>
-<CONNECTOR type="125" id="542" >
+<CONNECTOR type="125" id="544" >
<cdparam x="785" y="554" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="{info}" />
-<P1 x="694" y="493" id="414" />
-<P2 x="694" y="453" id="453" />
+<P1 x="694" y="493" id="416" />
+<P2 x="694" y="453" id="455" />
<AutomaticDrawing data="true" />
<extraparam>
<info priority="0" />
@@ -1281,256 +1285,256 @@
<Modeling type="TML Architecture" nameTab="SecureArchitectureWithNonSecureFV" >
<TMLArchiDiagramPanel name="DIPLODOCUS architecture and mapping Diagram" minX="10" maxX="2500" minY="10" maxY="1500" attributes="0" masterClockFrequency="200" >
-<COMPONENT type="1105" id="576" >
+<COMPONENT type="1105" id="578" >
<cdparam x="594" y="511" />
<sizeparam width="205" height="139" minWidth="100" minHeight="35" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="MainMemory" value="name" />
-<TGConnectingPoint num="0" id="552" />
-<TGConnectingPoint num="1" id="553" />
-<TGConnectingPoint num="2" id="554" />
-<TGConnectingPoint num="3" id="555" />
-<TGConnectingPoint num="4" id="556" />
-<TGConnectingPoint num="5" id="557" />
-<TGConnectingPoint num="6" id="558" />
-<TGConnectingPoint num="7" id="559" />
-<TGConnectingPoint num="8" id="560" />
-<TGConnectingPoint num="9" id="561" />
-<TGConnectingPoint num="10" id="562" />
-<TGConnectingPoint num="11" id="563" />
-<TGConnectingPoint num="12" id="564" />
-<TGConnectingPoint num="13" id="565" />
-<TGConnectingPoint num="14" id="566" />
-<TGConnectingPoint num="15" id="567" />
-<TGConnectingPoint num="16" id="568" />
-<TGConnectingPoint num="17" id="569" />
-<TGConnectingPoint num="18" id="570" />
-<TGConnectingPoint num="19" id="571" />
-<TGConnectingPoint num="20" id="572" />
-<TGConnectingPoint num="21" id="573" />
-<TGConnectingPoint num="22" id="574" />
-<TGConnectingPoint num="23" id="575" />
+<TGConnectingPoint num="0" id="554" />
+<TGConnectingPoint num="1" id="555" />
+<TGConnectingPoint num="2" id="556" />
+<TGConnectingPoint num="3" id="557" />
+<TGConnectingPoint num="4" id="558" />
+<TGConnectingPoint num="5" id="559" />
+<TGConnectingPoint num="6" id="560" />
+<TGConnectingPoint num="7" id="561" />
+<TGConnectingPoint num="8" id="562" />
+<TGConnectingPoint num="9" id="563" />
+<TGConnectingPoint num="10" id="564" />
+<TGConnectingPoint num="11" id="565" />
+<TGConnectingPoint num="12" id="566" />
+<TGConnectingPoint num="13" id="567" />
+<TGConnectingPoint num="14" id="568" />
+<TGConnectingPoint num="15" id="569" />
+<TGConnectingPoint num="16" id="570" />
+<TGConnectingPoint num="17" id="571" />
+<TGConnectingPoint num="18" id="572" />
+<TGConnectingPoint num="19" id="573" />
+<TGConnectingPoint num="20" id="574" />
+<TGConnectingPoint num="21" id="575" />
+<TGConnectingPoint num="22" id="576" />
+<TGConnectingPoint num="23" id="577" />
<extraparam>
<info stereotype="MEMORY" nodeName="MainMemory" />
<attributes byteDataSize="4" memorySize="1024" clockRatio="1" bufferType="0" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1103" id="551" >
-<father id="576" num="0" />
+<SUBCOMPONENT type="1103" id="553" >
+<father id="578" num="0" />
<cdparam x="616" y="563" />
-<sizeparam width="164" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="164" height="40" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="41" minY="0" maxY="99" />
<infoparam name="TGComponent" value="NonSecureFV::comm" />
-<TGConnectingPoint num="0" id="543" />
-<TGConnectingPoint num="1" id="544" />
-<TGConnectingPoint num="2" id="545" />
-<TGConnectingPoint num="3" id="546" />
-<TGConnectingPoint num="4" id="547" />
-<TGConnectingPoint num="5" id="548" />
-<TGConnectingPoint num="6" id="549" />
-<TGConnectingPoint num="7" id="550" />
+<TGConnectingPoint num="0" id="545" />
+<TGConnectingPoint num="1" id="546" />
+<TGConnectingPoint num="2" id="547" />
+<TGConnectingPoint num="3" id="548" />
+<TGConnectingPoint num="4" id="549" />
+<TGConnectingPoint num="5" id="550" />
+<TGConnectingPoint num="6" id="551" />
+<TGConnectingPoint num="7" id="552" />
<extraparam>
<info value="NonSecureFV::comm" communicationName="comm" referenceCommunicationName="NonSecureFV" priority="0" typeName="channel" />
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="1102" id="610" >
+<COMPONENT type="1102" id="612" >
<cdparam x="569" y="357" />
<sizeparam width="250" height="96" minWidth="100" minHeight="50" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="MainBus" value="name" />
-<TGConnectingPoint num="0" id="586" />
-<TGConnectingPoint num="1" id="587" />
-<TGConnectingPoint num="2" id="588" />
-<TGConnectingPoint num="3" id="589" />
-<TGConnectingPoint num="4" id="590" />
-<TGConnectingPoint num="5" id="591" />
-<TGConnectingPoint num="6" id="592" />
-<TGConnectingPoint num="7" id="593" />
-<TGConnectingPoint num="8" id="594" />
-<TGConnectingPoint num="9" id="595" />
-<TGConnectingPoint num="10" id="596" />
-<TGConnectingPoint num="11" id="597" />
-<TGConnectingPoint num="12" id="598" />
-<TGConnectingPoint num="13" id="599" />
-<TGConnectingPoint num="14" id="600" />
-<TGConnectingPoint num="15" id="601" />
-<TGConnectingPoint num="16" id="602" />
-<TGConnectingPoint num="17" id="603" />
-<TGConnectingPoint num="18" id="604" />
-<TGConnectingPoint num="19" id="605" />
-<TGConnectingPoint num="20" id="606" />
-<TGConnectingPoint num="21" id="607" />
-<TGConnectingPoint num="22" id="608" />
-<TGConnectingPoint num="23" id="609" />
+<TGConnectingPoint num="0" id="588" />
+<TGConnectingPoint num="1" id="589" />
+<TGConnectingPoint num="2" id="590" />
+<TGConnectingPoint num="3" id="591" />
+<TGConnectingPoint num="4" id="592" />
+<TGConnectingPoint num="5" id="593" />
+<TGConnectingPoint num="6" id="594" />
+<TGConnectingPoint num="7" id="595" />
+<TGConnectingPoint num="8" id="596" />
+<TGConnectingPoint num="9" id="597" />
+<TGConnectingPoint num="10" id="598" />
+<TGConnectingPoint num="11" id="599" />
+<TGConnectingPoint num="12" id="600" />
+<TGConnectingPoint num="13" id="601" />
+<TGConnectingPoint num="14" id="602" />
+<TGConnectingPoint num="15" id="603" />
+<TGConnectingPoint num="16" id="604" />
+<TGConnectingPoint num="17" id="605" />
+<TGConnectingPoint num="18" id="606" />
+<TGConnectingPoint num="19" id="607" />
+<TGConnectingPoint num="20" id="608" />
+<TGConnectingPoint num="21" id="609" />
+<TGConnectingPoint num="22" id="610" />
+<TGConnectingPoint num="23" id="611" />
<extraparam>
<info stereotype="BUS-RR" nodeName="MainBus" />
<attributes byteDataSize="4" arbitrationPolicy="0" sliceTime="10000" pipelineSize="1" clockRatio="1" privacy="1" referenceAttack="ReadDataOnBus" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1103" id="585" >
-<father id="610" num="0" />
+<SUBCOMPONENT type="1103" id="587" >
+<father id="612" num="0" />
<cdparam x="609" y="398" />
-<sizeparam width="164" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="164" height="40" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="86" minY="0" maxY="56" />
<infoparam name="TGComponent" value="NonSecureFV::comm" />
-<TGConnectingPoint num="0" id="577" />
-<TGConnectingPoint num="1" id="578" />
-<TGConnectingPoint num="2" id="579" />
-<TGConnectingPoint num="3" id="580" />
-<TGConnectingPoint num="4" id="581" />
-<TGConnectingPoint num="5" id="582" />
-<TGConnectingPoint num="6" id="583" />
-<TGConnectingPoint num="7" id="584" />
+<TGConnectingPoint num="0" id="579" />
+<TGConnectingPoint num="1" id="580" />
+<TGConnectingPoint num="2" id="581" />
+<TGConnectingPoint num="3" id="582" />
+<TGConnectingPoint num="4" id="583" />
+<TGConnectingPoint num="5" id="584" />
+<TGConnectingPoint num="6" id="585" />
+<TGConnectingPoint num="7" id="586" />
<extraparam>
<info value="NonSecureFV::comm" communicationName="comm" referenceCommunicationName="NonSecureFV" priority="0" typeName="channel" />
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="1100" id="644" >
+<COMPONENT type="1100" id="646" >
<cdparam x="891" y="137" />
<sizeparam width="250" height="200" minWidth="150" minHeight="100" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="CPU2" value="name" />
-<TGConnectingPoint num="0" id="620" />
-<TGConnectingPoint num="1" id="621" />
-<TGConnectingPoint num="2" id="622" />
-<TGConnectingPoint num="3" id="623" />
-<TGConnectingPoint num="4" id="624" />
-<TGConnectingPoint num="5" id="625" />
-<TGConnectingPoint num="6" id="626" />
-<TGConnectingPoint num="7" id="627" />
-<TGConnectingPoint num="8" id="628" />
-<TGConnectingPoint num="9" id="629" />
-<TGConnectingPoint num="10" id="630" />
-<TGConnectingPoint num="11" id="631" />
-<TGConnectingPoint num="12" id="632" />
-<TGConnectingPoint num="13" id="633" />
-<TGConnectingPoint num="14" id="634" />
-<TGConnectingPoint num="15" id="635" />
-<TGConnectingPoint num="16" id="636" />
-<TGConnectingPoint num="17" id="637" />
-<TGConnectingPoint num="18" id="638" />
-<TGConnectingPoint num="19" id="639" />
-<TGConnectingPoint num="20" id="640" />
-<TGConnectingPoint num="21" id="641" />
-<TGConnectingPoint num="22" id="642" />
-<TGConnectingPoint num="23" id="643" />
+<TGConnectingPoint num="0" id="622" />
+<TGConnectingPoint num="1" id="623" />
+<TGConnectingPoint num="2" id="624" />
+<TGConnectingPoint num="3" id="625" />
+<TGConnectingPoint num="4" id="626" />
+<TGConnectingPoint num="5" id="627" />
+<TGConnectingPoint num="6" id="628" />
+<TGConnectingPoint num="7" id="629" />
+<TGConnectingPoint num="8" id="630" />
+<TGConnectingPoint num="9" id="631" />
+<TGConnectingPoint num="10" id="632" />
+<TGConnectingPoint num="11" id="633" />
+<TGConnectingPoint num="12" id="634" />
+<TGConnectingPoint num="13" id="635" />
+<TGConnectingPoint num="14" id="636" />
+<TGConnectingPoint num="15" id="637" />
+<TGConnectingPoint num="16" id="638" />
+<TGConnectingPoint num="17" id="639" />
+<TGConnectingPoint num="18" id="640" />
+<TGConnectingPoint num="19" id="641" />
+<TGConnectingPoint num="20" id="642" />
+<TGConnectingPoint num="21" id="643" />
+<TGConnectingPoint num="22" id="644" />
+<TGConnectingPoint num="23" id="645" />
<extraparam>
<info stereotype="CPURR" nodeName="CPU2" />
-<attributes nbOfCores="1" byteDataSize="4" schedulingPolicy="0" sliceTime="10000" goIdleTime="10" maxConsecutiveIdleCycles="10" pipelineSize="5" taskSwitchingTime="20" branchingPredictionPenalty="2" cacheMiss="5" execiTime="1" execcTime="1" clockRatio="1" MECType="0" encryption="0"/>
+<attributes nbOfCores="1" byteDataSize="4" schedulingPolicy="0" sliceTime="10000" goIdleTime="10" maxConsecutiveIdleCycles="10" pipelineSize="5" taskSwitchingTime="20" branchingPredictionPenalty="2" cacheMiss="5" execiTime="1" execcTime="1" clockRatio="1" operation="" MECType="0" encryption="0"/>
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1101" id="619" >
-<father id="644" num="0" />
+<SUBCOMPONENT type="1101" id="621" >
+<father id="646" num="0" />
<cdparam x="933" y="219" />
-<sizeparam width="142" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="142" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="108" minY="0" maxY="160" />
<infoparam name="TGComponent" value="NonSecureFV::T2" />
-<TGConnectingPoint num="0" id="611" />
-<TGConnectingPoint num="1" id="612" />
-<TGConnectingPoint num="2" id="613" />
-<TGConnectingPoint num="3" id="614" />
-<TGConnectingPoint num="4" id="615" />
-<TGConnectingPoint num="5" id="616" />
-<TGConnectingPoint num="6" id="617" />
-<TGConnectingPoint num="7" id="618" />
+<TGConnectingPoint num="0" id="613" />
+<TGConnectingPoint num="1" id="614" />
+<TGConnectingPoint num="2" id="615" />
+<TGConnectingPoint num="3" id="616" />
+<TGConnectingPoint num="4" id="617" />
+<TGConnectingPoint num="5" id="618" />
+<TGConnectingPoint num="6" id="619" />
+<TGConnectingPoint num="7" id="620" />
<extraparam>
-<info value="NonSecureFV::T2" taskName="T2" referenceTaskName="NonSecureFV" priority="0" operation="T2" fatherComponentMECType="0" />
+<info value="NonSecureFV::T2" taskName="T2" referenceTaskName="NonSecureFV" priority="0" operationMEC="T2" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="1100" id="678" >
+<COMPONENT type="1100" id="680" >
<cdparam x="236" y="144" />
<sizeparam width="250" height="200" minWidth="150" minHeight="100" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="CPU1" value="name" />
-<TGConnectingPoint num="0" id="654" />
-<TGConnectingPoint num="1" id="655" />
-<TGConnectingPoint num="2" id="656" />
-<TGConnectingPoint num="3" id="657" />
-<TGConnectingPoint num="4" id="658" />
-<TGConnectingPoint num="5" id="659" />
-<TGConnectingPoint num="6" id="660" />
-<TGConnectingPoint num="7" id="661" />
-<TGConnectingPoint num="8" id="662" />
-<TGConnectingPoint num="9" id="663" />
-<TGConnectingPoint num="10" id="664" />
-<TGConnectingPoint num="11" id="665" />
-<TGConnectingPoint num="12" id="666" />
-<TGConnectingPoint num="13" id="667" />
-<TGConnectingPoint num="14" id="668" />
-<TGConnectingPoint num="15" id="669" />
-<TGConnectingPoint num="16" id="670" />
-<TGConnectingPoint num="17" id="671" />
-<TGConnectingPoint num="18" id="672" />
-<TGConnectingPoint num="19" id="673" />
-<TGConnectingPoint num="20" id="674" />
-<TGConnectingPoint num="21" id="675" />
-<TGConnectingPoint num="22" id="676" />
-<TGConnectingPoint num="23" id="677" />
+<TGConnectingPoint num="0" id="656" />
+<TGConnectingPoint num="1" id="657" />
+<TGConnectingPoint num="2" id="658" />
+<TGConnectingPoint num="3" id="659" />
+<TGConnectingPoint num="4" id="660" />
+<TGConnectingPoint num="5" id="661" />
+<TGConnectingPoint num="6" id="662" />
+<TGConnectingPoint num="7" id="663" />
+<TGConnectingPoint num="8" id="664" />
+<TGConnectingPoint num="9" id="665" />
+<TGConnectingPoint num="10" id="666" />
+<TGConnectingPoint num="11" id="667" />
+<TGConnectingPoint num="12" id="668" />
+<TGConnectingPoint num="13" id="669" />
+<TGConnectingPoint num="14" id="670" />
+<TGConnectingPoint num="15" id="671" />
+<TGConnectingPoint num="16" id="672" />
+<TGConnectingPoint num="17" id="673" />
+<TGConnectingPoint num="18" id="674" />
+<TGConnectingPoint num="19" id="675" />
+<TGConnectingPoint num="20" id="676" />
+<TGConnectingPoint num="21" id="677" />
+<TGConnectingPoint num="22" id="678" />
+<TGConnectingPoint num="23" id="679" />
<extraparam>
<info stereotype="CPURR" nodeName="CPU1" />
-<attributes nbOfCores="1" byteDataSize="4" schedulingPolicy="0" sliceTime="10000" goIdleTime="10" maxConsecutiveIdleCycles="10" pipelineSize="5" taskSwitchingTime="20" branchingPredictionPenalty="2" cacheMiss="5" execiTime="1" execcTime="1" clockRatio="1" MECType="0" encryption="0"/>
+<attributes nbOfCores="1" byteDataSize="4" schedulingPolicy="0" sliceTime="10000" goIdleTime="10" maxConsecutiveIdleCycles="10" pipelineSize="5" taskSwitchingTime="20" branchingPredictionPenalty="2" cacheMiss="5" execiTime="1" execcTime="1" clockRatio="1" operation="" MECType="0" encryption="0"/>
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1101" id="653" >
-<father id="678" num="0" />
+<SUBCOMPONENT type="1101" id="655" >
+<father id="680" num="0" />
<cdparam x="288" y="213" />
-<sizeparam width="142" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="142" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="108" minY="0" maxY="160" />
<infoparam name="TGComponent" value="NonSecureFV::T1" />
-<TGConnectingPoint num="0" id="645" />
-<TGConnectingPoint num="1" id="646" />
-<TGConnectingPoint num="2" id="647" />
-<TGConnectingPoint num="3" id="648" />
-<TGConnectingPoint num="4" id="649" />
-<TGConnectingPoint num="5" id="650" />
-<TGConnectingPoint num="6" id="651" />
-<TGConnectingPoint num="7" id="652" />
+<TGConnectingPoint num="0" id="647" />
+<TGConnectingPoint num="1" id="648" />
+<TGConnectingPoint num="2" id="649" />
+<TGConnectingPoint num="3" id="650" />
+<TGConnectingPoint num="4" id="651" />
+<TGConnectingPoint num="5" id="652" />
+<TGConnectingPoint num="6" id="653" />
+<TGConnectingPoint num="7" id="654" />
<extraparam>
-<info value="NonSecureFV::T1" taskName="T1" referenceTaskName="NonSecureFV" priority="0" operation="T2" fatherComponentMECType="0" />
+<info value="NonSecureFV::T1" taskName="T1" referenceTaskName="NonSecureFV" priority="0" operationMEC="T2" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="125" id="679" >
+<CONNECTOR type="125" id="681" >
<cdparam x="944" y="315" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="{info}" />
-<P1 x="953" y="337" id="634" />
-<P2 x="819" y="381" id="597" />
+<P1 x="953" y="337" id="636" />
+<P2 x="819" y="381" id="599" />
<AutomaticDrawing data="true" />
<extraparam>
<info priority="0" />
<spy value="false" />
</extraparam>
</CONNECTOR>
-<CONNECTOR type="125" id="680" >
+<CONNECTOR type="125" id="682" >
<cdparam x="423" y="323" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="{info}" />
-<P1 x="423" y="344" id="669" />
-<P2 x="569" y="381" id="596" />
+<P1 x="423" y="344" id="671" />
+<P2 x="569" y="381" id="598" />
<AutomaticDrawing data="true" />
<extraparam>
<info priority="0" />
<spy value="false" />
</extraparam>
</CONNECTOR>
-<CONNECTOR type="125" id="681" >
+<CONNECTOR type="125" id="683" >
<cdparam x="785" y="554" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="{info}" />
-<P1 x="696" y="511" id="553" />
-<P2 x="694" y="453" id="592" />
+<P1 x="696" y="511" id="555" />
+<P2 x="694" y="453" id="594" />
<AutomaticDrawing data="true" />
<extraparam>
<info priority="0" />
@@ -1545,43 +1549,43 @@
-<Modeling type="TML Component Design" nameTab="SecureFV" >
+<Modeling type="TML Component Design" nameTab="SecureFV" tabs="TML Component Task Diagram$T2$T1" >
<TMLComponentTaskDiagramPanel name="TML Component Task Diagram" minX="10" maxX="2500" minY="10" maxY="1500" channels="true" events="true" requests="true" zoom="1.0" >
-<CONNECTOR type="126" id="682" >
+<CONNECTOR type="126" id="684" >
<cdparam x="419" y="198" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="406" y="185" id="694" />
-<P2 x="583" y="185" id="683" />
+<P1 x="419" y="198" id="696" />
+<P2 x="570" y="198" id="685" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<COMPONENT type="1202" id="693" >
+<COMPONENT type="1202" id="695" >
<cdparam x="583" y="132" />
<sizeparam width="200" height="150" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="Primitive component" value="T2" />
-<TGConnectingPoint num="0" id="685" />
-<TGConnectingPoint num="1" id="686" />
-<TGConnectingPoint num="2" id="687" />
-<TGConnectingPoint num="3" id="688" />
-<TGConnectingPoint num="4" id="689" />
-<TGConnectingPoint num="5" id="690" />
-<TGConnectingPoint num="6" id="691" />
-<TGConnectingPoint num="7" id="692" />
+<TGConnectingPoint num="0" id="687" />
+<TGConnectingPoint num="1" id="688" />
+<TGConnectingPoint num="2" id="689" />
+<TGConnectingPoint num="3" id="690" />
+<TGConnectingPoint num="4" id="691" />
+<TGConnectingPoint num="5" id="692" />
+<TGConnectingPoint num="6" id="693" />
+<TGConnectingPoint num="7" id="694" />
<extraparam>
-<Data isAttacker="No" />
+<Data isAttacker="No" Operation="" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1203" id="684" >
-<father id="693" num="0" />
-<reference id="236" />
+<SUBCOMPONENT type="1203" id="686" >
+<father id="695" num="0" />
+<reference id="238" />
<cdparam x="570" y="185" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="137" />
<infoparam name="Primitive port" value="Channel comm" />
-<TGConnectingPoint num="0" id="683" />
+<TGConnectingPoint num="0" id="685" />
<extraparam>
<Prop commName="comm" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="40" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
@@ -1592,33 +1596,33 @@
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="1202" id="704" >
+<COMPONENT type="1202" id="706" >
<cdparam x="206" y="130" />
<sizeparam width="200" height="150" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="Primitive component" value="T1" />
-<TGConnectingPoint num="0" id="696" />
-<TGConnectingPoint num="1" id="697" />
-<TGConnectingPoint num="2" id="698" />
-<TGConnectingPoint num="3" id="699" />
-<TGConnectingPoint num="4" id="700" />
-<TGConnectingPoint num="5" id="701" />
-<TGConnectingPoint num="6" id="702" />
-<TGConnectingPoint num="7" id="703" />
+<TGConnectingPoint num="0" id="698" />
+<TGConnectingPoint num="1" id="699" />
+<TGConnectingPoint num="2" id="700" />
+<TGConnectingPoint num="3" id="701" />
+<TGConnectingPoint num="4" id="702" />
+<TGConnectingPoint num="5" id="703" />
+<TGConnectingPoint num="6" id="704" />
+<TGConnectingPoint num="7" id="705" />
<extraparam>
-<Data isAttacker="No" />
+<Data isAttacker="No" Operation="" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1203" id="695" >
-<father id="704" num="0" />
-<reference id="236" />
+<SUBCOMPONENT type="1203" id="697" >
+<father id="706" num="0" />
+<reference id="238" />
<cdparam x="393" y="185" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="137" />
<infoparam name="Primitive port" value="Channel comm" />
-<TGConnectingPoint num="0" id="694" />
+<TGConnectingPoint num="0" id="696" />
<extraparam>
<Prop commName="comm" commType="0" origin="true" finite="false" blocking="true" maxSamples="80" widthSamples="40" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="true" checkConfStatus="1" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
<Type type="0" typeOther="" />
@@ -1633,144 +1637,148 @@
</TMLComponentTaskDiagramPanel>
<TMLActivityDiagramPanel name="T2" minX="10" maxX="2500" minY="10" maxY="1500" >
-<COMPONENT type="1036" id="707" >
+<COMPONENT type="1036" id="709" >
<cdparam x="409" y="180" />
-<sizeparam width="15" height="35" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="15" height="35" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
+<enabled value="true" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="decrypt" value="null" />
-<TGConnectingPoint num="0" id="705" />
-<TGConnectingPoint num="1" id="706" />
+<TGConnectingPoint num="0" id="707" />
+<TGConnectingPoint num="1" id="708" />
<extraparam>
<Data secPattern="Cipherdata" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1001" id="709" >
+<COMPONENT type="1001" id="711" >
<cdparam x="406" y="281" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="20" height="20" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="708" />
+<TGConnectingPoint num="0" id="710" />
</COMPONENT>
-<COMPONENT type="1009" id="712" >
+<COMPONENT type="1009" id="714" >
<cdparam x="382" y="118" />
-<sizeparam width="69" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="69" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
+<enabled value="true" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="read channel" value="comm(1) " />
-<TGConnectingPoint num="0" id="710" />
-<TGConnectingPoint num="1" id="711" />
+<TGConnectingPoint num="0" id="712" />
+<TGConnectingPoint num="1" id="713" />
<extraparam>
-<Data channelName="comm" nbOfSamples="1" secPattern="Cipherdata" isAttacker="No" />
+<Data channelName="comm" nbOfSamples="1" secPattern="Cipherdata" isAttacker="No" isEncForm="Yes" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1000" id="714" >
+<COMPONENT type="1000" id="716" >
<cdparam x="409" y="58" />
-<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="713" />
+<TGConnectingPoint num="0" id="715" />
</COMPONENT>
-<CONNECTOR type="115" id="715" >
+<CONNECTOR type="115" id="717" >
<cdparam x="410" y="225" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="416" y="225" id="706" />
-<P2 x="416" y="276" id="708" />
+<P1 x="416" y="225" id="708" />
+<P2 x="416" y="276" id="710" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="716" >
+<CONNECTOR type="115" id="718" >
<cdparam x="407" y="70" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="416" y="78" id="713" />
-<P2 x="416" y="113" id="710" />
+<P1 x="416" y="73" id="715" />
+<P2 x="416" y="113" id="712" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="717" >
+<CONNECTOR type="115" id="719" >
<cdparam x="416" y="143" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="416" y="143" id="711" />
-<P2 x="416" y="175" id="705" />
+<P1 x="416" y="143" id="713" />
+<P2 x="416" y="175" id="707" />
<AutomaticDrawing data="true" />
</CONNECTOR>
</TMLActivityDiagramPanel>
<TMLActivityDiagramPanel name="T1" minX="10" maxX="2500" minY="10" maxY="1500" >
-<COMPONENT type="1035" id="720" >
+<COMPONENT type="1035" id="722" >
<cdparam x="408" y="104" />
-<sizeparam width="15" height="35" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="15" height="35" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
+<enabled value="true" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="encrypt" value="null" />
-<TGConnectingPoint num="0" id="718" />
-<TGConnectingPoint num="1" id="719" />
+<TGConnectingPoint num="0" id="720" />
+<TGConnectingPoint num="1" id="721" />
<extraparam>
<Data secContext="Cipherdata" type="Symmetric Encryption" overhead="" size="" encTime="100" decTime="100" nonce="" key="" algorithm="" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1001" id="722" >
+<COMPONENT type="1001" id="724" >
<cdparam x="405" y="265" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="20" height="20" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="721" />
+<TGConnectingPoint num="0" id="723" />
</COMPONENT>
-<COMPONENT type="1006" id="725" >
+<COMPONENT type="1006" id="727" >
<cdparam x="383" y="184" />
-<sizeparam width="65" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="65" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
+<enabled value="true" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="write channel" value="comm(1)" />
-<TGConnectingPoint num="0" id="723" />
-<TGConnectingPoint num="1" id="724" />
+<TGConnectingPoint num="0" id="725" />
+<TGConnectingPoint num="1" id="726" />
<extraparam>
-<Data channelName="comm" nbOfSamples="1" secPattern="Cipherdata" isAttacker="No" />
+<Data channelName="comm" nbOfSamples="1" secPattern="Cipherdata" isAttacker="No" isEncForm="Yes" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1000" id="727" >
+<COMPONENT type="1000" id="729" >
<cdparam x="408" y="41" />
-<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="726" />
+<TGConnectingPoint num="0" id="728" />
</COMPONENT>
-<CONNECTOR type="115" id="728" >
+<CONNECTOR type="115" id="730" >
<cdparam x="433" y="145" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="415" y="149" id="719" />
-<P2 x="415" y="179" id="723" />
+<P1 x="415" y="149" id="721" />
+<P2 x="415" y="179" id="725" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="729" >
+<CONNECTOR type="115" id="731" >
<cdparam x="407" y="70" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="415" y="61" id="726" />
-<P2 x="415" y="99" id="718" />
+<P1 x="415" y="56" id="728" />
+<P2 x="415" y="99" id="720" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="730" >
+<CONNECTOR type="115" id="732" >
<cdparam x="405" y="136" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="415" y="209" id="724" />
-<P2 x="415" y="260" id="721" />
+<P1 x="415" y="209" id="726" />
+<P2 x="415" y="260" id="723" />
<AutomaticDrawing data="true" />
</CONNECTOR>
@@ -1783,256 +1791,256 @@
<Modeling type="TML Architecture" nameTab="NonSecureArchitectureWithSecureFV" >
<TMLArchiDiagramPanel name="DIPLODOCUS architecture and mapping Diagram" minX="10" maxX="2500" minY="10" maxY="1500" attributes="0" masterClockFrequency="200" >
-<COMPONENT type="1105" id="764" >
+<COMPONENT type="1105" id="766" >
<cdparam x="594" y="511" />
<sizeparam width="205" height="139" minWidth="100" minHeight="35" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="MainMemory" value="name" />
-<TGConnectingPoint num="0" id="740" />
-<TGConnectingPoint num="1" id="741" />
-<TGConnectingPoint num="2" id="742" />
-<TGConnectingPoint num="3" id="743" />
-<TGConnectingPoint num="4" id="744" />
-<TGConnectingPoint num="5" id="745" />
-<TGConnectingPoint num="6" id="746" />
-<TGConnectingPoint num="7" id="747" />
-<TGConnectingPoint num="8" id="748" />
-<TGConnectingPoint num="9" id="749" />
-<TGConnectingPoint num="10" id="750" />
-<TGConnectingPoint num="11" id="751" />
-<TGConnectingPoint num="12" id="752" />
-<TGConnectingPoint num="13" id="753" />
-<TGConnectingPoint num="14" id="754" />
-<TGConnectingPoint num="15" id="755" />
-<TGConnectingPoint num="16" id="756" />
-<TGConnectingPoint num="17" id="757" />
-<TGConnectingPoint num="18" id="758" />
-<TGConnectingPoint num="19" id="759" />
-<TGConnectingPoint num="20" id="760" />
-<TGConnectingPoint num="21" id="761" />
-<TGConnectingPoint num="22" id="762" />
-<TGConnectingPoint num="23" id="763" />
+<TGConnectingPoint num="0" id="742" />
+<TGConnectingPoint num="1" id="743" />
+<TGConnectingPoint num="2" id="744" />
+<TGConnectingPoint num="3" id="745" />
+<TGConnectingPoint num="4" id="746" />
+<TGConnectingPoint num="5" id="747" />
+<TGConnectingPoint num="6" id="748" />
+<TGConnectingPoint num="7" id="749" />
+<TGConnectingPoint num="8" id="750" />
+<TGConnectingPoint num="9" id="751" />
+<TGConnectingPoint num="10" id="752" />
+<TGConnectingPoint num="11" id="753" />
+<TGConnectingPoint num="12" id="754" />
+<TGConnectingPoint num="13" id="755" />
+<TGConnectingPoint num="14" id="756" />
+<TGConnectingPoint num="15" id="757" />
+<TGConnectingPoint num="16" id="758" />
+<TGConnectingPoint num="17" id="759" />
+<TGConnectingPoint num="18" id="760" />
+<TGConnectingPoint num="19" id="761" />
+<TGConnectingPoint num="20" id="762" />
+<TGConnectingPoint num="21" id="763" />
+<TGConnectingPoint num="22" id="764" />
+<TGConnectingPoint num="23" id="765" />
<extraparam>
<info stereotype="MEMORY" nodeName="MainMemory" />
<attributes byteDataSize="4" memorySize="1024" clockRatio="1" bufferType="0" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1103" id="739" >
-<father id="764" num="0" />
-<cdparam x="616" y="563" />
-<sizeparam width="139" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1103" id="741" >
+<father id="766" num="0" />
+<cdparam x="622" y="549" />
+<sizeparam width="139" height="40" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="66" minY="0" maxY="99" />
<infoparam name="TGComponent" value="SecureFV::comm" />
-<TGConnectingPoint num="0" id="731" />
-<TGConnectingPoint num="1" id="732" />
-<TGConnectingPoint num="2" id="733" />
-<TGConnectingPoint num="3" id="734" />
-<TGConnectingPoint num="4" id="735" />
-<TGConnectingPoint num="5" id="736" />
-<TGConnectingPoint num="6" id="737" />
-<TGConnectingPoint num="7" id="738" />
+<TGConnectingPoint num="0" id="733" />
+<TGConnectingPoint num="1" id="734" />
+<TGConnectingPoint num="2" id="735" />
+<TGConnectingPoint num="3" id="736" />
+<TGConnectingPoint num="4" id="737" />
+<TGConnectingPoint num="5" id="738" />
+<TGConnectingPoint num="6" id="739" />
+<TGConnectingPoint num="7" id="740" />
<extraparam>
<info value="SecureFV::comm" communicationName="comm" referenceCommunicationName="SecureFV" priority="0" typeName="channel" />
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="1102" id="798" >
+<COMPONENT type="1102" id="800" >
<cdparam x="571" y="352" />
<sizeparam width="250" height="96" minWidth="100" minHeight="50" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="MainBus" value="name" />
-<TGConnectingPoint num="0" id="774" />
-<TGConnectingPoint num="1" id="775" />
-<TGConnectingPoint num="2" id="776" />
-<TGConnectingPoint num="3" id="777" />
-<TGConnectingPoint num="4" id="778" />
-<TGConnectingPoint num="5" id="779" />
-<TGConnectingPoint num="6" id="780" />
-<TGConnectingPoint num="7" id="781" />
-<TGConnectingPoint num="8" id="782" />
-<TGConnectingPoint num="9" id="783" />
-<TGConnectingPoint num="10" id="784" />
-<TGConnectingPoint num="11" id="785" />
-<TGConnectingPoint num="12" id="786" />
-<TGConnectingPoint num="13" id="787" />
-<TGConnectingPoint num="14" id="788" />
-<TGConnectingPoint num="15" id="789" />
-<TGConnectingPoint num="16" id="790" />
-<TGConnectingPoint num="17" id="791" />
-<TGConnectingPoint num="18" id="792" />
-<TGConnectingPoint num="19" id="793" />
-<TGConnectingPoint num="20" id="794" />
-<TGConnectingPoint num="21" id="795" />
-<TGConnectingPoint num="22" id="796" />
-<TGConnectingPoint num="23" id="797" />
+<TGConnectingPoint num="0" id="776" />
+<TGConnectingPoint num="1" id="777" />
+<TGConnectingPoint num="2" id="778" />
+<TGConnectingPoint num="3" id="779" />
+<TGConnectingPoint num="4" id="780" />
+<TGConnectingPoint num="5" id="781" />
+<TGConnectingPoint num="6" id="782" />
+<TGConnectingPoint num="7" id="783" />
+<TGConnectingPoint num="8" id="784" />
+<TGConnectingPoint num="9" id="785" />
+<TGConnectingPoint num="10" id="786" />
+<TGConnectingPoint num="11" id="787" />
+<TGConnectingPoint num="12" id="788" />
+<TGConnectingPoint num="13" id="789" />
+<TGConnectingPoint num="14" id="790" />
+<TGConnectingPoint num="15" id="791" />
+<TGConnectingPoint num="16" id="792" />
+<TGConnectingPoint num="17" id="793" />
+<TGConnectingPoint num="18" id="794" />
+<TGConnectingPoint num="19" id="795" />
+<TGConnectingPoint num="20" id="796" />
+<TGConnectingPoint num="21" id="797" />
+<TGConnectingPoint num="22" id="798" />
+<TGConnectingPoint num="23" id="799" />
<extraparam>
<info stereotype="BUS-RR" nodeName="MainBus" />
<attributes byteDataSize="4" arbitrationPolicy="0" sliceTime="10000" pipelineSize="1" clockRatio="1" privacy="0" referenceAttack="null" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1103" id="773" >
-<father id="798" num="0" />
+<SUBCOMPONENT type="1103" id="775" >
+<father id="800" num="0" />
<cdparam x="611" y="393" />
-<sizeparam width="139" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="139" height="40" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="111" minY="0" maxY="56" />
<infoparam name="TGComponent" value="SecureFV::comm" />
-<TGConnectingPoint num="0" id="765" />
-<TGConnectingPoint num="1" id="766" />
-<TGConnectingPoint num="2" id="767" />
-<TGConnectingPoint num="3" id="768" />
-<TGConnectingPoint num="4" id="769" />
-<TGConnectingPoint num="5" id="770" />
-<TGConnectingPoint num="6" id="771" />
-<TGConnectingPoint num="7" id="772" />
+<TGConnectingPoint num="0" id="767" />
+<TGConnectingPoint num="1" id="768" />
+<TGConnectingPoint num="2" id="769" />
+<TGConnectingPoint num="3" id="770" />
+<TGConnectingPoint num="4" id="771" />
+<TGConnectingPoint num="5" id="772" />
+<TGConnectingPoint num="6" id="773" />
+<TGConnectingPoint num="7" id="774" />
<extraparam>
<info value="SecureFV::comm" communicationName="comm" referenceCommunicationName="SecureFV" priority="0" typeName="channel" />
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="1100" id="832" >
+<COMPONENT type="1100" id="834" >
<cdparam x="876" y="124" />
<sizeparam width="250" height="200" minWidth="150" minHeight="100" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="CPU2" value="name" />
-<TGConnectingPoint num="0" id="808" />
-<TGConnectingPoint num="1" id="809" />
-<TGConnectingPoint num="2" id="810" />
-<TGConnectingPoint num="3" id="811" />
-<TGConnectingPoint num="4" id="812" />
-<TGConnectingPoint num="5" id="813" />
-<TGConnectingPoint num="6" id="814" />
-<TGConnectingPoint num="7" id="815" />
-<TGConnectingPoint num="8" id="816" />
-<TGConnectingPoint num="9" id="817" />
-<TGConnectingPoint num="10" id="818" />
-<TGConnectingPoint num="11" id="819" />
-<TGConnectingPoint num="12" id="820" />
-<TGConnectingPoint num="13" id="821" />
-<TGConnectingPoint num="14" id="822" />
-<TGConnectingPoint num="15" id="823" />
-<TGConnectingPoint num="16" id="824" />
-<TGConnectingPoint num="17" id="825" />
-<TGConnectingPoint num="18" id="826" />
-<TGConnectingPoint num="19" id="827" />
-<TGConnectingPoint num="20" id="828" />
-<TGConnectingPoint num="21" id="829" />
-<TGConnectingPoint num="22" id="830" />
-<TGConnectingPoint num="23" id="831" />
+<TGConnectingPoint num="0" id="810" />
+<TGConnectingPoint num="1" id="811" />
+<TGConnectingPoint num="2" id="812" />
+<TGConnectingPoint num="3" id="813" />
+<TGConnectingPoint num="4" id="814" />
+<TGConnectingPoint num="5" id="815" />
+<TGConnectingPoint num="6" id="816" />
+<TGConnectingPoint num="7" id="817" />
+<TGConnectingPoint num="8" id="818" />
+<TGConnectingPoint num="9" id="819" />
+<TGConnectingPoint num="10" id="820" />
+<TGConnectingPoint num="11" id="821" />
+<TGConnectingPoint num="12" id="822" />
+<TGConnectingPoint num="13" id="823" />
+<TGConnectingPoint num="14" id="824" />
+<TGConnectingPoint num="15" id="825" />
+<TGConnectingPoint num="16" id="826" />
+<TGConnectingPoint num="17" id="827" />
+<TGConnectingPoint num="18" id="828" />
+<TGConnectingPoint num="19" id="829" />
+<TGConnectingPoint num="20" id="830" />
+<TGConnectingPoint num="21" id="831" />
+<TGConnectingPoint num="22" id="832" />
+<TGConnectingPoint num="23" id="833" />
<extraparam>
<info stereotype="CPURR" nodeName="CPU2" />
-<attributes nbOfCores="1" byteDataSize="4" schedulingPolicy="0" sliceTime="10000" goIdleTime="10" maxConsecutiveIdleCycles="10" pipelineSize="5" taskSwitchingTime="20" branchingPredictionPenalty="2" cacheMiss="5" execiTime="1" execcTime="1" clockRatio="1" MECType="0" encryption="0"/>
+<attributes nbOfCores="1" byteDataSize="4" schedulingPolicy="0" sliceTime="10000" goIdleTime="10" maxConsecutiveIdleCycles="10" pipelineSize="5" taskSwitchingTime="20" branchingPredictionPenalty="2" cacheMiss="5" execiTime="1" execcTime="1" clockRatio="1" operation="" MECType="0" encryption="0"/>
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1101" id="807" >
-<father id="832" num="0" />
+<SUBCOMPONENT type="1101" id="809" >
+<father id="834" num="0" />
<cdparam x="918" y="206" />
-<sizeparam width="117" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="117" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="133" minY="0" maxY="160" />
<infoparam name="TGComponent" value="SecureFV::T2" />
-<TGConnectingPoint num="0" id="799" />
-<TGConnectingPoint num="1" id="800" />
-<TGConnectingPoint num="2" id="801" />
-<TGConnectingPoint num="3" id="802" />
-<TGConnectingPoint num="4" id="803" />
-<TGConnectingPoint num="5" id="804" />
-<TGConnectingPoint num="6" id="805" />
-<TGConnectingPoint num="7" id="806" />
+<TGConnectingPoint num="0" id="801" />
+<TGConnectingPoint num="1" id="802" />
+<TGConnectingPoint num="2" id="803" />
+<TGConnectingPoint num="3" id="804" />
+<TGConnectingPoint num="4" id="805" />
+<TGConnectingPoint num="5" id="806" />
+<TGConnectingPoint num="6" id="807" />
+<TGConnectingPoint num="7" id="808" />
<extraparam>
-<info value="SecureFV::T2" taskName="T2" referenceTaskName="SecureFV" priority="0" operation="T2" fatherComponentMECType="0" />
+<info value="SecureFV::T2" taskName="T2" referenceTaskName="SecureFV" priority="0" operationMEC="T2" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="1100" id="866" >
+<COMPONENT type="1100" id="868" >
<cdparam x="238" y="138" />
<sizeparam width="250" height="200" minWidth="150" minHeight="100" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="CPU1" value="name" />
-<TGConnectingPoint num="0" id="842" />
-<TGConnectingPoint num="1" id="843" />
-<TGConnectingPoint num="2" id="844" />
-<TGConnectingPoint num="3" id="845" />
-<TGConnectingPoint num="4" id="846" />
-<TGConnectingPoint num="5" id="847" />
-<TGConnectingPoint num="6" id="848" />
-<TGConnectingPoint num="7" id="849" />
-<TGConnectingPoint num="8" id="850" />
-<TGConnectingPoint num="9" id="851" />
-<TGConnectingPoint num="10" id="852" />
-<TGConnectingPoint num="11" id="853" />
-<TGConnectingPoint num="12" id="854" />
-<TGConnectingPoint num="13" id="855" />
-<TGConnectingPoint num="14" id="856" />
-<TGConnectingPoint num="15" id="857" />
-<TGConnectingPoint num="16" id="858" />
-<TGConnectingPoint num="17" id="859" />
-<TGConnectingPoint num="18" id="860" />
-<TGConnectingPoint num="19" id="861" />
-<TGConnectingPoint num="20" id="862" />
-<TGConnectingPoint num="21" id="863" />
-<TGConnectingPoint num="22" id="864" />
-<TGConnectingPoint num="23" id="865" />
+<TGConnectingPoint num="0" id="844" />
+<TGConnectingPoint num="1" id="845" />
+<TGConnectingPoint num="2" id="846" />
+<TGConnectingPoint num="3" id="847" />
+<TGConnectingPoint num="4" id="848" />
+<TGConnectingPoint num="5" id="849" />
+<TGConnectingPoint num="6" id="850" />
+<TGConnectingPoint num="7" id="851" />
+<TGConnectingPoint num="8" id="852" />
+<TGConnectingPoint num="9" id="853" />
+<TGConnectingPoint num="10" id="854" />
+<TGConnectingPoint num="11" id="855" />
+<TGConnectingPoint num="12" id="856" />
+<TGConnectingPoint num="13" id="857" />
+<TGConnectingPoint num="14" id="858" />
+<TGConnectingPoint num="15" id="859" />
+<TGConnectingPoint num="16" id="860" />
+<TGConnectingPoint num="17" id="861" />
+<TGConnectingPoint num="18" id="862" />
+<TGConnectingPoint num="19" id="863" />
+<TGConnectingPoint num="20" id="864" />
+<TGConnectingPoint num="21" id="865" />
+<TGConnectingPoint num="22" id="866" />
+<TGConnectingPoint num="23" id="867" />
<extraparam>
<info stereotype="CPURR" nodeName="CPU1" />
-<attributes nbOfCores="1" byteDataSize="4" schedulingPolicy="0" sliceTime="10000" goIdleTime="10" maxConsecutiveIdleCycles="10" pipelineSize="5" taskSwitchingTime="20" branchingPredictionPenalty="2" cacheMiss="5" execiTime="1" execcTime="1" clockRatio="1" MECType="0" encryption="0"/>
+<attributes nbOfCores="1" byteDataSize="4" schedulingPolicy="0" sliceTime="10000" goIdleTime="10" maxConsecutiveIdleCycles="10" pipelineSize="5" taskSwitchingTime="20" branchingPredictionPenalty="2" cacheMiss="5" execiTime="1" execcTime="1" clockRatio="1" operation="" MECType="0" encryption="0"/>
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1101" id="841" >
-<father id="866" num="0" />
+<SUBCOMPONENT type="1101" id="843" >
+<father id="868" num="0" />
<cdparam x="290" y="207" />
-<sizeparam width="117" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="117" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="133" minY="0" maxY="160" />
<infoparam name="TGComponent" value="SecureFV::T1" />
-<TGConnectingPoint num="0" id="833" />
-<TGConnectingPoint num="1" id="834" />
-<TGConnectingPoint num="2" id="835" />
-<TGConnectingPoint num="3" id="836" />
-<TGConnectingPoint num="4" id="837" />
-<TGConnectingPoint num="5" id="838" />
-<TGConnectingPoint num="6" id="839" />
-<TGConnectingPoint num="7" id="840" />
+<TGConnectingPoint num="0" id="835" />
+<TGConnectingPoint num="1" id="836" />
+<TGConnectingPoint num="2" id="837" />
+<TGConnectingPoint num="3" id="838" />
+<TGConnectingPoint num="4" id="839" />
+<TGConnectingPoint num="5" id="840" />
+<TGConnectingPoint num="6" id="841" />
+<TGConnectingPoint num="7" id="842" />
<extraparam>
-<info value="SecureFV::T1" taskName="T1" referenceTaskName="SecureFV" priority="0" operation="T1" fatherComponentMECType="0" />
+<info value="SecureFV::T1" taskName="T1" referenceTaskName="SecureFV" priority="0" operationMEC="T1" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="125" id="867" >
+<CONNECTOR type="125" id="869" >
<cdparam x="944" y="315" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="{info}" />
-<P1 x="938" y="324" id="822" />
-<P2 x="821" y="376" id="785" />
+<P1 x="938" y="324" id="824" />
+<P2 x="821" y="376" id="787" />
<AutomaticDrawing data="true" />
<extraparam>
<info priority="0" />
<spy value="false" />
</extraparam>
</CONNECTOR>
-<CONNECTOR type="125" id="868" >
+<CONNECTOR type="125" id="870" >
<cdparam x="425" y="317" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="{info}" />
-<P1 x="425" y="338" id="857" />
-<P2 x="571" y="376" id="784" />
+<P1 x="425" y="338" id="859" />
+<P2 x="571" y="376" id="786" />
<AutomaticDrawing data="true" />
<extraparam>
<info priority="0" />
<spy value="false" />
</extraparam>
</CONNECTOR>
-<CONNECTOR type="125" id="869" >
+<CONNECTOR type="125" id="871" >
<cdparam x="785" y="554" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="{info}" />
-<P1 x="696" y="511" id="741" />
-<P2 x="696" y="448" id="780" />
+<P1 x="696" y="511" id="743" />
+<P2 x="696" y="448" id="782" />
<AutomaticDrawing data="true" />
<extraparam>
<info priority="0" />
@@ -2047,7 +2055,7 @@
-<Modeling type="AVATAR Design" nameTab="SecurityMechanismDesign" >
+<Modeling type="AVATAR Design" nameTab="SecurityMechanismDesign" tabs="Block Diagram$System$T2$T1" >
<AVATARBlockDiagramPanel name="Block Diagram" minX="10" maxX="1900" minY="10" maxY="900" zoom="1.0" >
<MainCode value="void __user_init() {"/>
<MainCode value="}"/>
@@ -2055,15 +2063,15 @@
<Validated value="" />
<Ignored value="" />
-<CONNECTOR type="5002" id="875" >
+<CONNECTOR type="5002" id="877" >
<cdparam x="568" y="109" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Block0 to Block0" value="" />
-<TGConnectingPoint num="0" id="872" />
-<TGConnectingPoint num="1" id="873" />
-<TGConnectingPoint num="2" id="874" />
-<P1 x="459" y="88" id="972" />
-<P2 x="459" y="143" id="965" />
+<TGConnectingPoint num="0" id="874" />
+<TGConnectingPoint num="1" id="875" />
+<TGConnectingPoint num="2" id="876" />
+<P1 x="459" y="88" id="974" />
+<P2 x="459" y="143" id="967" />
<Point x="490" y="88" />
<Point x="490" y="143" />
<AutomaticDrawing data="true" />
@@ -2072,48 +2080,48 @@
<osd value="out chout(Message msg)" />
<FIFOType asynchronous="false" size="1" blocking="false" private="false" broadcast="false" lossy="false" />
</extraparam>
-</CONNECTOR><SUBCOMPONENT type="-1" id="870" >
-<father id="875" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="872" >
+<father id="877" num="0" />
<cdparam x="490" y="88" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="1" height="1" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="point " value="null" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="871" >
-<father id="875" num="1" />
+<SUBCOMPONENT type="-1" id="873" >
+<father id="877" num="1" />
<cdparam x="490" y="143" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="1" height="1" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="point " value="null" />
</SUBCOMPONENT>
-<COMPONENT type="302" id="892" >
+<COMPONENT type="302" id="894" >
<cdparam x="517" y="43" />
-<sizeparam width="260" height="84" minWidth="80" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="274" height="84" minWidth="80" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="900" />
<infoparam name="Proverif Pragma" value="#InitialSystemKnowledge T1.sk T2.sk
#Confidentiality T1.secretData
" />
-<TGConnectingPoint num="0" id="876" />
-<TGConnectingPoint num="1" id="877" />
-<TGConnectingPoint num="2" id="878" />
-<TGConnectingPoint num="3" id="879" />
-<TGConnectingPoint num="4" id="880" />
-<TGConnectingPoint num="5" id="881" />
-<TGConnectingPoint num="6" id="882" />
-<TGConnectingPoint num="7" id="883" />
-<TGConnectingPoint num="8" id="884" />
-<TGConnectingPoint num="9" id="885" />
-<TGConnectingPoint num="10" id="886" />
-<TGConnectingPoint num="11" id="887" />
-<TGConnectingPoint num="12" id="888" />
-<TGConnectingPoint num="13" id="889" />
-<TGConnectingPoint num="14" id="890" />
-<TGConnectingPoint num="15" id="891" />
+<TGConnectingPoint num="0" id="878" />
+<TGConnectingPoint num="1" id="879" />
+<TGConnectingPoint num="2" id="880" />
+<TGConnectingPoint num="3" id="881" />
+<TGConnectingPoint num="4" id="882" />
+<TGConnectingPoint num="5" id="883" />
+<TGConnectingPoint num="6" id="884" />
+<TGConnectingPoint num="7" id="885" />
+<TGConnectingPoint num="8" id="886" />
+<TGConnectingPoint num="9" id="887" />
+<TGConnectingPoint num="10" id="888" />
+<TGConnectingPoint num="11" id="889" />
+<TGConnectingPoint num="12" id="890" />
+<TGConnectingPoint num="13" id="891" />
+<TGConnectingPoint num="14" id="892" />
+<TGConnectingPoint num="15" id="893" />
<extraparam>
<Line value="#InitialSystemKnowledge T1.sk T2.sk" />
<Line value="" />
@@ -2121,117 +2129,119 @@
</extraparam>
</COMPONENT>
-<COMPONENT type="5003" id="901" >
+<COMPONENT type="5003" id="903" >
<cdparam x="260" y="262" />
<sizeparam width="129" height="61" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="900" />
<infoparam name="DataType0" value="Message" />
-<TGConnectingPoint num="0" id="893" />
-<TGConnectingPoint num="1" id="894" />
-<TGConnectingPoint num="2" id="895" />
-<TGConnectingPoint num="3" id="896" />
-<TGConnectingPoint num="4" id="897" />
-<TGConnectingPoint num="5" id="898" />
-<TGConnectingPoint num="6" id="899" />
-<TGConnectingPoint num="7" id="900" />
+<TGConnectingPoint num="0" id="895" />
+<TGConnectingPoint num="1" id="896" />
+<TGConnectingPoint num="2" id="897" />
+<TGConnectingPoint num="3" id="898" />
+<TGConnectingPoint num="4" id="899" />
+<TGConnectingPoint num="5" id="900" />
+<TGConnectingPoint num="6" id="901" />
+<TGConnectingPoint num="7" id="902" />
<extraparam>
<Attribute access="0" id="data" value="" type="8" typeOther="" />
</extraparam>
</COMPONENT>
-<COMPONENT type="5003" id="910" >
+<COMPONENT type="5003" id="912" >
<cdparam x="68" y="261" />
<sizeparam width="123" height="62" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="900" />
<infoparam name="DataType0" value="Key" />
-<TGConnectingPoint num="0" id="902" />
-<TGConnectingPoint num="1" id="903" />
-<TGConnectingPoint num="2" id="904" />
-<TGConnectingPoint num="3" id="905" />
-<TGConnectingPoint num="4" id="906" />
-<TGConnectingPoint num="5" id="907" />
-<TGConnectingPoint num="6" id="908" />
-<TGConnectingPoint num="7" id="909" />
+<TGConnectingPoint num="0" id="904" />
+<TGConnectingPoint num="1" id="905" />
+<TGConnectingPoint num="2" id="906" />
+<TGConnectingPoint num="3" id="907" />
+<TGConnectingPoint num="4" id="908" />
+<TGConnectingPoint num="5" id="909" />
+<TGConnectingPoint num="6" id="910" />
+<TGConnectingPoint num="7" id="911" />
<extraparam>
<Attribute access="0" id="data" value="" type="8" typeOther="" />
</extraparam>
</COMPONENT>
-<COMPONENT type="5000" id="985" >
+<COMPONENT type="5000" id="987" >
<cdparam x="21" y="34" />
<sizeparam width="438" height="219" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="900" />
<infoparam name="Block0" value="System" />
-<TGConnectingPoint num="0" id="961" />
-<TGConnectingPoint num="1" id="962" />
-<TGConnectingPoint num="2" id="963" />
-<TGConnectingPoint num="3" id="964" />
-<TGConnectingPoint num="4" id="965" />
-<TGConnectingPoint num="5" id="966" />
-<TGConnectingPoint num="6" id="967" />
-<TGConnectingPoint num="7" id="968" />
-<TGConnectingPoint num="8" id="969" />
-<TGConnectingPoint num="9" id="970" />
-<TGConnectingPoint num="10" id="971" />
-<TGConnectingPoint num="11" id="972" />
-<TGConnectingPoint num="12" id="973" />
-<TGConnectingPoint num="13" id="974" />
-<TGConnectingPoint num="14" id="975" />
-<TGConnectingPoint num="15" id="976" />
-<TGConnectingPoint num="16" id="977" />
-<TGConnectingPoint num="17" id="978" />
-<TGConnectingPoint num="18" id="979" />
-<TGConnectingPoint num="19" id="980" />
-<TGConnectingPoint num="20" id="981" />
-<TGConnectingPoint num="21" id="982" />
-<TGConnectingPoint num="22" id="983" />
-<TGConnectingPoint num="23" id="984" />
-<extraparam>
+<TGConnectingPoint num="0" id="963" />
+<TGConnectingPoint num="1" id="964" />
+<TGConnectingPoint num="2" id="965" />
+<TGConnectingPoint num="3" id="966" />
+<TGConnectingPoint num="4" id="967" />
+<TGConnectingPoint num="5" id="968" />
+<TGConnectingPoint num="6" id="969" />
+<TGConnectingPoint num="7" id="970" />
+<TGConnectingPoint num="8" id="971" />
+<TGConnectingPoint num="9" id="972" />
+<TGConnectingPoint num="10" id="973" />
+<TGConnectingPoint num="11" id="974" />
+<TGConnectingPoint num="12" id="975" />
+<TGConnectingPoint num="13" id="976" />
+<TGConnectingPoint num="14" id="977" />
+<TGConnectingPoint num="15" id="978" />
+<TGConnectingPoint num="16" id="979" />
+<TGConnectingPoint num="17" id="980" />
+<TGConnectingPoint num="18" id="981" />
+<TGConnectingPoint num="19" id="982" />
+<TGConnectingPoint num="20" id="983" />
+<TGConnectingPoint num="21" id="984" />
+<TGConnectingPoint num="22" id="985" />
+<TGConnectingPoint num="23" id="986" />
+<extraparam>
+<blockType data="block" color="-4072719" />
<CryptoBlock value="false" />
<Signal value="in chin(Message msg)" attached="true" />
<Signal value="out chout(Message msg)" attached="true" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="5000" id="935" >
-<father id="985" num="0" />
-<cdparam x="263" y="122" />
-<sizeparam width="139" height="126" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="5000" id="937" >
+<father id="987" num="0" />
+<cdparam x="36" y="122" />
+<sizeparam width="215" height="126" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="299" minY="0" maxY="93" />
-<infoparam name="Block0" value="T2" />
-<TGConnectingPoint num="0" id="911" />
-<TGConnectingPoint num="1" id="912" />
-<TGConnectingPoint num="2" id="913" />
-<TGConnectingPoint num="3" id="914" />
-<TGConnectingPoint num="4" id="915" />
-<TGConnectingPoint num="5" id="916" />
-<TGConnectingPoint num="6" id="917" />
-<TGConnectingPoint num="7" id="918" />
-<TGConnectingPoint num="8" id="919" />
-<TGConnectingPoint num="9" id="920" />
-<TGConnectingPoint num="10" id="921" />
-<TGConnectingPoint num="11" id="922" />
-<TGConnectingPoint num="12" id="923" />
-<TGConnectingPoint num="13" id="924" />
-<TGConnectingPoint num="14" id="925" />
-<TGConnectingPoint num="15" id="926" />
-<TGConnectingPoint num="16" id="927" />
-<TGConnectingPoint num="17" id="928" />
-<TGConnectingPoint num="18" id="929" />
-<TGConnectingPoint num="19" id="930" />
-<TGConnectingPoint num="20" id="931" />
-<TGConnectingPoint num="21" id="932" />
-<TGConnectingPoint num="22" id="933" />
-<TGConnectingPoint num="23" id="934" />
-<extraparam>
+<cdrectangleparam minX="0" maxX="223" minY="0" maxY="93" />
+<infoparam name="Block0" value="T1" />
+<TGConnectingPoint num="0" id="913" />
+<TGConnectingPoint num="1" id="914" />
+<TGConnectingPoint num="2" id="915" />
+<TGConnectingPoint num="3" id="916" />
+<TGConnectingPoint num="4" id="917" />
+<TGConnectingPoint num="5" id="918" />
+<TGConnectingPoint num="6" id="919" />
+<TGConnectingPoint num="7" id="920" />
+<TGConnectingPoint num="8" id="921" />
+<TGConnectingPoint num="9" id="922" />
+<TGConnectingPoint num="10" id="923" />
+<TGConnectingPoint num="11" id="924" />
+<TGConnectingPoint num="12" id="925" />
+<TGConnectingPoint num="13" id="926" />
+<TGConnectingPoint num="14" id="927" />
+<TGConnectingPoint num="15" id="928" />
+<TGConnectingPoint num="16" id="929" />
+<TGConnectingPoint num="17" id="930" />
+<TGConnectingPoint num="18" id="931" />
+<TGConnectingPoint num="19" id="932" />
+<TGConnectingPoint num="20" id="933" />
+<TGConnectingPoint num="21" id="934" />
+<TGConnectingPoint num="22" id="935" />
+<TGConnectingPoint num="23" id="936" />
+<extraparam>
+<blockType data="cryptoblock" color="-4072719" />
<CryptoBlock value="true" />
+<Attribute access="0" id="secretData" value="" type="8" typeOther="" />
<Attribute access="0" id="m" value="" type="5" typeOther="Message" />
-<Attribute access="0" id="m2" value="" type="5" typeOther="Message" />
+<Attribute access="0" id="m1" value="" type="5" typeOther="Message" />
<Attribute access="0" id="sk" value="" type="5" typeOther="Key" />
-<Attribute access="0" id="receivedData" value="" type="8" typeOther="" />
<Method value="Message encrypt(Message msg, Key k)" />
<Method value="Message decrypt(Message msg, Key k)" />
<Method value="Message sencrypt(Message msg, Key k)" />
@@ -2256,43 +2266,44 @@
<Method value="Message hash(Message msg)" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="5000" id="960" >
-<father id="985" num="1" />
-<cdparam x="36" y="122" />
-<sizeparam width="215" height="126" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="5000" id="962" >
+<father id="987" num="1" />
+<cdparam x="263" y="122" />
+<sizeparam width="139" height="126" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="223" minY="0" maxY="93" />
-<infoparam name="Block0" value="T1" />
-<TGConnectingPoint num="0" id="936" />
-<TGConnectingPoint num="1" id="937" />
-<TGConnectingPoint num="2" id="938" />
-<TGConnectingPoint num="3" id="939" />
-<TGConnectingPoint num="4" id="940" />
-<TGConnectingPoint num="5" id="941" />
-<TGConnectingPoint num="6" id="942" />
-<TGConnectingPoint num="7" id="943" />
-<TGConnectingPoint num="8" id="944" />
-<TGConnectingPoint num="9" id="945" />
-<TGConnectingPoint num="10" id="946" />
-<TGConnectingPoint num="11" id="947" />
-<TGConnectingPoint num="12" id="948" />
-<TGConnectingPoint num="13" id="949" />
-<TGConnectingPoint num="14" id="950" />
-<TGConnectingPoint num="15" id="951" />
-<TGConnectingPoint num="16" id="952" />
-<TGConnectingPoint num="17" id="953" />
-<TGConnectingPoint num="18" id="954" />
-<TGConnectingPoint num="19" id="955" />
-<TGConnectingPoint num="20" id="956" />
-<TGConnectingPoint num="21" id="957" />
-<TGConnectingPoint num="22" id="958" />
-<TGConnectingPoint num="23" id="959" />
-<extraparam>
+<cdrectangleparam minX="0" maxX="299" minY="0" maxY="93" />
+<infoparam name="Block0" value="T2" />
+<TGConnectingPoint num="0" id="938" />
+<TGConnectingPoint num="1" id="939" />
+<TGConnectingPoint num="2" id="940" />
+<TGConnectingPoint num="3" id="941" />
+<TGConnectingPoint num="4" id="942" />
+<TGConnectingPoint num="5" id="943" />
+<TGConnectingPoint num="6" id="944" />
+<TGConnectingPoint num="7" id="945" />
+<TGConnectingPoint num="8" id="946" />
+<TGConnectingPoint num="9" id="947" />
+<TGConnectingPoint num="10" id="948" />
+<TGConnectingPoint num="11" id="949" />
+<TGConnectingPoint num="12" id="950" />
+<TGConnectingPoint num="13" id="951" />
+<TGConnectingPoint num="14" id="952" />
+<TGConnectingPoint num="15" id="953" />
+<TGConnectingPoint num="16" id="954" />
+<TGConnectingPoint num="17" id="955" />
+<TGConnectingPoint num="18" id="956" />
+<TGConnectingPoint num="19" id="957" />
+<TGConnectingPoint num="20" id="958" />
+<TGConnectingPoint num="21" id="959" />
+<TGConnectingPoint num="22" id="960" />
+<TGConnectingPoint num="23" id="961" />
+<extraparam>
+<blockType data="cryptoblock" color="-4072719" />
<CryptoBlock value="true" />
-<Attribute access="0" id="secretData" value="" type="8" typeOther="" />
<Attribute access="0" id="m" value="" type="5" typeOther="Message" />
-<Attribute access="0" id="m1" value="" type="5" typeOther="Message" />
+<Attribute access="0" id="m2" value="" type="5" typeOther="Message" />
<Attribute access="0" id="sk" value="" type="5" typeOther="Key" />
+<Attribute access="0" id="receivedData" value="" type="8" typeOther="" />
<Method value="Message encrypt(Message msg, Key k)" />
<Method value="Message decrypt(Message msg, Key k)" />
<Method value="Message sencrypt(Message msg, Key k)" />
@@ -2322,559 +2333,566 @@
</AVATARBlockDiagramPanel>
<AVATARStateMachineDiagramPanel name="System" minX="10" maxX="1400" minY="10" maxY="900" >
-<COMPONENT type="5100" id="987" >
+<COMPONENT type="5100" id="989" >
<cdparam x="400" y="50" />
-<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="986" />
+<TGConnectingPoint num="0" id="988" />
</COMPONENT>
</AVATARStateMachineDiagramPanel>
-<AVATARStateMachineDiagramPanel name="T1" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="5102" id="994" >
-<cdparam x="407" y="310" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="993" />
-<P1 x="407" y="310" id="1065" />
-<P2 x="407" y="356" id="1024" />
+<AVATARStateMachineDiagramPanel name="T2" minX="10" maxX="1400" minY="10" maxY="900" >
+<CONNECTOR type="5102" id="996" >
+<cdparam x="416" y="379" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from state0 to state0" value="null" />
+<TGConnectingPoint num="0" id="995" />
+<P1 x="407" y="379" id="1031" />
+<P2 x="407" y="424" id="1067" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="992" >
-<father id="994" num="0" />
-<cdparam x="449" y="353" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="994" >
+<father id="996" num="0" />
+<cdparam x="431" y="403" />
+<sizeparam width="145" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
+<enabled value="true" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="988" />
-<TGConnectingPoint num="1" id="989" />
-<TGConnectingPoint num="2" id="990" />
-<TGConnectingPoint num="3" id="991" />
-<extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-<probability value="" />
+<TGConnectingPoint num="0" id="990" />
+<TGConnectingPoint num="1" id="991" />
+<TGConnectingPoint num="2" id="992" />
+<TGConnectingPoint num="3" id="993" />
+<extraparam>
+<guard value="[ ]" enabled="true"/>
+<afterMin value="" enabled="true"/>
+<afterMax value="" enabled="true"/>
+<computeMin value="" enabled="true"/>
+<computeMax value="" enabled="true"/>
+<probability value="" enabled="true"/>
+<actions value="receivedData = m.data" enabled="true"/>
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="1001" >
-<cdparam x="492" y="446" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="1000" />
-<P1 x="407" y="406" id="1029" />
-<P2 x="407" y="451" id="1075" />
+<CONNECTOR type="5102" id="1003" >
+<cdparam x="407" y="273" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from state0 to state0" value="null" />
+<TGConnectingPoint num="0" id="1002" />
+<P1 x="407" y="273" id="1113" />
+<P2 x="407" y="339" id="1026" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="999" >
-<father id="1001" num="0" />
-<cdparam x="449" y="440" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1001" >
+<father id="1003" num="0" />
+<cdparam x="419" y="312" />
+<sizeparam width="134" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
+<enabled value="true" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="995" />
-<TGConnectingPoint num="1" id="996" />
-<TGConnectingPoint num="2" id="997" />
-<TGConnectingPoint num="3" id="998" />
-<extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-<probability value="" />
+<TGConnectingPoint num="0" id="997" />
+<TGConnectingPoint num="1" id="998" />
+<TGConnectingPoint num="2" id="999" />
+<TGConnectingPoint num="3" id="1000" />
+<extraparam>
+<guard value="[ ]" enabled="true"/>
+<afterMin value="" enabled="true"/>
+<afterMax value="" enabled="true"/>
+<computeMin value="" enabled="true"/>
+<computeMax value="" enabled="true"/>
+<probability value="" enabled="true"/>
+<actions value="m = sdecrypt(m2, sk)" enabled="true"/>
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="1008" >
-<cdparam x="407" y="251" />
+<CONNECTOR type="5102" id="1010" >
+<cdparam x="406" y="201" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to stop state" value="null" />
-<TGConnectingPoint num="0" id="1007" />
-<P1 x="407" y="251" id="1083" />
-<P2 x="407" y="280" id="1064" />
+<infoparam name="connector from Send signal to state0" value="null" />
+<TGConnectingPoint num="0" id="1009" />
+<P1 x="407" y="201" id="1149" />
+<P2 x="407" y="233" id="1108" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1006" >
-<father id="1008" num="0" />
-<cdparam x="407" y="291" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1008" >
+<father id="1010" num="0" />
+<cdparam x="406" y="241" />
+<sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
+<enabled value="true" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1002" />
-<TGConnectingPoint num="1" id="1003" />
-<TGConnectingPoint num="2" id="1004" />
-<TGConnectingPoint num="3" id="1005" />
-<extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-<probability value="" />
+<TGConnectingPoint num="0" id="1004" />
+<TGConnectingPoint num="1" id="1005" />
+<TGConnectingPoint num="2" id="1006" />
+<TGConnectingPoint num="3" id="1007" />
+<extraparam>
+<guard value="[ ]" enabled="true"/>
+<afterMin value="" enabled="true"/>
+<afterMax value="" enabled="true"/>
+<computeMin value="" enabled="true"/>
+<computeMax value="" enabled="true"/>
+<probability value="" enabled="true"/>
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="1015" >
-<cdparam x="407" y="132" />
+<CONNECTOR type="5102" id="1017" >
+<cdparam x="406" y="141" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="1014" />
-<P1 x="407" y="132" id="1124" />
-<P2 x="407" y="211" id="1078" />
+<infoparam name="connector from state0 to Send signal" value="null" />
+<TGConnectingPoint num="0" id="1016" />
+<P1 x="407" y="141" id="1165" />
+<P2 x="407" y="171" id="1148" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1013" >
-<father id="1015" num="0" />
-<cdparam x="415" y="162" />
-<sizeparam width="134" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1015" >
+<father id="1017" num="0" />
+<cdparam x="406" y="181" />
+<sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
+<enabled value="true" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1009" />
-<TGConnectingPoint num="1" id="1010" />
-<TGConnectingPoint num="2" id="1011" />
-<TGConnectingPoint num="3" id="1012" />
-<extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-<probability value="" />
-<actions value="m.data = secretData" />
-<actions value="m1 = sencrypt(m, sk)" />
+<TGConnectingPoint num="0" id="1011" />
+<TGConnectingPoint num="1" id="1012" />
+<TGConnectingPoint num="2" id="1013" />
+<TGConnectingPoint num="3" id="1014" />
+<extraparam>
+<guard value="[ ]" enabled="true"/>
+<afterMin value="" enabled="true"/>
+<afterMax value="" enabled="true"/>
+<computeMin value="" enabled="true"/>
+<computeMax value="" enabled="true"/>
+<probability value="" enabled="true"/>
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="1022" >
+<CONNECTOR type="5102" id="1024" >
<cdparam x="407" y="70" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from start state to state0" value="null" />
-<TGConnectingPoint num="0" id="1021" />
-<P1 x="407" y="70" id="1159" />
-<P2 x="407" y="92" id="1119" />
+<TGConnectingPoint num="0" id="1023" />
+<P1 x="407" y="70" id="1200" />
+<P2 x="407" y="102" id="1160" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1020" >
-<father id="1022" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1022" >
+<father id="1024" num="0" />
<cdparam x="407" y="110" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
+<enabled value="true" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1016" />
-<TGConnectingPoint num="1" id="1017" />
-<TGConnectingPoint num="2" id="1018" />
-<TGConnectingPoint num="3" id="1019" />
-<extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-<probability value="" />
+<TGConnectingPoint num="0" id="1018" />
+<TGConnectingPoint num="1" id="1019" />
+<TGConnectingPoint num="2" id="1020" />
+<TGConnectingPoint num="3" id="1021" />
+<extraparam>
+<guard value="[ ]" enabled="true"/>
+<afterMin value="" enabled="true"/>
+<afterMax value="" enabled="true"/>
+<computeMin value="" enabled="true"/>
+<computeMax value="" enabled="true"/>
+<probability value="" enabled="true"/>
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="5106" id="1063" >
-<cdparam x="357" y="356" />
-<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="1065" >
+<cdparam x="318" y="339" />
+<sizeparam width="178" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
+<enabled value="true" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="State" value="beforeFinish" />
-<TGConnectingPoint num="0" id="1023" />
-<TGConnectingPoint num="1" id="1024" />
-<TGConnectingPoint num="2" id="1025" />
-<TGConnectingPoint num="3" id="1026" />
-<TGConnectingPoint num="4" id="1027" />
-<TGConnectingPoint num="5" id="1028" />
-<TGConnectingPoint num="6" id="1029" />
-<TGConnectingPoint num="7" id="1030" />
-<TGConnectingPoint num="8" id="1031" />
-<TGConnectingPoint num="9" id="1032" />
-<TGConnectingPoint num="10" id="1033" />
-<TGConnectingPoint num="11" id="1034" />
-<TGConnectingPoint num="12" id="1035" />
-<TGConnectingPoint num="13" id="1036" />
-<TGConnectingPoint num="14" id="1037" />
-<TGConnectingPoint num="15" id="1038" />
-<TGConnectingPoint num="16" id="1039" />
-<TGConnectingPoint num="17" id="1040" />
-<TGConnectingPoint num="18" id="1041" />
-<TGConnectingPoint num="19" id="1042" />
-<TGConnectingPoint num="20" id="1043" />
-<TGConnectingPoint num="21" id="1044" />
-<TGConnectingPoint num="22" id="1045" />
-<TGConnectingPoint num="23" id="1046" />
-<TGConnectingPoint num="24" id="1047" />
-<TGConnectingPoint num="25" id="1048" />
-<TGConnectingPoint num="26" id="1049" />
-<TGConnectingPoint num="27" id="1050" />
-<TGConnectingPoint num="28" id="1051" />
-<TGConnectingPoint num="29" id="1052" />
-<TGConnectingPoint num="30" id="1053" />
-<TGConnectingPoint num="31" id="1054" />
-<TGConnectingPoint num="32" id="1055" />
-<TGConnectingPoint num="33" id="1056" />
-<TGConnectingPoint num="34" id="1057" />
-<TGConnectingPoint num="35" id="1058" />
-<TGConnectingPoint num="36" id="1059" />
-<TGConnectingPoint num="37" id="1060" />
-<TGConnectingPoint num="38" id="1061" />
-<TGConnectingPoint num="39" id="1062" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5103" id="1074" >
-<cdparam x="370" y="285" />
-<sizeparam width="75" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="state0" value="messageDecrypted" />
+<TGConnectingPoint num="0" id="1025" />
+<TGConnectingPoint num="1" id="1026" />
+<TGConnectingPoint num="2" id="1027" />
+<TGConnectingPoint num="3" id="1028" />
+<TGConnectingPoint num="4" id="1029" />
+<TGConnectingPoint num="5" id="1030" />
+<TGConnectingPoint num="6" id="1031" />
+<TGConnectingPoint num="7" id="1032" />
+<TGConnectingPoint num="8" id="1033" />
+<TGConnectingPoint num="9" id="1034" />
+<TGConnectingPoint num="10" id="1035" />
+<TGConnectingPoint num="11" id="1036" />
+<TGConnectingPoint num="12" id="1037" />
+<TGConnectingPoint num="13" id="1038" />
+<TGConnectingPoint num="14" id="1039" />
+<TGConnectingPoint num="15" id="1040" />
+<TGConnectingPoint num="16" id="1041" />
+<TGConnectingPoint num="17" id="1042" />
+<TGConnectingPoint num="18" id="1043" />
+<TGConnectingPoint num="19" id="1044" />
+<TGConnectingPoint num="20" id="1045" />
+<TGConnectingPoint num="21" id="1046" />
+<TGConnectingPoint num="22" id="1047" />
+<TGConnectingPoint num="23" id="1048" />
+<TGConnectingPoint num="24" id="1049" />
+<TGConnectingPoint num="25" id="1050" />
+<TGConnectingPoint num="26" id="1051" />
+<TGConnectingPoint num="27" id="1052" />
+<TGConnectingPoint num="28" id="1053" />
+<TGConnectingPoint num="29" id="1054" />
+<TGConnectingPoint num="30" id="1055" />
+<TGConnectingPoint num="31" id="1056" />
+<TGConnectingPoint num="32" id="1057" />
+<TGConnectingPoint num="33" id="1058" />
+<TGConnectingPoint num="34" id="1059" />
+<TGConnectingPoint num="35" id="1060" />
+<TGConnectingPoint num="36" id="1061" />
+<TGConnectingPoint num="37" id="1062" />
+<TGConnectingPoint num="38" id="1063" />
+<TGConnectingPoint num="39" id="1064" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5106" id="1106" >
+<cdparam x="337" y="424" />
+<sizeparam width="140" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
+<enabled value="true" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="Send signal" value="chout(m1)" />
-<TGConnectingPoint num="0" id="1064" />
-<TGConnectingPoint num="1" id="1065" />
-<TGConnectingPoint num="2" id="1066" />
-<TGConnectingPoint num="3" id="1067" />
-<TGConnectingPoint num="4" id="1068" />
-<TGConnectingPoint num="5" id="1069" />
-<TGConnectingPoint num="6" id="1070" />
-<TGConnectingPoint num="7" id="1071" />
-<TGConnectingPoint num="8" id="1072" />
-<TGConnectingPoint num="9" id="1073" />
-</COMPONENT>
-
-<COMPONENT type="5101" id="1076" >
-<cdparam x="397" y="456" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="state0" value="SecretDataReceived" />
+<TGConnectingPoint num="0" id="1066" />
+<TGConnectingPoint num="1" id="1067" />
+<TGConnectingPoint num="2" id="1068" />
+<TGConnectingPoint num="3" id="1069" />
+<TGConnectingPoint num="4" id="1070" />
+<TGConnectingPoint num="5" id="1071" />
+<TGConnectingPoint num="6" id="1072" />
+<TGConnectingPoint num="7" id="1073" />
+<TGConnectingPoint num="8" id="1074" />
+<TGConnectingPoint num="9" id="1075" />
+<TGConnectingPoint num="10" id="1076" />
+<TGConnectingPoint num="11" id="1077" />
+<TGConnectingPoint num="12" id="1078" />
+<TGConnectingPoint num="13" id="1079" />
+<TGConnectingPoint num="14" id="1080" />
+<TGConnectingPoint num="15" id="1081" />
+<TGConnectingPoint num="16" id="1082" />
+<TGConnectingPoint num="17" id="1083" />
+<TGConnectingPoint num="18" id="1084" />
+<TGConnectingPoint num="19" id="1085" />
+<TGConnectingPoint num="20" id="1086" />
+<TGConnectingPoint num="21" id="1087" />
+<TGConnectingPoint num="22" id="1088" />
+<TGConnectingPoint num="23" id="1089" />
+<TGConnectingPoint num="24" id="1090" />
+<TGConnectingPoint num="25" id="1091" />
+<TGConnectingPoint num="26" id="1092" />
+<TGConnectingPoint num="27" id="1093" />
+<TGConnectingPoint num="28" id="1094" />
+<TGConnectingPoint num="29" id="1095" />
+<TGConnectingPoint num="30" id="1096" />
+<TGConnectingPoint num="31" id="1097" />
+<TGConnectingPoint num="32" id="1098" />
+<TGConnectingPoint num="33" id="1099" />
+<TGConnectingPoint num="34" id="1100" />
+<TGConnectingPoint num="35" id="1101" />
+<TGConnectingPoint num="36" id="1102" />
+<TGConnectingPoint num="37" id="1103" />
+<TGConnectingPoint num="38" id="1104" />
+<TGConnectingPoint num="39" id="1105" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5106" id="1147" >
+<cdparam x="336" y="233" />
+<sizeparam width="142" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
+<enabled value="true" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1075" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="1117" >
-<cdparam x="336" y="211" />
-<sizeparam width="143" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="state0" value="messageDecrypt" />
+<TGConnectingPoint num="0" id="1107" />
+<TGConnectingPoint num="1" id="1108" />
+<TGConnectingPoint num="2" id="1109" />
+<TGConnectingPoint num="3" id="1110" />
+<TGConnectingPoint num="4" id="1111" />
+<TGConnectingPoint num="5" id="1112" />
+<TGConnectingPoint num="6" id="1113" />
+<TGConnectingPoint num="7" id="1114" />
+<TGConnectingPoint num="8" id="1115" />
+<TGConnectingPoint num="9" id="1116" />
+<TGConnectingPoint num="10" id="1117" />
+<TGConnectingPoint num="11" id="1118" />
+<TGConnectingPoint num="12" id="1119" />
+<TGConnectingPoint num="13" id="1120" />
+<TGConnectingPoint num="14" id="1121" />
+<TGConnectingPoint num="15" id="1122" />
+<TGConnectingPoint num="16" id="1123" />
+<TGConnectingPoint num="17" id="1124" />
+<TGConnectingPoint num="18" id="1125" />
+<TGConnectingPoint num="19" id="1126" />
+<TGConnectingPoint num="20" id="1127" />
+<TGConnectingPoint num="21" id="1128" />
+<TGConnectingPoint num="22" id="1129" />
+<TGConnectingPoint num="23" id="1130" />
+<TGConnectingPoint num="24" id="1131" />
+<TGConnectingPoint num="25" id="1132" />
+<TGConnectingPoint num="26" id="1133" />
+<TGConnectingPoint num="27" id="1134" />
+<TGConnectingPoint num="28" id="1135" />
+<TGConnectingPoint num="29" id="1136" />
+<TGConnectingPoint num="30" id="1137" />
+<TGConnectingPoint num="31" id="1138" />
+<TGConnectingPoint num="32" id="1139" />
+<TGConnectingPoint num="33" id="1140" />
+<TGConnectingPoint num="34" id="1141" />
+<TGConnectingPoint num="35" id="1142" />
+<TGConnectingPoint num="36" id="1143" />
+<TGConnectingPoint num="37" id="1144" />
+<TGConnectingPoint num="38" id="1145" />
+<TGConnectingPoint num="39" id="1146" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5104" id="1158" >
+<cdparam x="371" y="176" />
+<sizeparam width="73" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
+<enabled value="true" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="state0" value="sendingMessage" />
-<TGConnectingPoint num="0" id="1077" />
-<TGConnectingPoint num="1" id="1078" />
-<TGConnectingPoint num="2" id="1079" />
-<TGConnectingPoint num="3" id="1080" />
-<TGConnectingPoint num="4" id="1081" />
-<TGConnectingPoint num="5" id="1082" />
-<TGConnectingPoint num="6" id="1083" />
-<TGConnectingPoint num="7" id="1084" />
-<TGConnectingPoint num="8" id="1085" />
-<TGConnectingPoint num="9" id="1086" />
-<TGConnectingPoint num="10" id="1087" />
-<TGConnectingPoint num="11" id="1088" />
-<TGConnectingPoint num="12" id="1089" />
-<TGConnectingPoint num="13" id="1090" />
-<TGConnectingPoint num="14" id="1091" />
-<TGConnectingPoint num="15" id="1092" />
-<TGConnectingPoint num="16" id="1093" />
-<TGConnectingPoint num="17" id="1094" />
-<TGConnectingPoint num="18" id="1095" />
-<TGConnectingPoint num="19" id="1096" />
-<TGConnectingPoint num="20" id="1097" />
-<TGConnectingPoint num="21" id="1098" />
-<TGConnectingPoint num="22" id="1099" />
-<TGConnectingPoint num="23" id="1100" />
-<TGConnectingPoint num="24" id="1101" />
-<TGConnectingPoint num="25" id="1102" />
-<TGConnectingPoint num="26" id="1103" />
-<TGConnectingPoint num="27" id="1104" />
-<TGConnectingPoint num="28" id="1105" />
-<TGConnectingPoint num="29" id="1106" />
-<TGConnectingPoint num="30" id="1107" />
-<TGConnectingPoint num="31" id="1108" />
-<TGConnectingPoint num="32" id="1109" />
-<TGConnectingPoint num="33" id="1110" />
-<TGConnectingPoint num="34" id="1111" />
-<TGConnectingPoint num="35" id="1112" />
-<TGConnectingPoint num="36" id="1113" />
-<TGConnectingPoint num="37" id="1114" />
-<TGConnectingPoint num="38" id="1115" />
-<TGConnectingPoint num="39" id="1116" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5106" id="1158" >
-<cdparam x="340" y="92" />
-<sizeparam width="134" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="Send signal" value="chin(m2)" />
+<TGConnectingPoint num="0" id="1148" />
+<TGConnectingPoint num="1" id="1149" />
+<TGConnectingPoint num="2" id="1150" />
+<TGConnectingPoint num="3" id="1151" />
+<TGConnectingPoint num="4" id="1152" />
+<TGConnectingPoint num="5" id="1153" />
+<TGConnectingPoint num="6" id="1154" />
+<TGConnectingPoint num="7" id="1155" />
+<TGConnectingPoint num="8" id="1156" />
+<TGConnectingPoint num="9" id="1157" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="1199" >
+<cdparam x="333" y="102" />
+<sizeparam width="149" height="39" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
+<enabled value="true" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="state0" value="makingMessage" />
-<TGConnectingPoint num="0" id="1118" />
-<TGConnectingPoint num="1" id="1119" />
-<TGConnectingPoint num="2" id="1120" />
-<TGConnectingPoint num="3" id="1121" />
-<TGConnectingPoint num="4" id="1122" />
-<TGConnectingPoint num="5" id="1123" />
-<TGConnectingPoint num="6" id="1124" />
-<TGConnectingPoint num="7" id="1125" />
-<TGConnectingPoint num="8" id="1126" />
-<TGConnectingPoint num="9" id="1127" />
-<TGConnectingPoint num="10" id="1128" />
-<TGConnectingPoint num="11" id="1129" />
-<TGConnectingPoint num="12" id="1130" />
-<TGConnectingPoint num="13" id="1131" />
-<TGConnectingPoint num="14" id="1132" />
-<TGConnectingPoint num="15" id="1133" />
-<TGConnectingPoint num="16" id="1134" />
-<TGConnectingPoint num="17" id="1135" />
-<TGConnectingPoint num="18" id="1136" />
-<TGConnectingPoint num="19" id="1137" />
-<TGConnectingPoint num="20" id="1138" />
-<TGConnectingPoint num="21" id="1139" />
-<TGConnectingPoint num="22" id="1140" />
-<TGConnectingPoint num="23" id="1141" />
-<TGConnectingPoint num="24" id="1142" />
-<TGConnectingPoint num="25" id="1143" />
-<TGConnectingPoint num="26" id="1144" />
-<TGConnectingPoint num="27" id="1145" />
-<TGConnectingPoint num="28" id="1146" />
-<TGConnectingPoint num="29" id="1147" />
-<TGConnectingPoint num="30" id="1148" />
-<TGConnectingPoint num="31" id="1149" />
-<TGConnectingPoint num="32" id="1150" />
-<TGConnectingPoint num="33" id="1151" />
-<TGConnectingPoint num="34" id="1152" />
-<TGConnectingPoint num="35" id="1153" />
-<TGConnectingPoint num="36" id="1154" />
-<TGConnectingPoint num="37" id="1155" />
-<TGConnectingPoint num="38" id="1156" />
-<TGConnectingPoint num="39" id="1157" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5100" id="1160" >
+<infoparam name="state0" value="waitingForMessage" />
+<TGConnectingPoint num="0" id="1159" />
+<TGConnectingPoint num="1" id="1160" />
+<TGConnectingPoint num="2" id="1161" />
+<TGConnectingPoint num="3" id="1162" />
+<TGConnectingPoint num="4" id="1163" />
+<TGConnectingPoint num="5" id="1164" />
+<TGConnectingPoint num="6" id="1165" />
+<TGConnectingPoint num="7" id="1166" />
+<TGConnectingPoint num="8" id="1167" />
+<TGConnectingPoint num="9" id="1168" />
+<TGConnectingPoint num="10" id="1169" />
+<TGConnectingPoint num="11" id="1170" />
+<TGConnectingPoint num="12" id="1171" />
+<TGConnectingPoint num="13" id="1172" />
+<TGConnectingPoint num="14" id="1173" />
+<TGConnectingPoint num="15" id="1174" />
+<TGConnectingPoint num="16" id="1175" />
+<TGConnectingPoint num="17" id="1176" />
+<TGConnectingPoint num="18" id="1177" />
+<TGConnectingPoint num="19" id="1178" />
+<TGConnectingPoint num="20" id="1179" />
+<TGConnectingPoint num="21" id="1180" />
+<TGConnectingPoint num="22" id="1181" />
+<TGConnectingPoint num="23" id="1182" />
+<TGConnectingPoint num="24" id="1183" />
+<TGConnectingPoint num="25" id="1184" />
+<TGConnectingPoint num="26" id="1185" />
+<TGConnectingPoint num="27" id="1186" />
+<TGConnectingPoint num="28" id="1187" />
+<TGConnectingPoint num="29" id="1188" />
+<TGConnectingPoint num="30" id="1189" />
+<TGConnectingPoint num="31" id="1190" />
+<TGConnectingPoint num="32" id="1191" />
+<TGConnectingPoint num="33" id="1192" />
+<TGConnectingPoint num="34" id="1193" />
+<TGConnectingPoint num="35" id="1194" />
+<TGConnectingPoint num="36" id="1195" />
+<TGConnectingPoint num="37" id="1196" />
+<TGConnectingPoint num="38" id="1197" />
+<TGConnectingPoint num="39" id="1198" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5100" id="1201" >
<cdparam x="400" y="50" />
-<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="1159" />
+<TGConnectingPoint num="0" id="1200" />
</COMPONENT>
</AVATARStateMachineDiagramPanel>
-<AVATARStateMachineDiagramPanel name="T2" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="5102" id="1167" >
-<cdparam x="416" y="379" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="1166" />
-<P1 x="407" y="379" id="1202" />
-<P2 x="407" y="424" id="1238" />
+<AVATARStateMachineDiagramPanel name="T1" minX="10" maxX="1400" minY="10" maxY="900" >
+<CONNECTOR type="5102" id="1208" >
+<cdparam x="407" y="310" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="null" />
+<TGConnectingPoint num="0" id="1207" />
+<P1 x="407" y="310" id="1279" />
+<P2 x="407" y="356" id="1238" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1165" >
-<father id="1167" num="0" />
-<cdparam x="431" y="403" />
-<sizeparam width="145" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1206" >
+<father id="1208" num="0" />
+<cdparam x="449" y="353" />
+<sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
+<enabled value="true" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1161" />
-<TGConnectingPoint num="1" id="1162" />
-<TGConnectingPoint num="2" id="1163" />
-<TGConnectingPoint num="3" id="1164" />
-<extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-<probability value="" />
-<actions value="receivedData = m.data" />
+<TGConnectingPoint num="0" id="1202" />
+<TGConnectingPoint num="1" id="1203" />
+<TGConnectingPoint num="2" id="1204" />
+<TGConnectingPoint num="3" id="1205" />
+<extraparam>
+<guard value="[ ]" enabled="true"/>
+<afterMin value="" enabled="true"/>
+<afterMax value="" enabled="true"/>
+<computeMin value="" enabled="true"/>
+<computeMax value="" enabled="true"/>
+<probability value="" enabled="true"/>
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="1174" >
-<cdparam x="407" y="273" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="1173" />
-<P1 x="407" y="273" id="1284" />
-<P2 x="407" y="339" id="1197" />
+<CONNECTOR type="5102" id="1215" >
+<cdparam x="492" y="446" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="null" />
+<TGConnectingPoint num="0" id="1214" />
+<P1 x="407" y="406" id="1243" />
+<P2 x="407" y="451" id="1289" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1172" >
-<father id="1174" num="0" />
-<cdparam x="419" y="312" />
-<sizeparam width="134" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1213" >
+<father id="1215" num="0" />
+<cdparam x="449" y="440" />
+<sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
+<enabled value="true" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1168" />
-<TGConnectingPoint num="1" id="1169" />
-<TGConnectingPoint num="2" id="1170" />
-<TGConnectingPoint num="3" id="1171" />
-<extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-<probability value="" />
-<actions value="m = sdecrypt(m2, sk)" />
+<TGConnectingPoint num="0" id="1209" />
+<TGConnectingPoint num="1" id="1210" />
+<TGConnectingPoint num="2" id="1211" />
+<TGConnectingPoint num="3" id="1212" />
+<extraparam>
+<guard value="[ ]" enabled="true"/>
+<afterMin value="" enabled="true"/>
+<afterMax value="" enabled="true"/>
+<computeMin value="" enabled="true"/>
+<computeMax value="" enabled="true"/>
+<probability value="" enabled="true"/>
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="1181" >
-<cdparam x="406" y="201" />
+<CONNECTOR type="5102" id="1222" >
+<cdparam x="407" y="251" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="1180" />
-<P1 x="407" y="201" id="1320" />
-<P2 x="407" y="233" id="1279" />
+<infoparam name="connector from state0 to stop state" value="null" />
+<TGConnectingPoint num="0" id="1221" />
+<P1 x="407" y="251" id="1297" />
+<P2 x="407" y="280" id="1278" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1179" >
-<father id="1181" num="0" />
-<cdparam x="406" y="241" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1220" >
+<father id="1222" num="0" />
+<cdparam x="407" y="291" />
+<sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
+<enabled value="true" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1175" />
-<TGConnectingPoint num="1" id="1176" />
-<TGConnectingPoint num="2" id="1177" />
-<TGConnectingPoint num="3" id="1178" />
-<extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-<probability value="" />
+<TGConnectingPoint num="0" id="1216" />
+<TGConnectingPoint num="1" id="1217" />
+<TGConnectingPoint num="2" id="1218" />
+<TGConnectingPoint num="3" id="1219" />
+<extraparam>
+<guard value="[ ]" enabled="true"/>
+<afterMin value="" enabled="true"/>
+<afterMax value="" enabled="true"/>
+<computeMin value="" enabled="true"/>
+<computeMax value="" enabled="true"/>
+<probability value="" enabled="true"/>
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="1188" >
-<cdparam x="406" y="141" />
+<CONNECTOR type="5102" id="1229" >
+<cdparam x="407" y="132" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="1187" />
-<P1 x="407" y="141" id="1336" />
-<P2 x="407" y="171" id="1319" />
+<infoparam name="connector from state0 to state0" value="null" />
+<TGConnectingPoint num="0" id="1228" />
+<P1 x="407" y="132" id="1338" />
+<P2 x="407" y="211" id="1292" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1186" >
-<father id="1188" num="0" />
-<cdparam x="406" y="181" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1227" >
+<father id="1229" num="0" />
+<cdparam x="415" y="162" />
+<sizeparam width="134" height="30" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
+<enabled value="true" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1182" />
-<TGConnectingPoint num="1" id="1183" />
-<TGConnectingPoint num="2" id="1184" />
-<TGConnectingPoint num="3" id="1185" />
-<extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-<probability value="" />
+<TGConnectingPoint num="0" id="1223" />
+<TGConnectingPoint num="1" id="1224" />
+<TGConnectingPoint num="2" id="1225" />
+<TGConnectingPoint num="3" id="1226" />
+<extraparam>
+<guard value="[ ]" enabled="true"/>
+<afterMin value="" enabled="true"/>
+<afterMax value="" enabled="true"/>
+<computeMin value="" enabled="true"/>
+<computeMax value="" enabled="true"/>
+<probability value="" enabled="true"/>
+<actions value="m.data = secretData" enabled="true"/>
+<actions value="m1 = sencrypt(m, sk)" enabled="true"/>
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="1195" >
+<CONNECTOR type="5102" id="1236" >
<cdparam x="407" y="70" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from start state to state0" value="null" />
-<TGConnectingPoint num="0" id="1194" />
-<P1 x="407" y="70" id="1371" />
-<P2 x="407" y="102" id="1331" />
+<TGConnectingPoint num="0" id="1235" />
+<P1 x="407" y="70" id="1373" />
+<P2 x="407" y="92" id="1333" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1193" >
-<father id="1195" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1234" >
+<father id="1236" num="0" />
<cdparam x="407" y="110" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
+<enabled value="true" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1189" />
-<TGConnectingPoint num="1" id="1190" />
-<TGConnectingPoint num="2" id="1191" />
-<TGConnectingPoint num="3" id="1192" />
-<extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-<probability value="" />
+<TGConnectingPoint num="0" id="1230" />
+<TGConnectingPoint num="1" id="1231" />
+<TGConnectingPoint num="2" id="1232" />
+<TGConnectingPoint num="3" id="1233" />
+<extraparam>
+<guard value="[ ]" enabled="true"/>
+<afterMin value="" enabled="true"/>
+<afterMax value="" enabled="true"/>
+<computeMin value="" enabled="true"/>
+<computeMax value="" enabled="true"/>
+<probability value="" enabled="true"/>
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="5106" id="1236" >
-<cdparam x="318" y="339" />
-<sizeparam width="178" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="state0" value="messageDecrypted" />
-<TGConnectingPoint num="0" id="1196" />
-<TGConnectingPoint num="1" id="1197" />
-<TGConnectingPoint num="2" id="1198" />
-<TGConnectingPoint num="3" id="1199" />
-<TGConnectingPoint num="4" id="1200" />
-<TGConnectingPoint num="5" id="1201" />
-<TGConnectingPoint num="6" id="1202" />
-<TGConnectingPoint num="7" id="1203" />
-<TGConnectingPoint num="8" id="1204" />
-<TGConnectingPoint num="9" id="1205" />
-<TGConnectingPoint num="10" id="1206" />
-<TGConnectingPoint num="11" id="1207" />
-<TGConnectingPoint num="12" id="1208" />
-<TGConnectingPoint num="13" id="1209" />
-<TGConnectingPoint num="14" id="1210" />
-<TGConnectingPoint num="15" id="1211" />
-<TGConnectingPoint num="16" id="1212" />
-<TGConnectingPoint num="17" id="1213" />
-<TGConnectingPoint num="18" id="1214" />
-<TGConnectingPoint num="19" id="1215" />
-<TGConnectingPoint num="20" id="1216" />
-<TGConnectingPoint num="21" id="1217" />
-<TGConnectingPoint num="22" id="1218" />
-<TGConnectingPoint num="23" id="1219" />
-<TGConnectingPoint num="24" id="1220" />
-<TGConnectingPoint num="25" id="1221" />
-<TGConnectingPoint num="26" id="1222" />
-<TGConnectingPoint num="27" id="1223" />
-<TGConnectingPoint num="28" id="1224" />
-<TGConnectingPoint num="29" id="1225" />
-<TGConnectingPoint num="30" id="1226" />
-<TGConnectingPoint num="31" id="1227" />
-<TGConnectingPoint num="32" id="1228" />
-<TGConnectingPoint num="33" id="1229" />
-<TGConnectingPoint num="34" id="1230" />
-<TGConnectingPoint num="35" id="1231" />
-<TGConnectingPoint num="36" id="1232" />
-<TGConnectingPoint num="37" id="1233" />
-<TGConnectingPoint num="38" id="1234" />
-<TGConnectingPoint num="39" id="1235" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
<COMPONENT type="5106" id="1277" >
-<cdparam x="337" y="424" />
-<sizeparam width="140" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="357" y="356" />
+<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
+<enabled value="true" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="state0" value="SecretDataReceived" />
+<infoparam name="State" value="beforeFinish" />
<TGConnectingPoint num="0" id="1237" />
<TGConnectingPoint num="1" id="1238" />
<TGConnectingPoint num="2" id="1239" />
@@ -2919,12 +2937,13 @@
</extraparam>
</COMPONENT>
-<COMPONENT type="5106" id="1318" >
-<cdparam x="336" y="233" />
-<sizeparam width="142" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5103" id="1288" >
+<cdparam x="370" y="285" />
+<sizeparam width="75" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
+<enabled value="true" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="state0" value="messageDecrypt" />
+<infoparam name="Send signal" value="chout(m1)" />
<TGConnectingPoint num="0" id="1278" />
<TGConnectingPoint num="1" id="1279" />
<TGConnectingPoint num="2" id="1280" />
@@ -2935,115 +2954,126 @@
<TGConnectingPoint num="7" id="1285" />
<TGConnectingPoint num="8" id="1286" />
<TGConnectingPoint num="9" id="1287" />
-<TGConnectingPoint num="10" id="1288" />
-<TGConnectingPoint num="11" id="1289" />
-<TGConnectingPoint num="12" id="1290" />
-<TGConnectingPoint num="13" id="1291" />
-<TGConnectingPoint num="14" id="1292" />
-<TGConnectingPoint num="15" id="1293" />
-<TGConnectingPoint num="16" id="1294" />
-<TGConnectingPoint num="17" id="1295" />
-<TGConnectingPoint num="18" id="1296" />
-<TGConnectingPoint num="19" id="1297" />
-<TGConnectingPoint num="20" id="1298" />
-<TGConnectingPoint num="21" id="1299" />
-<TGConnectingPoint num="22" id="1300" />
-<TGConnectingPoint num="23" id="1301" />
-<TGConnectingPoint num="24" id="1302" />
-<TGConnectingPoint num="25" id="1303" />
-<TGConnectingPoint num="26" id="1304" />
-<TGConnectingPoint num="27" id="1305" />
-<TGConnectingPoint num="28" id="1306" />
-<TGConnectingPoint num="29" id="1307" />
-<TGConnectingPoint num="30" id="1308" />
-<TGConnectingPoint num="31" id="1309" />
-<TGConnectingPoint num="32" id="1310" />
-<TGConnectingPoint num="33" id="1311" />
-<TGConnectingPoint num="34" id="1312" />
-<TGConnectingPoint num="35" id="1313" />
-<TGConnectingPoint num="36" id="1314" />
-<TGConnectingPoint num="37" id="1315" />
-<TGConnectingPoint num="38" id="1316" />
-<TGConnectingPoint num="39" id="1317" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5104" id="1329" >
-<cdparam x="371" y="176" />
-<sizeparam width="73" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</COMPONENT>
+
+<COMPONENT type="5101" id="1290" >
+<cdparam x="397" y="456" />
+<sizeparam width="20" height="20" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="Send signal" value="chin(m2)" />
-<TGConnectingPoint num="0" id="1319" />
-<TGConnectingPoint num="1" id="1320" />
-<TGConnectingPoint num="2" id="1321" />
-<TGConnectingPoint num="3" id="1322" />
-<TGConnectingPoint num="4" id="1323" />
-<TGConnectingPoint num="5" id="1324" />
-<TGConnectingPoint num="6" id="1325" />
-<TGConnectingPoint num="7" id="1326" />
-<TGConnectingPoint num="8" id="1327" />
-<TGConnectingPoint num="9" id="1328" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="1370" >
-<cdparam x="333" y="102" />
-<sizeparam width="149" height="39" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="stop state" value="null" />
+<TGConnectingPoint num="0" id="1289" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="1331" >
+<cdparam x="336" y="211" />
+<sizeparam width="143" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
+<enabled value="true" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="state0" value="waitingForMessage" />
-<TGConnectingPoint num="0" id="1330" />
-<TGConnectingPoint num="1" id="1331" />
-<TGConnectingPoint num="2" id="1332" />
-<TGConnectingPoint num="3" id="1333" />
-<TGConnectingPoint num="4" id="1334" />
-<TGConnectingPoint num="5" id="1335" />
-<TGConnectingPoint num="6" id="1336" />
-<TGConnectingPoint num="7" id="1337" />
-<TGConnectingPoint num="8" id="1338" />
-<TGConnectingPoint num="9" id="1339" />
-<TGConnectingPoint num="10" id="1340" />
-<TGConnectingPoint num="11" id="1341" />
-<TGConnectingPoint num="12" id="1342" />
-<TGConnectingPoint num="13" id="1343" />
-<TGConnectingPoint num="14" id="1344" />
-<TGConnectingPoint num="15" id="1345" />
-<TGConnectingPoint num="16" id="1346" />
-<TGConnectingPoint num="17" id="1347" />
-<TGConnectingPoint num="18" id="1348" />
-<TGConnectingPoint num="19" id="1349" />
-<TGConnectingPoint num="20" id="1350" />
-<TGConnectingPoint num="21" id="1351" />
-<TGConnectingPoint num="22" id="1352" />
-<TGConnectingPoint num="23" id="1353" />
-<TGConnectingPoint num="24" id="1354" />
-<TGConnectingPoint num="25" id="1355" />
-<TGConnectingPoint num="26" id="1356" />
-<TGConnectingPoint num="27" id="1357" />
-<TGConnectingPoint num="28" id="1358" />
-<TGConnectingPoint num="29" id="1359" />
-<TGConnectingPoint num="30" id="1360" />
-<TGConnectingPoint num="31" id="1361" />
-<TGConnectingPoint num="32" id="1362" />
-<TGConnectingPoint num="33" id="1363" />
-<TGConnectingPoint num="34" id="1364" />
-<TGConnectingPoint num="35" id="1365" />
-<TGConnectingPoint num="36" id="1366" />
-<TGConnectingPoint num="37" id="1367" />
-<TGConnectingPoint num="38" id="1368" />
-<TGConnectingPoint num="39" id="1369" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5100" id="1372" >
+<infoparam name="state0" value="sendingMessage" />
+<TGConnectingPoint num="0" id="1291" />
+<TGConnectingPoint num="1" id="1292" />
+<TGConnectingPoint num="2" id="1293" />
+<TGConnectingPoint num="3" id="1294" />
+<TGConnectingPoint num="4" id="1295" />
+<TGConnectingPoint num="5" id="1296" />
+<TGConnectingPoint num="6" id="1297" />
+<TGConnectingPoint num="7" id="1298" />
+<TGConnectingPoint num="8" id="1299" />
+<TGConnectingPoint num="9" id="1300" />
+<TGConnectingPoint num="10" id="1301" />
+<TGConnectingPoint num="11" id="1302" />
+<TGConnectingPoint num="12" id="1303" />
+<TGConnectingPoint num="13" id="1304" />
+<TGConnectingPoint num="14" id="1305" />
+<TGConnectingPoint num="15" id="1306" />
+<TGConnectingPoint num="16" id="1307" />
+<TGConnectingPoint num="17" id="1308" />
+<TGConnectingPoint num="18" id="1309" />
+<TGConnectingPoint num="19" id="1310" />
+<TGConnectingPoint num="20" id="1311" />
+<TGConnectingPoint num="21" id="1312" />
+<TGConnectingPoint num="22" id="1313" />
+<TGConnectingPoint num="23" id="1314" />
+<TGConnectingPoint num="24" id="1315" />
+<TGConnectingPoint num="25" id="1316" />
+<TGConnectingPoint num="26" id="1317" />
+<TGConnectingPoint num="27" id="1318" />
+<TGConnectingPoint num="28" id="1319" />
+<TGConnectingPoint num="29" id="1320" />
+<TGConnectingPoint num="30" id="1321" />
+<TGConnectingPoint num="31" id="1322" />
+<TGConnectingPoint num="32" id="1323" />
+<TGConnectingPoint num="33" id="1324" />
+<TGConnectingPoint num="34" id="1325" />
+<TGConnectingPoint num="35" id="1326" />
+<TGConnectingPoint num="36" id="1327" />
+<TGConnectingPoint num="37" id="1328" />
+<TGConnectingPoint num="38" id="1329" />
+<TGConnectingPoint num="39" id="1330" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5106" id="1372" >
+<cdparam x="340" y="92" />
+<sizeparam width="134" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<enabled value="true" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="state0" value="makingMessage" />
+<TGConnectingPoint num="0" id="1332" />
+<TGConnectingPoint num="1" id="1333" />
+<TGConnectingPoint num="2" id="1334" />
+<TGConnectingPoint num="3" id="1335" />
+<TGConnectingPoint num="4" id="1336" />
+<TGConnectingPoint num="5" id="1337" />
+<TGConnectingPoint num="6" id="1338" />
+<TGConnectingPoint num="7" id="1339" />
+<TGConnectingPoint num="8" id="1340" />
+<TGConnectingPoint num="9" id="1341" />
+<TGConnectingPoint num="10" id="1342" />
+<TGConnectingPoint num="11" id="1343" />
+<TGConnectingPoint num="12" id="1344" />
+<TGConnectingPoint num="13" id="1345" />
+<TGConnectingPoint num="14" id="1346" />
+<TGConnectingPoint num="15" id="1347" />
+<TGConnectingPoint num="16" id="1348" />
+<TGConnectingPoint num="17" id="1349" />
+<TGConnectingPoint num="18" id="1350" />
+<TGConnectingPoint num="19" id="1351" />
+<TGConnectingPoint num="20" id="1352" />
+<TGConnectingPoint num="21" id="1353" />
+<TGConnectingPoint num="22" id="1354" />
+<TGConnectingPoint num="23" id="1355" />
+<TGConnectingPoint num="24" id="1356" />
+<TGConnectingPoint num="25" id="1357" />
+<TGConnectingPoint num="26" id="1358" />
+<TGConnectingPoint num="27" id="1359" />
+<TGConnectingPoint num="28" id="1360" />
+<TGConnectingPoint num="29" id="1361" />
+<TGConnectingPoint num="30" id="1362" />
+<TGConnectingPoint num="31" id="1363" />
+<TGConnectingPoint num="32" id="1364" />
+<TGConnectingPoint num="33" id="1365" />
+<TGConnectingPoint num="34" id="1366" />
+<TGConnectingPoint num="35" id="1367" />
+<TGConnectingPoint num="36" id="1368" />
+<TGConnectingPoint num="37" id="1369" />
+<TGConnectingPoint num="38" id="1370" />
+<TGConnectingPoint num="39" id="1371" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5100" id="1374" >
<cdparam x="400" y="50" />
-<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="1371" />
+<TGConnectingPoint num="0" id="1373" />
</COMPONENT>
diff --git a/simulators/c++2/src_simulator/app/TMLExeciCommand.cpp b/simulators/c++2/src_simulator/app/TMLExeciCommand.cpp
index b30c33159f53e92ec6918ca8f6e458c3ecc31ae2..a76faedc97037ed73bb87b049d5c5b582dd1cad8 100755
--- a/simulators/c++2/src_simulator/app/TMLExeciCommand.cpp
+++ b/simulators/c++2/src_simulator/app/TMLExeciCommand.cpp
@@ -76,13 +76,21 @@ TMLCommand* TMLExeciCommand::prepareNextTransaction(){
std::string TMLExeciCommand::toString() const{
std::ostringstream outp;
- outp << "Execi in " << TMLCommand::toString();
+ if (_execType == 0) {
+ outp << "Execi in " << TMLCommand::toString();
+ } else {
+ outp << "Execc in " << TMLCommand::toString();
+ }
return outp.str();
}
std::string TMLExeciCommand::toShortString() const{
std::ostringstream outp;
- outp << _task->toString() << ": Execi " << _length;
+ if (_execType == 0) {
+ outp << _task->toString() << ": Execi " << _length;
+ } else {
+ outp << _task->toString() << ": Execc " << _length;
+ }
return outp.str();
}
diff --git a/src/main/java/tmltranslator/tonetwork/TaskINForDispatch.java b/src/main/java/tmltranslator/tonetwork/TaskINForDispatch.java
index c0d00abf230b33c6d8abdb46eadb931771b28bad..bc66eadbd2b00ecd9d5b703a476d43f565d91a9b 100644
--- a/src/main/java/tmltranslator/tonetwork/TaskINForDispatch.java
+++ b/src/main/java/tmltranslator/tonetwork/TaskINForDispatch.java
@@ -59,7 +59,6 @@ public class TaskINForDispatch extends TMLTask {
}
// Output Channels are given in the order of VCs
-
public void generate(int nbOfVCs, TMLEvent inputEvent, TMLChannel inputChannel, Vector<TMLEvent> outputEvents, Vector<TMLChannel> outputChannels) {
this.nbOfVCs = nbOfVCs;
diff --git a/src/main/java/tmltranslator/tonetwork/TranslatedRouter.java b/src/main/java/tmltranslator/tonetwork/TranslatedRouter.java
index 93adb18d8339cf288ac2accb7eb7eb008264b423..03f50f5065ff5e8fcacb38a01b51c50141abdbd2 100644
--- a/src/main/java/tmltranslator/tonetwork/TranslatedRouter.java
+++ b/src/main/java/tmltranslator/tonetwork/TranslatedRouter.java
@@ -78,21 +78,24 @@ public class TranslatedRouter<E> {
public void makeRouter() {
int i, j;
+ TMLTask t;
// A router is made upon tasks, hardware components and a mapping i.e. a TMLMapping
TMLModeling<E> tmlm = new TMLModeling<>();
TMLArchitecture tmla = new TMLArchitecture();
map = new TMLMapping<E>(tmlm, tmla, false);
- // TASKS
-
+ // VC DISPATCHERS
// One dispatcher per port
// A dispatcher outputs to VCs tasks
dispatchers = new Vector<>();
for(i=0; i<NB_OF_PORTS; i++) {
-
+ //TaskINForDispatch dt = new TaskINForDispatch(nbOfVCs);
+ //dispatchers.add(dt);
}
+ // PORT DISPATCHER // according to destination
+
// Create all channels
// For each input VC, we have to create a channel