diff --git a/modeling/SysMLSec/SysMLSecTutorial.xml b/modeling/SysMLSec/SysMLSecTutorial.xml
index 3d9a74997ed96262a854d6267b3fba2dc22760b2..646cae2169cf6c263e5dfadb10e6b50af0b09b7e 100644
--- a/modeling/SysMLSec/SysMLSecTutorial.xml
+++ b/modeling/SysMLSec/SysMLSecTutorial.xml
@@ -1,433 +1,648 @@
<?xml version="1.0" encoding="UTF-8"?>
-<TURTLEGMODELING version="1.0beta" ANIMATE_INTERACTIVE_SIMULATION="true" ACTIVATE_PENALTIES="false" UPDATE_INFORMATION_DIPLO_SIM="true" ANIMATE_WITH_INFO_DIPLO_SIM="true" OPEN_DIAG_DIPLO_SIM="false" LAST_SELECTED_MAIN_TAB="8" LAST_SELECTED_SUB_TAB="0">
+<TURTLEGMODELING version="1.0beta" ANIMATE_INTERACTIVE_SIMULATION="true" ACTIVATE_PENALTIES="false" UPDATE_INFORMATION_DIPLO_SIM="true" ANIMATE_WITH_INFO_DIPLO_SIM="true" OPEN_DIAG_DIPLO_SIM="false" LAST_SELECTED_MAIN_TAB="7" LAST_SELECTED_SUB_TAB="0">
<Modeling type="Sysmlsec Methodology" nameTab="SysMLSec_Methodology" >
<SysmlsecMethodologyDiagramPanel name="SysMLSec_Methodology" minX="10" maxX="2500" minY="10" maxY="1500" zoom="1.0" >
-<COMPONENT type="5705" id="5" >
+<COMPONENT type="5705" id="22" index="0" uid="0c0632d5-6413-4b75-a788-10c84e6ff170" >
<cdparam x="650" y="500" />
<sizeparam width="180" 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="Properties" />
+<new d="false" />
<TGConnectingPoint num="0" id="1" />
<TGConnectingPoint num="1" id="2" />
<TGConnectingPoint num="2" id="3" />
<TGConnectingPoint num="3" id="4" />
-</COMPONENT>
-
-<COMPONENT type="5706" id="10" >
+<TGConnectingPoint num="4" id="5" />
+<TGConnectingPoint num="5" id="6" />
+<TGConnectingPoint num="6" id="7" />
+<TGConnectingPoint num="7" id="8" />
+<TGConnectingPoint num="8" id="9" />
+<TGConnectingPoint num="9" id="10" />
+<TGConnectingPoint num="10" id="11" />
+<TGConnectingPoint num="11" id="12" />
+<TGConnectingPoint num="12" id="13" />
+<TGConnectingPoint num="13" id="14" />
+<TGConnectingPoint num="14" id="15" />
+<TGConnectingPoint num="15" id="16" />
+<TGConnectingPoint num="16" id="17" />
+<TGConnectingPoint num="17" id="18" />
+<TGConnectingPoint num="18" id="19" />
+<TGConnectingPoint num="19" id="20" />
+<TGConnectingPoint num="20" id="21" />
+</COMPONENT>
+
+<COMPONENT type="5706" id="44" index="1" uid="e6c296f4-c242-4fbd-a5a9-f763242cb412" >
<cdparam x="1100" y="600" />
<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="Prototyping" />
-<TGConnectingPoint num="0" id="6" />
-<TGConnectingPoint num="1" id="7" />
-<TGConnectingPoint num="2" id="8" />
-<TGConnectingPoint num="3" id="9" />
-</COMPONENT>
-
-<COMPONENT type="5704" id="17" >
+<new d="false" />
+<TGConnectingPoint num="0" id="23" />
+<TGConnectingPoint num="1" id="24" />
+<TGConnectingPoint num="2" id="25" />
+<TGConnectingPoint num="3" id="26" />
+<TGConnectingPoint num="4" id="27" />
+<TGConnectingPoint num="5" id="28" />
+<TGConnectingPoint num="6" id="29" />
+<TGConnectingPoint num="7" id="30" />
+<TGConnectingPoint num="8" id="31" />
+<TGConnectingPoint num="9" id="32" />
+<TGConnectingPoint num="10" id="33" />
+<TGConnectingPoint num="11" id="34" />
+<TGConnectingPoint num="12" id="35" />
+<TGConnectingPoint num="13" id="36" />
+<TGConnectingPoint num="14" id="37" />
+<TGConnectingPoint num="15" id="38" />
+<TGConnectingPoint num="16" id="39" />
+<TGConnectingPoint num="17" id="40" />
+<TGConnectingPoint num="18" id="41" />
+<TGConnectingPoint num="19" id="42" />
+<TGConnectingPoint num="20" id="43" />
+</COMPONENT>
+
+<COMPONENT type="5704" id="67" index="2" uid="eebd5201-3ade-497f-a7ac-02505eb114ca" >
<cdparam x="1000" y="497" />
<sizeparam width="290" height="73" 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="Design" />
-<TGConnectingPoint num="0" id="12" />
-<TGConnectingPoint num="1" id="13" />
-<TGConnectingPoint num="2" id="14" />
-<TGConnectingPoint num="3" id="15" />
-<TGConnectingPoint num="4" id="16" />
-</COMPONENT>
-<SUBCOMPONENT type="5707" id="11" >
-<father id="17" num="0" />
+<new d="false" />
+<TGConnectingPoint num="0" id="46" />
+<TGConnectingPoint num="1" id="47" />
+<TGConnectingPoint num="2" id="48" />
+<TGConnectingPoint num="3" id="49" />
+<TGConnectingPoint num="4" id="50" />
+<TGConnectingPoint num="5" id="51" />
+<TGConnectingPoint num="6" id="52" />
+<TGConnectingPoint num="7" id="53" />
+<TGConnectingPoint num="8" id="54" />
+<TGConnectingPoint num="9" id="55" />
+<TGConnectingPoint num="10" id="56" />
+<TGConnectingPoint num="11" id="57" />
+<TGConnectingPoint num="12" id="58" />
+<TGConnectingPoint num="13" id="59" />
+<TGConnectingPoint num="14" id="60" />
+<TGConnectingPoint num="15" id="61" />
+<TGConnectingPoint num="16" id="62" />
+<TGConnectingPoint num="17" id="63" />
+<TGConnectingPoint num="18" id="64" />
+<TGConnectingPoint num="19" id="65" />
+<TGConnectingPoint num="20" id="66" />
+</COMPONENT>
+<SUBCOMPONENT type="5707" id="45" index="22" uid="e1a3ac3d-9949-4aac-bcd8-7e4b22d7452a" >
+<father id="67" num="0" />
<cdparam x="1005" y="537" />
<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" />
+<new d="false" />
</SUBCOMPONENT>
-<COMPONENT type="5703" id="23" >
+<COMPONENT type="5703" id="89" index="3" uid="76464f8d-b005-4a5b-8075-84bdf759799b" >
<cdparam x="900" y="400" />
<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="Analysis" />
-<TGConnectingPoint num="0" id="18" />
-<TGConnectingPoint num="1" id="19" />
-<TGConnectingPoint num="2" id="20" />
-<TGConnectingPoint num="3" id="21" />
-<TGConnectingPoint num="4" id="22" />
-</COMPONENT>
-
-<COMPONENT type="5711" id="28" >
+<new d="false" />
+<TGConnectingPoint num="0" id="68" />
+<TGConnectingPoint num="1" id="69" />
+<TGConnectingPoint num="2" id="70" />
+<TGConnectingPoint num="3" id="71" />
+<TGConnectingPoint num="4" id="72" />
+<TGConnectingPoint num="5" id="73" />
+<TGConnectingPoint num="6" id="74" />
+<TGConnectingPoint num="7" id="75" />
+<TGConnectingPoint num="8" id="76" />
+<TGConnectingPoint num="9" id="77" />
+<TGConnectingPoint num="10" id="78" />
+<TGConnectingPoint num="11" id="79" />
+<TGConnectingPoint num="12" id="80" />
+<TGConnectingPoint num="13" id="81" />
+<TGConnectingPoint num="14" id="82" />
+<TGConnectingPoint num="15" id="83" />
+<TGConnectingPoint num="16" id="84" />
+<TGConnectingPoint num="17" id="85" />
+<TGConnectingPoint num="18" id="86" />
+<TGConnectingPoint num="19" id="87" />
+<TGConnectingPoint num="20" id="88" />
+</COMPONENT>
+
+<COMPONENT type="5711" id="111" index="4" uid="6d5a93e4-b317-4be7-8332-e11662ebd3d1" >
<cdparam x="887" y="100" />
<sizeparam width="227" 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="Communication pattern" />
-<TGConnectingPoint num="0" id="24" />
-<TGConnectingPoint num="1" id="25" />
-<TGConnectingPoint num="2" id="26" />
-<TGConnectingPoint num="3" id="27" />
-</COMPONENT>
-
-<COMPONENT type="5710" id="38" >
+<new d="false" />
+<TGConnectingPoint num="0" id="90" />
+<TGConnectingPoint num="1" id="91" />
+<TGConnectingPoint num="2" id="92" />
+<TGConnectingPoint num="3" id="93" />
+<TGConnectingPoint num="4" id="94" />
+<TGConnectingPoint num="5" id="95" />
+<TGConnectingPoint num="6" id="96" />
+<TGConnectingPoint num="7" id="97" />
+<TGConnectingPoint num="8" id="98" />
+<TGConnectingPoint num="9" id="99" />
+<TGConnectingPoint num="10" id="100" />
+<TGConnectingPoint num="11" id="101" />
+<TGConnectingPoint num="12" id="102" />
+<TGConnectingPoint num="13" id="103" />
+<TGConnectingPoint num="14" id="104" />
+<TGConnectingPoint num="15" id="105" />
+<TGConnectingPoint num="16" id="106" />
+<TGConnectingPoint num="17" id="107" />
+<TGConnectingPoint num="18" id="108" />
+<TGConnectingPoint num="19" id="109" />
+<TGConnectingPoint num="20" id="110" />
+</COMPONENT>
+
+<COMPONENT type="5710" id="136" index="5" uid="c37aacde-e040-4d43-8038-6d9d251b861f" >
<cdparam x="813" y="227" />
<sizeparam width="418" height="68" 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="Mapping" />
-<TGConnectingPoint num="0" id="32" />
-<TGConnectingPoint num="1" id="33" />
-<TGConnectingPoint num="2" id="34" />
-<TGConnectingPoint num="3" id="35" />
-<TGConnectingPoint num="4" id="36" />
-<TGConnectingPoint num="5" id="37" />
-</COMPONENT>
-<SUBCOMPONENT type="5707" id="29" >
-<father id="38" num="0" />
-<cdparam x="818" y="297" />
+<new d="false" />
+<TGConnectingPoint num="0" id="115" />
+<TGConnectingPoint num="1" id="116" />
+<TGConnectingPoint num="2" id="117" />
+<TGConnectingPoint num="3" id="118" />
+<TGConnectingPoint num="4" id="119" />
+<TGConnectingPoint num="5" id="120" />
+<TGConnectingPoint num="6" id="121" />
+<TGConnectingPoint num="7" id="122" />
+<TGConnectingPoint num="8" id="123" />
+<TGConnectingPoint num="9" id="124" />
+<TGConnectingPoint num="10" id="125" />
+<TGConnectingPoint num="11" id="126" />
+<TGConnectingPoint num="12" id="127" />
+<TGConnectingPoint num="13" id="128" />
+<TGConnectingPoint num="14" id="129" />
+<TGConnectingPoint num="15" id="130" />
+<TGConnectingPoint num="16" id="131" />
+<TGConnectingPoint num="17" id="132" />
+<TGConnectingPoint num="18" id="133" />
+<TGConnectingPoint num="19" id="134" />
+<TGConnectingPoint num="20" id="135" />
+</COMPONENT>
+<SUBCOMPONENT type="5707" id="112" index="23" uid="faf8a9c6-abd0-4394-b69e-bc2bb622ac93" >
+<father id="136" num="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" />
+<new d="false" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="5707" id="30" >
-<father id="38" num="1" />
+<SUBCOMPONENT type="5707" id="113" index="24" uid="a75435a4-67d9-4be4-a579-68815106caeb" >
+<father id="136" num="1" />
<cdparam x="818" y="282" />
<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" />
+<new d="false" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="5707" id="31" >
-<father id="38" num="2" />
-<cdparam x="818" y="267" />
+<SUBCOMPONENT type="5707" id="114" index="25" uid="1370a96e-0d89-48c4-a29b-0a049e868e13" >
+<father id="136" num="2" />
+<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" />
+<new d="false" />
</SUBCOMPONENT>
-<COMPONENT type="5709" id="46" >
+<COMPONENT type="5709" id="161" index="6" uid="711ce245-f62e-485c-b154-3237ad913dd1" >
<cdparam x="1150" y="101" />
<sizeparam width="299" height="69" 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="Architecture view" />
-<TGConnectingPoint num="0" id="42" />
-<TGConnectingPoint num="1" id="43" />
-<TGConnectingPoint num="2" id="44" />
-<TGConnectingPoint num="3" id="45" />
-</COMPONENT>
-<SUBCOMPONENT type="5707" id="39" >
-<father id="46" num="0" />
-<cdparam x="1155" y="171" />
+<new d="false" />
+<TGConnectingPoint num="0" id="140" />
+<TGConnectingPoint num="1" id="141" />
+<TGConnectingPoint num="2" id="142" />
+<TGConnectingPoint num="3" id="143" />
+<TGConnectingPoint num="4" id="144" />
+<TGConnectingPoint num="5" id="145" />
+<TGConnectingPoint num="6" id="146" />
+<TGConnectingPoint num="7" id="147" />
+<TGConnectingPoint num="8" id="148" />
+<TGConnectingPoint num="9" id="149" />
+<TGConnectingPoint num="10" id="150" />
+<TGConnectingPoint num="11" id="151" />
+<TGConnectingPoint num="12" id="152" />
+<TGConnectingPoint num="13" id="153" />
+<TGConnectingPoint num="14" id="154" />
+<TGConnectingPoint num="15" id="155" />
+<TGConnectingPoint num="16" id="156" />
+<TGConnectingPoint num="17" id="157" />
+<TGConnectingPoint num="18" id="158" />
+<TGConnectingPoint num="19" id="159" />
+<TGConnectingPoint num="20" id="160" />
+</COMPONENT>
+<SUBCOMPONENT type="5707" id="137" index="26" uid="02e527d6-856a-40b4-b8a3-2a10e74fa930" >
+<father id="161" num="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" />
+<new d="false" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="5707" id="40" >
-<father id="46" num="1" />
+<SUBCOMPONENT type="5707" id="138" index="27" uid="93271dfb-16c3-4c66-8b66-e66c40f2fdd6" >
+<father id="161" num="1" />
<cdparam x="1155" y="156" />
<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" />
+<new d="false" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="5707" id="41" >
-<father id="46" num="2" />
-<cdparam x="1155" y="141" />
+<SUBCOMPONENT type="5707" id="139" index="28" uid="3beb2cdc-16ad-4be0-beb5-d5589509c270" >
+<father id="161" num="2" />
+<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" />
+<new d="false" />
</SUBCOMPONENT>
-<COMPONENT type="5713" id="53" >
+<COMPONENT type="5713" id="185" index="7" uid="c9968075-baa6-40b3-ba00-e89438a994ce" >
<cdparam x="650" y="100" />
<sizeparam width="224" 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="Functional view" />
-<TGConnectingPoint num="0" id="49" />
-<TGConnectingPoint num="1" id="50" />
-<TGConnectingPoint num="2" id="51" />
-<TGConnectingPoint num="3" id="52" />
-</COMPONENT>
-<SUBCOMPONENT type="5707" id="47" >
-<father id="53" num="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="155" maxY="155" />
-<infoparam name="value " value="SecureFV" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="5707" id="48" >
-<father id="53" num="1" />
+<new d="false" />
+<TGConnectingPoint num="0" id="164" />
+<TGConnectingPoint num="1" id="165" />
+<TGConnectingPoint num="2" id="166" />
+<TGConnectingPoint num="3" id="167" />
+<TGConnectingPoint num="4" id="168" />
+<TGConnectingPoint num="5" id="169" />
+<TGConnectingPoint num="6" id="170" />
+<TGConnectingPoint num="7" id="171" />
+<TGConnectingPoint num="8" id="172" />
+<TGConnectingPoint num="9" id="173" />
+<TGConnectingPoint num="10" id="174" />
+<TGConnectingPoint num="11" id="175" />
+<TGConnectingPoint num="12" id="176" />
+<TGConnectingPoint num="13" id="177" />
+<TGConnectingPoint num="14" id="178" />
+<TGConnectingPoint num="15" id="179" />
+<TGConnectingPoint num="16" id="180" />
+<TGConnectingPoint num="17" id="181" />
+<TGConnectingPoint num="18" id="182" />
+<TGConnectingPoint num="19" id="183" />
+<TGConnectingPoint num="20" id="184" />
+</COMPONENT>
+<SUBCOMPONENT type="5707" id="162" index="29" uid="ce6c8db0-5c95-400b-a68a-a80af90eb337" >
+<father id="185" num="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="140" maxY="140" />
<infoparam name="value " value="NonSecureFV" />
+<new d="false" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="5707" id="163" index="30" uid="f9282079-9523-430f-9a47-a23e2645f6aa" >
+<father id="185" num="1" />
+<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="155" maxY="155" />
+<infoparam name="value " value="SecureFV" />
+<new d="false" />
</SUBCOMPONENT>
-<COMPONENT type="5712" id="60" >
+<COMPONENT type="5712" id="208" index="8" uid="b0889250-0a4c-4db5-adc0-5f15c813de17" >
<cdparam x="350" y="400" />
<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="Attacks" />
-<TGConnectingPoint num="0" id="55" />
-<TGConnectingPoint num="1" id="56" />
-<TGConnectingPoint num="2" id="57" />
-<TGConnectingPoint num="3" id="58" />
-<TGConnectingPoint num="4" id="59" />
-</COMPONENT>
-<SUBCOMPONENT type="5707" id="54" >
-<father id="60" num="0" />
+<new d="false" />
+<TGConnectingPoint num="0" id="187" />
+<TGConnectingPoint num="1" id="188" />
+<TGConnectingPoint num="2" id="189" />
+<TGConnectingPoint num="3" id="190" />
+<TGConnectingPoint num="4" id="191" />
+<TGConnectingPoint num="5" id="192" />
+<TGConnectingPoint num="6" id="193" />
+<TGConnectingPoint num="7" id="194" />
+<TGConnectingPoint num="8" id="195" />
+<TGConnectingPoint num="9" id="196" />
+<TGConnectingPoint num="10" id="197" />
+<TGConnectingPoint num="11" id="198" />
+<TGConnectingPoint num="12" id="199" />
+<TGConnectingPoint num="13" id="200" />
+<TGConnectingPoint num="14" id="201" />
+<TGConnectingPoint num="15" id="202" />
+<TGConnectingPoint num="16" id="203" />
+<TGConnectingPoint num="17" id="204" />
+<TGConnectingPoint num="18" id="205" />
+<TGConnectingPoint num="19" id="206" />
+<TGConnectingPoint num="20" id="207" />
+</COMPONENT>
+<SUBCOMPONENT type="5707" id="186" index="31" uid="54b4bd97-3542-46f1-a300-d4987385e65c" >
+<father id="208" num="0" />
<cdparam x="355" y="440" />
<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" />
+<new d="false" />
</SUBCOMPONENT>
-<COMPONENT type="5702" id="70" >
+<COMPONENT type="5702" id="231" index="9" uid="601efc51-ea26-4a38-9316-115a81f5e73e" >
<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" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="TGComponent" value="Requirements" />
-<TGConnectingPoint num="0" id="62" />
-<TGConnectingPoint num="1" id="63" />
-<TGConnectingPoint num="2" id="64" />
-<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="70" num="0" />
+<new d="false" />
+<TGConnectingPoint num="0" id="210" />
+<TGConnectingPoint num="1" id="211" />
+<TGConnectingPoint num="2" id="212" />
+<TGConnectingPoint num="3" id="213" />
+<TGConnectingPoint num="4" id="214" />
+<TGConnectingPoint num="5" id="215" />
+<TGConnectingPoint num="6" id="216" />
+<TGConnectingPoint num="7" id="217" />
+<TGConnectingPoint num="8" id="218" />
+<TGConnectingPoint num="9" id="219" />
+<TGConnectingPoint num="10" id="220" />
+<TGConnectingPoint num="11" id="221" />
+<TGConnectingPoint num="12" id="222" />
+<TGConnectingPoint num="13" id="223" />
+<TGConnectingPoint num="14" id="224" />
+<TGConnectingPoint num="15" id="225" />
+<TGConnectingPoint num="16" id="226" />
+<TGConnectingPoint num="17" id="227" />
+<TGConnectingPoint num="18" id="228" />
+<TGConnectingPoint num="19" id="229" />
+<TGConnectingPoint num="20" id="230" />
+</COMPONENT>
+<SUBCOMPONENT type="5707" id="209" index="32" uid="fd17c362-5e4a-463c-877b-4182c2e42764" >
+<father id="231" num="0" />
<cdparam x="355" y="240" />
<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" />
+<new d="false" />
</SUBCOMPONENT>
-<COMPONENT type="5701" id="75" >
+<COMPONENT type="5701" id="253" index="10" uid="a6d0b24d-2a72-4f78-9825-d0be95e6b9ef" >
<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="71" />
-<TGConnectingPoint num="1" id="72" />
-<TGConnectingPoint num="2" id="73" />
-<TGConnectingPoint num="3" id="74" />
-</COMPONENT>
-
-<COMPONENT type="304" id="92" >
+<new d="false" />
+<TGConnectingPoint num="0" id="232" />
+<TGConnectingPoint num="1" id="233" />
+<TGConnectingPoint num="2" id="234" />
+<TGConnectingPoint num="3" id="235" />
+<TGConnectingPoint num="4" id="236" />
+<TGConnectingPoint num="5" id="237" />
+<TGConnectingPoint num="6" id="238" />
+<TGConnectingPoint num="7" id="239" />
+<TGConnectingPoint num="8" id="240" />
+<TGConnectingPoint num="9" id="241" />
+<TGConnectingPoint num="10" id="242" />
+<TGConnectingPoint num="11" id="243" />
+<TGConnectingPoint num="12" id="244" />
+<TGConnectingPoint num="13" id="245" />
+<TGConnectingPoint num="14" id="246" />
+<TGConnectingPoint num="15" id="247" />
+<TGConnectingPoint num="16" id="248" />
+<TGConnectingPoint num="17" id="249" />
+<TGConnectingPoint num="18" id="250" />
+<TGConnectingPoint num="19" id="251" />
+<TGConnectingPoint num="20" id="252" />
+</COMPONENT>
+
+<COMPONENT type="304" id="270" index="11" uid="01539d16-84ac-4758-99a3-fa761129ade8" >
<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="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>
+<new d="false" />
+<TGConnectingPoint num="0" id="254" />
+<TGConnectingPoint num="1" id="255" />
+<TGConnectingPoint num="2" id="256" />
+<TGConnectingPoint num="3" id="257" />
+<TGConnectingPoint num="4" id="258" />
+<TGConnectingPoint num="5" id="259" />
+<TGConnectingPoint num="6" id="260" />
+<TGConnectingPoint num="7" id="261" />
+<TGConnectingPoint num="8" id="262" />
+<TGConnectingPoint num="9" id="263" />
+<TGConnectingPoint num="10" id="264" />
+<TGConnectingPoint num="11" id="265" />
+<TGConnectingPoint num="12" id="266" />
+<TGConnectingPoint num="13" id="267" />
+<TGConnectingPoint num="14" id="268" />
+<TGConnectingPoint num="15" id="269" />
+<extraparam>
+<TextPos value="2" />
<TextColor value="-1" />
-<FillColor value="-1" />
</extraparam>
</COMPONENT>
-<COMPONENT type="304" id="109" >
+<COMPONENT type="304" id="287" index="12" uid="190cd573-e45a-45a7-b3fc-e8e3b4b04836" >
<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="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>
+<new d="false" />
+<TGConnectingPoint num="0" id="271" />
+<TGConnectingPoint num="1" id="272" />
+<TGConnectingPoint num="2" id="273" />
+<TGConnectingPoint num="3" id="274" />
+<TGConnectingPoint num="4" id="275" />
+<TGConnectingPoint num="5" id="276" />
+<TGConnectingPoint num="6" id="277" />
+<TGConnectingPoint num="7" id="278" />
+<TGConnectingPoint num="8" id="279" />
+<TGConnectingPoint num="9" id="280" />
+<TGConnectingPoint num="10" id="281" />
+<TGConnectingPoint num="11" id="282" />
+<TGConnectingPoint num="12" id="283" />
+<TGConnectingPoint num="13" id="284" />
+<TGConnectingPoint num="14" id="285" />
+<TGConnectingPoint num="15" id="286" />
+<extraparam>
+<TextPos value="2" />
<TextColor value="-1" />
-<FillColor value="-1" />
</extraparam>
</COMPONENT>
-<COMPONENT type="304" id="126" >
+<COMPONENT type="304" id="304" index="13" uid="0f4dd6ef-af0f-45e5-b7f0-ea4133a6d350" >
<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="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>
+<new d="false" />
+<TGConnectingPoint num="0" id="288" />
+<TGConnectingPoint num="1" id="289" />
+<TGConnectingPoint num="2" id="290" />
+<TGConnectingPoint num="3" id="291" />
+<TGConnectingPoint num="4" id="292" />
+<TGConnectingPoint num="5" id="293" />
+<TGConnectingPoint num="6" id="294" />
+<TGConnectingPoint num="7" id="295" />
+<TGConnectingPoint num="8" id="296" />
+<TGConnectingPoint num="9" id="297" />
+<TGConnectingPoint num="10" id="298" />
+<TGConnectingPoint num="11" id="299" />
+<TGConnectingPoint num="12" id="300" />
+<TGConnectingPoint num="13" id="301" />
+<TGConnectingPoint num="14" id="302" />
+<TGConnectingPoint num="15" id="303" />
+<extraparam>
+<TextPos value="2" />
<TextColor value="-1" />
-<FillColor value="-1" />
</extraparam>
</COMPONENT>
-<CONNECTOR type="6004" id="128" >
+<CONNECTOR type="6004" id="306" index="14" uid="e106063d-0753-4ac9-8789-430a8358b646" >
<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="127" />
-<P1 x="1299" y="170" id="42" />
-<P2 x="1105" y="227" id="33" />
+<TGConnectingPoint num="0" id="305" />
+<P1 x="1150" y="118" id="140" />
+<P2 x="813" y="261" id="116" />
<AutomaticDrawing data="true" />
+<new d="false" />
</CONNECTOR>
-<CONNECTOR type="6004" id="130" >
+<CONNECTOR type="6004" id="308" index="15" uid="c82e11e4-a9b1-49c2-b849-050f9937682a" >
<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="129" />
-<P1 x="1000" y="170" id="24" />
-<P2 x="1022" y="227" id="34" />
+<TGConnectingPoint num="0" id="307" />
+<P1 x="887" y="117" id="90" />
+<P2 x="813" y="278" id="117" />
<AutomaticDrawing data="true" />
+<new d="false" />
</CONNECTOR>
-<CONNECTOR type="6004" id="132" >
+<CONNECTOR type="6004" id="310" index="16" uid="a28c1072-cd78-4bea-a038-de62679781e8" >
<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="131" />
-<P1 x="762" y="170" id="49" />
-<P2 x="938" y="227" id="32" />
+<TGConnectingPoint num="0" id="309" />
+<P1 x="650" y="117" id="164" />
+<P2 x="813" y="244" id="115" />
<AutomaticDrawing data="true" />
+<new d="false" />
</CONNECTOR>
-<CONNECTOR type="5718" id="138" >
+<CONNECTOR type="5718" id="316" index="17" uid="b63279b5-f2e8-4658-92a9-e2a2e84d5764" >
<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="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" />
+<TGConnectingPoint num="0" id="313" />
+<TGConnectingPoint num="1" id="314" />
+<TGConnectingPoint num="2" id="315" />
+<P1 x="350" y="217" id="210" />
+<P2 x="650" y="517" id="1" />
<Point x="595" y="235" />
<Point x="595" y="450" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="133" >
-<father id="138" num="0" />
+<new d="false" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="311" index="33" uid="323302de-65a3-4b24-b169-4ffe1ce30c3a" >
+<father id="316" num="0" />
<cdparam x="595" y="235" />
<sizeparam width="8" height="8" 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" />
+<new d="false" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="134" >
-<father id="138" num="1" />
+<SUBCOMPONENT type="-1" id="312" index="34" uid="384d5a7d-5154-492a-b90e-243c7796e968" >
+<father id="316" num="1" />
<cdparam x="595" y="450" />
<sizeparam width="8" height="8" 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" />
+<new d="false" />
</SUBCOMPONENT>
-<CONNECTOR type="5718" id="142" >
+<CONNECTOR type="5718" id="320" index="18" uid="770a2155-7189-4193-b677-bef1ffc52588" >
<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="140" />
-<TGConnectingPoint num="1" id="141" />
-<P1 x="1058" y="570" id="13" />
-<P2 x="1100" y="635" id="6" />
+<TGConnectingPoint num="0" id="318" />
+<TGConnectingPoint num="1" id="319" />
+<P1 x="1000" y="533" id="47" />
+<P2 x="1100" y="617" id="23" />
<Point x="1060" y="625" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="139" >
-<father id="142" num="0" />
+<new d="false" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="317" index="35" uid="54d8dff6-b630-4551-afd8-f3c77c753be5" >
+<father id="320" num="0" />
<cdparam x="1060" y="625" />
<sizeparam width="8" height="8" 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" />
+<new d="false" />
</SUBCOMPONENT>
-<CONNECTOR type="5718" id="146" >
+<CONNECTOR type="5718" id="324" index="19" uid="010da454-4ce9-40c6-b94e-0caa0a32b773" >
<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="144" />
-<TGConnectingPoint num="1" id="145" />
-<P1 x="960" y="470" id="19" />
-<P2 x="1000" y="533" id="12" />
+<TGConnectingPoint num="0" id="322" />
+<TGConnectingPoint num="1" id="323" />
+<P1 x="900" y="435" id="69" />
+<P2 x="1000" y="515" id="46" />
<Point x="960" y="525" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="143" >
-<father id="146" num="0" />
+<new d="false" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="321" index="36" uid="9da28a29-cfd1-46ba-b9ff-8e0794cffda4" >
+<father id="324" num="0" />
<cdparam x="960" y="525" />
<sizeparam width="8" height="8" 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" />
+<new d="false" />
</SUBCOMPONENT>
-<CONNECTOR type="5718" id="148" >
+<CONNECTOR type="5718" id="326" index="20" uid="e4b88f40-e923-40c4-bde1-80742fb0b534" >
<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="147" />
-<P1 x="470" y="400" id="56" />
-<P2 x="470" y="270" id="64" />
+<TGConnectingPoint num="0" id="325" />
+<P1 x="350" y="435" id="188" />
+<P2 x="350" y="252" id="212" />
<AutomaticDrawing data="true" />
+<new d="false" />
</CONNECTOR>
-<CONNECTOR type="5718" id="150" >
+<CONNECTOR type="5718" id="328" index="21" uid="6b91ff1f-2a2b-4dcb-84d5-7b8743cb43d5" >
<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="149" />
-<P1 x="410" y="270" id="63" />
-<P2 x="410" y="400" id="55" />
+<TGConnectingPoint num="0" id="327" />
+<P1 x="350" y="235" id="211" />
+<P2 x="350" y="417" id="187" />
<AutomaticDrawing data="true" />
+<new d="false" />
</CONNECTOR>
</SysmlsecMethodologyDiagramPanel>
@@ -439,55 +654,56 @@
<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="194" >
+<COMPONENT type="5200" id="372" index="0" uid="af08f6a4-070f-4be6-acc4-fa26f302cce4" >
<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="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" />
+<new d="false" />
+<TGConnectingPoint num="0" id="329" />
+<TGConnectingPoint num="1" id="330" />
+<TGConnectingPoint num="2" id="331" />
+<TGConnectingPoint num="3" id="332" />
+<TGConnectingPoint num="4" id="333" />
+<TGConnectingPoint num="5" id="334" />
+<TGConnectingPoint num="6" id="335" />
+<TGConnectingPoint num="7" id="336" />
+<TGConnectingPoint num="8" id="337" />
+<TGConnectingPoint num="9" id="338" />
+<TGConnectingPoint num="10" id="339" />
+<TGConnectingPoint num="11" id="340" />
+<TGConnectingPoint num="12" id="341" />
+<TGConnectingPoint num="13" id="342" />
+<TGConnectingPoint num="14" id="343" />
+<TGConnectingPoint num="15" id="344" />
+<TGConnectingPoint num="16" id="345" />
+<TGConnectingPoint num="17" id="346" />
+<TGConnectingPoint num="18" id="347" />
+<TGConnectingPoint num="19" id="348" />
+<TGConnectingPoint num="20" id="349" />
+<TGConnectingPoint num="21" id="350" />
+<TGConnectingPoint num="22" id="351" />
+<TGConnectingPoint num="23" id="352" />
+<TGConnectingPoint num="24" id="353" />
+<TGConnectingPoint num="25" id="354" />
+<TGConnectingPoint num="26" id="355" />
+<TGConnectingPoint num="27" id="356" />
+<TGConnectingPoint num="28" id="357" />
+<TGConnectingPoint num="29" id="358" />
+<TGConnectingPoint num="30" id="359" />
+<TGConnectingPoint num="31" id="360" />
+<TGConnectingPoint num="32" id="361" />
+<TGConnectingPoint num="33" id="362" />
+<TGConnectingPoint num="34" id="363" />
+<TGConnectingPoint num="35" id="364" />
+<TGConnectingPoint num="36" id="365" />
+<TGConnectingPoint num="37" id="366" />
+<TGConnectingPoint num="38" id="367" />
+<TGConnectingPoint num="39" id="368" />
+<TGConnectingPoint num="40" id="369" />
+<TGConnectingPoint num="41" id="370" />
+<TGConnectingPoint num="42" id="371" />
<extraparam>
<textline data="Requirement description:" />
<textline data="Double-click to edit" />
@@ -503,55 +719,56 @@
</extraparam>
</COMPONENT>
-<COMPONENT type="5200" id="238" >
+<COMPONENT type="5200" id="416" index="1" uid="502be548-c75e-4237-8ddf-185e99c25be9" >
<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="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" />
+<new d="false" />
+<TGConnectingPoint num="0" id="373" />
+<TGConnectingPoint num="1" id="374" />
+<TGConnectingPoint num="2" id="375" />
+<TGConnectingPoint num="3" id="376" />
+<TGConnectingPoint num="4" id="377" />
+<TGConnectingPoint num="5" id="378" />
+<TGConnectingPoint num="6" id="379" />
+<TGConnectingPoint num="7" id="380" />
+<TGConnectingPoint num="8" id="381" />
+<TGConnectingPoint num="9" id="382" />
+<TGConnectingPoint num="10" id="383" />
+<TGConnectingPoint num="11" id="384" />
+<TGConnectingPoint num="12" id="385" />
+<TGConnectingPoint num="13" id="386" />
+<TGConnectingPoint num="14" id="387" />
+<TGConnectingPoint num="15" id="388" />
+<TGConnectingPoint num="16" id="389" />
+<TGConnectingPoint num="17" id="390" />
+<TGConnectingPoint num="18" id="391" />
+<TGConnectingPoint num="19" id="392" />
+<TGConnectingPoint num="20" id="393" />
+<TGConnectingPoint num="21" id="394" />
+<TGConnectingPoint num="22" id="395" />
+<TGConnectingPoint num="23" id="396" />
+<TGConnectingPoint num="24" id="397" />
+<TGConnectingPoint num="25" id="398" />
+<TGConnectingPoint num="26" id="399" />
+<TGConnectingPoint num="27" id="400" />
+<TGConnectingPoint num="28" id="401" />
+<TGConnectingPoint num="29" id="402" />
+<TGConnectingPoint num="30" id="403" />
+<TGConnectingPoint num="31" id="404" />
+<TGConnectingPoint num="32" id="405" />
+<TGConnectingPoint num="33" id="406" />
+<TGConnectingPoint num="34" id="407" />
+<TGConnectingPoint num="35" id="408" />
+<TGConnectingPoint num="36" id="409" />
+<TGConnectingPoint num="37" id="410" />
+<TGConnectingPoint num="38" id="411" />
+<TGConnectingPoint num="39" id="412" />
+<TGConnectingPoint num="40" id="413" />
+<TGConnectingPoint num="41" id="414" />
+<TGConnectingPoint num="42" id="415" />
<extraparam>
<textline data="The data exchanged between functional tasks" />
<textline data=" must be confidential" />
@@ -567,14 +784,15 @@
</extraparam>
</COMPONENT>
-<CONNECTOR type="5206" id="240" >
+<CONNECTOR type="5206" id="418" index="2" uid="98fceda9-f6d3-4469-8932-fad4895563cc" >
<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="239" />
-<P1 x="370" y="322" id="158" />
-<P2 x="370" y="253" id="205" />
+<TGConnectingPoint num="0" id="417" />
+<P1 x="370" y="322" id="336" />
+<P2 x="370" y="253" id="383" />
<AutomaticDrawing data="true" />
+<new d="false" />
</CONNECTOR>
</AvatarRDPanel>
@@ -586,69 +804,75 @@
<Modeling type="AttackTree" nameTab="RetrieveData" >
<AttackTreeDiagramPanel name="Attack Tree" minX="10" maxX="2500" minY="10" maxY="1500" zoom="1.0" >
-<CONNECTOR type="137" id="242" >
+<CONNECTOR type="137" id="420" index="0" uid="c3294c28-b0dd-4d94-9c48-2e40b9ba82de" >
<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="241" />
-<P1 x="213" y="391" id="251" />
-<P2 x="213" y="341" id="355" />
+<TGConnectingPoint num="0" id="419" />
+<P1 x="213" y="391" id="429" />
+<P2 x="213" y="341" id="533" />
<AutomaticDrawing data="true" />
+<new d="false" />
</CONNECTOR>
-<CONNECTOR type="137" id="244" >
+<CONNECTOR type="137" id="422" index="1" uid="109732ae-5539-4a2d-9ac3-4a17c30aa47f" >
<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="243" />
-<P1 x="603" y="318" id="291" />
-<P2 x="703" y="318" id="265" />
+<TGConnectingPoint num="0" id="421" />
+<P1 x="603" y="318" id="469" />
+<P2 x="703" y="318" id="443" />
<AutomaticDrawing data="true" />
+<new d="false" />
</CONNECTOR>
-<CONNECTOR type="133" id="246" >
+<CONNECTOR type="133" id="424" index="2" uid="ec984e52-21cd-43db-a8ee-b3a3feb94ade" >
<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="245" />
-<P1 x="511" y="298" id="281" />
-<P2 x="420" y="227" id="313" />
+<TGConnectingPoint num="0" id="423" />
+<P1 x="511" y="298" id="459" />
+<P2 x="420" y="227" id="491" />
<AutomaticDrawing data="true" />
+<new d="false" />
</CONNECTOR>
-<CONNECTOR type="133" id="248" >
+<CONNECTOR type="133" id="426" index="3" uid="e21ef7ce-86c8-4160-b5aa-d64cfedc655c" >
<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="247" />
-<P1 x="383" y="177" id="302" />
-<P2 x="383" y="133" id="318" />
+<TGConnectingPoint num="0" id="425" />
+<P1 x="383" y="177" id="480" />
+<P2 x="383" y="133" id="496" />
<AutomaticDrawing data="true" />
+<new d="false" />
</CONNECTOR>
-<CONNECTOR type="133" id="250" >
+<CONNECTOR type="133" id="428" index="4" uid="a27ac69e-5f30-4353-9bf9-b379145a8ac8" >
<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="249" />
-<P1 x="241" y="301" id="345" />
-<P2 x="345" y="227" id="312" />
+<TGConnectingPoint num="0" id="427" />
+<P1 x="241" y="301" id="523" />
+<P2 x="345" y="227" id="490" />
<AutomaticDrawing data="true" />
+<new d="false" />
</CONNECTOR>
-<COMPONENT type="1403" id="263" >
+<COMPONENT type="1403" id="441" index="5" uid="dfa39fc2-8c0f-4d21-85e1-3cefc8b956e3" >
<cdparam x="131" y="391" />
<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="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" />
+<new d="false" />
+<TGConnectingPoint num="0" id="429" />
+<TGConnectingPoint num="1" id="430" />
+<TGConnectingPoint num="2" id="431" />
+<TGConnectingPoint num="3" id="432" />
+<TGConnectingPoint num="4" id="433" />
+<TGConnectingPoint num="5" id="434" />
+<TGConnectingPoint num="6" id="435" />
+<TGConnectingPoint num="7" id="436" />
+<TGConnectingPoint num="8" id="437" />
+<TGConnectingPoint num="9" id="438" />
+<TGConnectingPoint num="10" id="439" />
+<TGConnectingPoint num="11" id="440" />
<extraparam>
<textline data="The bus is made unaccessible to the attaker" />
<textline data="- bus on chip" />
@@ -658,156 +882,161 @@
</extraparam>
</COMPONENT>
-<COMPONENT type="1403" id="276" >
+<COMPONENT type="1403" id="454" index="6" uid="231f5a21-2512-4dcd-9ed7-f960c43aa4ac" >
<cdparam x="715" y="298" />
<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="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" />
+<new d="false" />
+<TGConnectingPoint num="0" id="442" />
+<TGConnectingPoint num="1" id="443" />
+<TGConnectingPoint num="2" id="444" />
+<TGConnectingPoint num="3" id="445" />
+<TGConnectingPoint num="4" id="446" />
+<TGConnectingPoint num="5" id="447" />
+<TGConnectingPoint num="6" id="448" />
+<TGConnectingPoint num="7" id="449" />
+<TGConnectingPoint num="8" id="450" />
+<TGConnectingPoint num="9" id="451" />
+<TGConnectingPoint num="10" id="452" />
+<TGConnectingPoint num="11" id="453" />
<extraparam>
<textline data="See SecureFV" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1401" id="301" >
+<COMPONENT type="1401" id="479" index="7" uid="a9b63bbf-b154-40e2-a7c4-af355c0bfb30" >
<cdparam x="481" y="298" />
<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="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" />
+<new d="false" />
+<TGConnectingPoint num="0" id="455" />
+<TGConnectingPoint num="1" id="456" />
+<TGConnectingPoint num="2" id="457" />
+<TGConnectingPoint num="3" id="458" />
+<TGConnectingPoint num="4" id="459" />
+<TGConnectingPoint num="5" id="460" />
+<TGConnectingPoint num="6" id="461" />
+<TGConnectingPoint num="7" id="462" />
+<TGConnectingPoint num="8" id="463" />
+<TGConnectingPoint num="9" id="464" />
+<TGConnectingPoint num="10" id="465" />
+<TGConnectingPoint num="11" id="466" />
+<TGConnectingPoint num="12" id="467" />
+<TGConnectingPoint num="13" id="468" />
+<TGConnectingPoint num="14" id="469" />
+<TGConnectingPoint num="15" id="470" />
+<TGConnectingPoint num="16" id="471" />
+<TGConnectingPoint num="17" id="472" />
+<TGConnectingPoint num="18" id="473" />
+<TGConnectingPoint num="19" id="474" />
+<TGConnectingPoint num="20" id="475" />
+<TGConnectingPoint num="21" id="476" />
+<TGConnectingPoint num="22" id="477" />
+<TGConnectingPoint num="23" id="478" />
<extraparam>
<info description="Implemented in SecureFV" root="false" cost="0" experience="0" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1402" id="314" >
+<COMPONENT type="1402" id="492" index="8" uid="c091a501-3618-4a0a-a5a9-3523028499af" >
<cdparam x="308" y="177" />
<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="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" />
+<new d="false" />
+<TGConnectingPoint num="0" id="480" />
+<TGConnectingPoint num="1" id="481" />
+<TGConnectingPoint num="2" id="482" />
+<TGConnectingPoint num="3" id="483" />
+<TGConnectingPoint num="4" id="484" />
+<TGConnectingPoint num="5" id="485" />
+<TGConnectingPoint num="6" id="486" />
+<TGConnectingPoint num="7" id="487" />
+<TGConnectingPoint num="8" id="488" />
+<TGConnectingPoint num="9" id="489" />
+<TGConnectingPoint num="10" id="490" />
+<TGConnectingPoint num="11" id="491" />
<extraparam>
<info equation="" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1401" id="339" >
+<COMPONENT type="1401" id="517" index="9" uid="adf520e8-dcf6-4ab8-8c75-1638396ea7f4" >
<cdparam x="296" y="93" />
<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="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" />
+<new d="false" />
+<TGConnectingPoint num="0" id="493" />
+<TGConnectingPoint num="1" id="494" />
+<TGConnectingPoint num="2" id="495" />
+<TGConnectingPoint num="3" id="496" />
+<TGConnectingPoint num="4" id="497" />
+<TGConnectingPoint num="5" id="498" />
+<TGConnectingPoint num="6" id="499" />
+<TGConnectingPoint num="7" id="500" />
+<TGConnectingPoint num="8" id="501" />
+<TGConnectingPoint num="9" id="502" />
+<TGConnectingPoint num="10" id="503" />
+<TGConnectingPoint num="11" id="504" />
+<TGConnectingPoint num="12" id="505" />
+<TGConnectingPoint num="13" id="506" />
+<TGConnectingPoint num="14" id="507" />
+<TGConnectingPoint num="15" id="508" />
+<TGConnectingPoint num="16" id="509" />
+<TGConnectingPoint num="17" id="510" />
+<TGConnectingPoint num="18" id="511" />
+<TGConnectingPoint num="19" id="512" />
+<TGConnectingPoint num="20" id="513" />
+<TGConnectingPoint num="21" id="514" />
+<TGConnectingPoint num="22" id="515" />
+<TGConnectingPoint num="23" id="516" />
<accessibility />
<extraparam>
<info description="" root="true" cost="0" experience="0" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1401" id="364" >
+<COMPONENT type="1401" id="542" index="10" uid="d47045e5-a6ff-4452-99bd-993438be1426" >
<cdparam x="157" y="301" />
<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="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" />
+<new d="false" />
+<TGConnectingPoint num="0" id="518" />
+<TGConnectingPoint num="1" id="519" />
+<TGConnectingPoint num="2" id="520" />
+<TGConnectingPoint num="3" id="521" />
+<TGConnectingPoint num="4" id="522" />
+<TGConnectingPoint num="5" id="523" />
+<TGConnectingPoint num="6" id="524" />
+<TGConnectingPoint num="7" id="525" />
+<TGConnectingPoint num="8" id="526" />
+<TGConnectingPoint num="9" id="527" />
+<TGConnectingPoint num="10" id="528" />
+<TGConnectingPoint num="11" id="529" />
+<TGConnectingPoint num="12" id="530" />
+<TGConnectingPoint num="13" id="531" />
+<TGConnectingPoint num="14" id="532" />
+<TGConnectingPoint num="15" id="533" />
+<TGConnectingPoint num="16" id="534" />
+<TGConnectingPoint num="17" id="535" />
+<TGConnectingPoint num="18" id="536" />
+<TGConnectingPoint num="19" id="537" />
+<TGConnectingPoint num="20" id="538" />
+<TGConnectingPoint num="21" id="539" />
+<TGConnectingPoint num="22" id="540" />
+<TGConnectingPoint num="23" id="541" />
<extraparam>
<info description="implemented in SecureArchitectureWithNonSecureFV" root="false" cost="0" experience="0" />
</extraparam>
@@ -822,42 +1051,45 @@
<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="365" >
+<TMLComponentTaskDiagramPanel name="TML Component Task Diagram" minX="10" maxX="2500" minY="10" maxY="1500" channels="true" events="true" requests="true" considerExecOperators="true" considerTimingOperators="true" zoom="1.0" >
+<CONNECTOR type="126" id="543" index="0" uid="635927ff-f265-44c1-9fb3-bce3e059b9a4" >
<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="377" />
-<P2 x="565" y="185" id="366" />
+<P1 x="406" y="185" id="555" />
+<P2 x="565" y="185" id="544" />
<AutomaticDrawing data="true" />
+<new d="false" />
</CONNECTOR>
-<COMPONENT type="1202" id="376" >
+<COMPONENT type="1202" id="554" index="1" uid="e4cc3c45-2a2a-48f9-9648-cf634cb268d7" >
<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="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" />
+<new d="false" />
+<TGConnectingPoint num="0" id="546" />
+<TGConnectingPoint num="1" id="547" />
+<TGConnectingPoint num="2" id="548" />
+<TGConnectingPoint num="3" id="549" />
+<TGConnectingPoint num="4" id="550" />
+<TGConnectingPoint num="5" id="551" />
+<TGConnectingPoint num="6" id="552" />
+<TGConnectingPoint num="7" id="553" />
<extraparam>
<Data isAttacker="No" daemon="false" periodic="false" periodValue="" unit="" Operation="" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1203" id="367" >
-<father id="376" num="0" />
-<reference id="238" />
+<SUBCOMPONENT type="1203" id="545" index="3" uid="fdd0289d-b618-4931-9cba-a88e20066247" >
+<father id="554" num="0" />
+<reference id="416" />
<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="366" />
+<new d="false" />
+<TGConnectingPoint num="0" id="544" />
<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" vc="0" />
<Type type="0" typeOther="" />
@@ -868,33 +1100,35 @@
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="1202" id="387" >
+<COMPONENT type="1202" id="565" index="2" uid="c85f17f8-5408-49d7-bd1a-4bfcbb49834c" >
<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="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" />
+<new d="false" />
+<TGConnectingPoint num="0" id="557" />
+<TGConnectingPoint num="1" id="558" />
+<TGConnectingPoint num="2" id="559" />
+<TGConnectingPoint num="3" id="560" />
+<TGConnectingPoint num="4" id="561" />
+<TGConnectingPoint num="5" id="562" />
+<TGConnectingPoint num="6" id="563" />
+<TGConnectingPoint num="7" id="564" />
<extraparam>
<Data isAttacker="No" daemon="false" periodic="false" periodValue="" unit="" Operation="" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1203" id="378" >
-<father id="387" num="0" />
-<reference id="238" />
+<SUBCOMPONENT type="1203" id="556" index="4" uid="b332c7c7-89d5-4b2e-8322-d75e510fecde" >
+<father id="565" num="0" />
+<reference id="416" />
<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="377" />
+<new d="false" />
+<TGConnectingPoint num="0" id="555" />
<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" vc="0" />
<Type type="0" typeOther="" />
@@ -909,105 +1143,115 @@
</TMLComponentTaskDiagramPanel>
<TMLActivityDiagramPanel name="T2" minX="10" maxX="2500" minY="10" maxY="1500" zoom="1.0" >
-<COMPONENT type="1001" id="389" >
+<COMPONENT type="1001" id="567" index="0" uid="738a028a-da29-434b-a7e6-5d2fa3e3c66b" >
<cdparam x="406" y="194" />
<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="388" />
+<new d="false" />
+<TGConnectingPoint num="0" id="566" />
</COMPONENT>
-<COMPONENT type="1009" id="392" >
+<COMPONENT type="1009" id="570" index="1" uid="f581e26d-1866-44c3-9b47-8e5b3a2dda5c" >
<cdparam x="374" y="118" />
<sizeparam width="85" 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="390" />
-<TGConnectingPoint num="1" id="391" />
+<new d="false" />
+<TGConnectingPoint num="0" id="568" />
+<TGConnectingPoint num="1" id="569" />
<extraparam>
<Data channelName="comm" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1000" id="394" >
+<COMPONENT type="1000" id="572" index="2" uid="ac8f4204-90bf-48ae-992f-ac6f18213e65" >
<cdparam x="409" y="54" />
<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="393" />
+<new d="false" />
+<TGConnectingPoint num="0" id="571" />
</COMPONENT>
-<CONNECTOR type="115" id="395" >
+<CONNECTOR type="115" id="573" index="3" uid="18a4053f-9537-4915-a88e-312301b7fe47" >
<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="393" />
-<P2 x="416" y="113" id="390" />
+<P1 x="416" y="74" id="571" />
+<P2 x="416" y="113" id="568" />
<AutomaticDrawing data="true" />
+<new d="false" />
</CONNECTOR>
-<CONNECTOR type="115" id="396" >
+<CONNECTOR type="115" id="574" index="4" uid="5bba138d-506d-406c-aa86-a6667c91bb27" >
<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="391" />
-<P2 x="416" y="189" id="388" />
+<P1 x="416" y="143" id="569" />
+<P2 x="416" y="189" id="566" />
<AutomaticDrawing data="true" />
+<new d="false" />
</CONNECTOR>
</TMLActivityDiagramPanel>
<TMLActivityDiagramPanel name="T1" minX="10" maxX="2500" minY="10" maxY="1500" zoom="1.0" >
-<COMPONENT type="1001" id="398" >
+<COMPONENT type="1001" id="576" index="0" uid="479bb2bb-7ba5-4011-aab1-198019da61b2" >
<cdparam x="404" y="175" />
<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="397" />
+<new d="false" />
+<TGConnectingPoint num="0" id="575" />
</COMPONENT>
-<COMPONENT type="1006" id="401" >
+<COMPONENT type="1006" id="579" index="1" uid="be57f23b-8b9d-4ac2-9748-d0f96a80c381" >
<cdparam x="374" y="111" />
<sizeparam width="81" 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="399" />
-<TGConnectingPoint num="1" id="400" />
+<new d="false" />
+<TGConnectingPoint num="0" id="577" />
+<TGConnectingPoint num="1" id="578" />
<extraparam>
<Data channelName="comm" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1000" id="403" >
+<COMPONENT type="1000" id="581" index="2" uid="1db20ad3-97f3-460d-9ae7-522dbadba48b" >
<cdparam x="407" y="51" />
<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="402" />
+<new d="false" />
+<TGConnectingPoint num="0" id="580" />
</COMPONENT>
-<CONNECTOR type="115" id="404" >
+<CONNECTOR type="115" id="582" index="3" uid="88db4e00-0223-46c6-8c17-cb382008fb61" >
<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="402" />
-<P2 x="414" y="106" id="399" />
+<P1 x="414" y="71" id="580" />
+<P2 x="414" y="106" id="577" />
<AutomaticDrawing data="true" />
+<new d="false" />
</CONNECTOR>
-<CONNECTOR type="115" id="405" >
+<CONNECTOR type="115" id="583" index="4" uid="e1a56988-e20e-4cc1-a64c-56e880d9b1c6" >
<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="400" />
-<P2 x="414" y="170" id="397" />
+<P1 x="414" y="136" id="578" />
+<P2 x="414" y="170" id="575" />
<AutomaticDrawing data="true" />
+<new d="false" />
</CONNECTOR>
</TMLActivityDiagramPanel>
@@ -1018,258 +1262,269 @@
<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" zoom="1.0" >
-<COMPONENT type="1105" id="439" >
+<TMLArchiDiagramPanel name="DIPLODOCUS architecture and mapping Diagram" minX="10" maxX="2500" minY="10" maxY="1500" attributes="0" considerExecOperators="true" considerTimingOperators="true" masterClockFrequency="200" zoom="1.0" >
+<COMPONENT type="1105" id="617" index="0" uid="d434233d-ac3a-4591-94ed-95df05dda8c8" >
<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="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" />
+<new d="false" />
+<TGConnectingPoint num="0" id="593" />
+<TGConnectingPoint num="1" id="594" />
+<TGConnectingPoint num="2" id="595" />
+<TGConnectingPoint num="3" id="596" />
+<TGConnectingPoint num="4" id="597" />
+<TGConnectingPoint num="5" id="598" />
+<TGConnectingPoint num="6" id="599" />
+<TGConnectingPoint num="7" id="600" />
+<TGConnectingPoint num="8" id="601" />
+<TGConnectingPoint num="9" id="602" />
+<TGConnectingPoint num="10" id="603" />
+<TGConnectingPoint num="11" id="604" />
+<TGConnectingPoint num="12" id="605" />
+<TGConnectingPoint num="13" id="606" />
+<TGConnectingPoint num="14" id="607" />
+<TGConnectingPoint num="15" id="608" />
+<TGConnectingPoint num="16" id="609" />
+<TGConnectingPoint num="17" id="610" />
+<TGConnectingPoint num="18" id="611" />
+<TGConnectingPoint num="19" id="612" />
+<TGConnectingPoint num="20" id="613" />
+<TGConnectingPoint num="21" id="614" />
+<TGConnectingPoint num="22" id="615" />
+<TGConnectingPoint num="23" id="616" />
<extraparam>
<info stereotype="MEMORY" nodeName="MainMemory" />
<attributes byteDataSize="4" memorySize="1024" clockRatio="1" bufferType="0" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1103" id="414" >
-<father id="439" num="0" />
+<SUBCOMPONENT type="1103" id="592" index="7" uid="a65d76c2-6824-4deb-9505-6147202d36f0" >
+<father id="617" num="0" />
<cdparam x="614" y="545" />
<sizeparam width="153" height="40" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="52" minY="0" maxY="99" />
<infoparam name="TGComponent" value="NonSecureFV::comm" />
-<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" />
+<new d="false" />
+<TGConnectingPoint num="0" id="584" />
+<TGConnectingPoint num="1" id="585" />
+<TGConnectingPoint num="2" id="586" />
+<TGConnectingPoint num="3" id="587" />
+<TGConnectingPoint num="4" id="588" />
+<TGConnectingPoint num="5" id="589" />
+<TGConnectingPoint num="6" id="590" />
+<TGConnectingPoint num="7" id="591" />
+<extraparam>
+<info value="NonSecureFV::comm" communicationName="comm" referenceCommunicationName="NonSecureFV" mappedElements="" priority="0" typeName="channel" />
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="1102" id="473" >
+<COMPONENT type="1102" id="651" index="1" uid="dcccc103-f1f6-493a-b8c0-8e109dc21b92" >
<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="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" />
+<new d="false" />
+<TGConnectingPoint num="0" id="627" />
+<TGConnectingPoint num="1" id="628" />
+<TGConnectingPoint num="2" id="629" />
+<TGConnectingPoint num="3" id="630" />
+<TGConnectingPoint num="4" id="631" />
+<TGConnectingPoint num="5" id="632" />
+<TGConnectingPoint num="6" id="633" />
+<TGConnectingPoint num="7" id="634" />
+<TGConnectingPoint num="8" id="635" />
+<TGConnectingPoint num="9" id="636" />
+<TGConnectingPoint num="10" id="637" />
+<TGConnectingPoint num="11" id="638" />
+<TGConnectingPoint num="12" id="639" />
+<TGConnectingPoint num="13" id="640" />
+<TGConnectingPoint num="14" id="641" />
+<TGConnectingPoint num="15" id="642" />
+<TGConnectingPoint num="16" id="643" />
+<TGConnectingPoint num="17" id="644" />
+<TGConnectingPoint num="18" id="645" />
+<TGConnectingPoint num="19" id="646" />
+<TGConnectingPoint num="20" id="647" />
+<TGConnectingPoint num="21" id="648" />
+<TGConnectingPoint num="22" id="649" />
+<TGConnectingPoint num="23" id="650" />
<extraparam>
<info stereotype="BUS-RR" nodeName="MainBus" />
-<attributes byteDataSize="4" arbitrationPolicy="0" sliceTime="10000" pipelineSize="1" clockRatio="1" privacy="0" referenceAttack="null" />
+<attributes byteDataSize="4" arbitrationPolicy="0" sliceTime="10000" pipelineSize="1" burstSize="100" clockRatio="1" privacy="0" referenceAttack="null" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1103" id="448" >
-<father id="473" num="0" />
+<SUBCOMPONENT type="1103" id="626" index="8" uid="41128a9f-2f01-44b0-9030-90c1b8e6163a" >
+<father id="651" num="0" />
<cdparam x="609" y="398" />
<sizeparam width="153" height="40" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="97" minY="0" maxY="56" />
<infoparam name="TGComponent" value="NonSecureFV::comm" />
-<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" />
+<new d="false" />
+<TGConnectingPoint num="0" id="618" />
+<TGConnectingPoint num="1" id="619" />
+<TGConnectingPoint num="2" id="620" />
+<TGConnectingPoint num="3" id="621" />
+<TGConnectingPoint num="4" id="622" />
+<TGConnectingPoint num="5" id="623" />
+<TGConnectingPoint num="6" id="624" />
+<TGConnectingPoint num="7" id="625" />
+<extraparam>
+<info value="NonSecureFV::comm" communicationName="comm" referenceCommunicationName="NonSecureFV" mappedElements="" priority="0" typeName="channel" />
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="1100" id="507" >
+<COMPONENT type="1100" id="685" index="2" uid="f40664c0-53f1-4943-8f95-78f8ed4f5eb1" >
<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="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" />
+<new d="false" />
+<TGConnectingPoint num="0" id="661" />
+<TGConnectingPoint num="1" id="662" />
+<TGConnectingPoint num="2" id="663" />
+<TGConnectingPoint num="3" id="664" />
+<TGConnectingPoint num="4" id="665" />
+<TGConnectingPoint num="5" id="666" />
+<TGConnectingPoint num="6" id="667" />
+<TGConnectingPoint num="7" id="668" />
+<TGConnectingPoint num="8" id="669" />
+<TGConnectingPoint num="9" id="670" />
+<TGConnectingPoint num="10" id="671" />
+<TGConnectingPoint num="11" id="672" />
+<TGConnectingPoint num="12" id="673" />
+<TGConnectingPoint num="13" id="674" />
+<TGConnectingPoint num="14" id="675" />
+<TGConnectingPoint num="15" id="676" />
+<TGConnectingPoint num="16" id="677" />
+<TGConnectingPoint num="17" id="678" />
+<TGConnectingPoint num="18" id="679" />
+<TGConnectingPoint num="19" id="680" />
+<TGConnectingPoint num="20" id="681" />
+<TGConnectingPoint num="21" id="682" />
+<TGConnectingPoint num="22" id="683" />
+<TGConnectingPoint num="23" id="684" />
<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" operation="" MECType="0" encryption="0"/>
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1101" id="482" >
-<father id="507" num="0" />
+<SUBCOMPONENT type="1101" id="660" index="9" uid="59517a11-a754-4d48-bea2-fb47e6f44706" >
+<father id="685" num="0" />
<cdparam x="933" y="219" />
<sizeparam width="134" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="116" minY="0" maxY="160" />
<infoparam name="TGComponent" value="NonSecureFV::T2" />
-<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" />
+<new d="false" />
+<TGConnectingPoint num="0" id="652" />
+<TGConnectingPoint num="1" id="653" />
+<TGConnectingPoint num="2" id="654" />
+<TGConnectingPoint num="3" id="655" />
+<TGConnectingPoint num="4" id="656" />
+<TGConnectingPoint num="5" id="657" />
+<TGConnectingPoint num="6" id="658" />
+<TGConnectingPoint num="7" id="659" />
<extraparam>
<info value="NonSecureFV::T2" taskName="T2" referenceTaskName="NonSecureFV" priority="0" operationMEC="T2" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="1100" id="541" >
+<COMPONENT type="1100" id="719" index="3" uid="c3de4b31-22e4-498c-a20a-9d711edb3cff" >
<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="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" />
+<new d="false" />
+<TGConnectingPoint num="0" id="695" />
+<TGConnectingPoint num="1" id="696" />
+<TGConnectingPoint num="2" id="697" />
+<TGConnectingPoint num="3" id="698" />
+<TGConnectingPoint num="4" id="699" />
+<TGConnectingPoint num="5" id="700" />
+<TGConnectingPoint num="6" id="701" />
+<TGConnectingPoint num="7" id="702" />
+<TGConnectingPoint num="8" id="703" />
+<TGConnectingPoint num="9" id="704" />
+<TGConnectingPoint num="10" id="705" />
+<TGConnectingPoint num="11" id="706" />
+<TGConnectingPoint num="12" id="707" />
+<TGConnectingPoint num="13" id="708" />
+<TGConnectingPoint num="14" id="709" />
+<TGConnectingPoint num="15" id="710" />
+<TGConnectingPoint num="16" id="711" />
+<TGConnectingPoint num="17" id="712" />
+<TGConnectingPoint num="18" id="713" />
+<TGConnectingPoint num="19" id="714" />
+<TGConnectingPoint num="20" id="715" />
+<TGConnectingPoint num="21" id="716" />
+<TGConnectingPoint num="22" id="717" />
+<TGConnectingPoint num="23" id="718" />
<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" operation="" MECType="0" encryption="0"/>
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1101" id="516" >
-<father id="541" num="0" />
+<SUBCOMPONENT type="1101" id="694" index="10" uid="f5e82e77-56ed-47bb-b087-809dc72e68dc" >
+<father id="719" num="0" />
<cdparam x="288" y="213" />
<sizeparam width="134" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="116" minY="0" maxY="160" />
<infoparam name="TGComponent" value="NonSecureFV::T1" />
-<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" />
+<new d="false" />
+<TGConnectingPoint num="0" id="686" />
+<TGConnectingPoint num="1" id="687" />
+<TGConnectingPoint num="2" id="688" />
+<TGConnectingPoint num="3" id="689" />
+<TGConnectingPoint num="4" id="690" />
+<TGConnectingPoint num="5" id="691" />
+<TGConnectingPoint num="6" id="692" />
+<TGConnectingPoint num="7" id="693" />
<extraparam>
<info value="NonSecureFV::T1" taskName="T1" referenceTaskName="NonSecureFV" priority="0" operationMEC="T2" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="125" id="542" >
+<CONNECTOR type="125" id="720" index="4" uid="d04b7f56-f592-41ed-b0e1-abf70c951c4f" >
<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="497" />
-<P2 x="819" y="381" id="460" />
+<P1 x="953" y="337" id="675" />
+<P2 x="819" y="381" id="638" />
<AutomaticDrawing data="true" />
+<new d="false" />
<extraparam>
<info priority="0" />
<spy value="false" />
</extraparam>
</CONNECTOR>
-<CONNECTOR type="125" id="543" >
+<CONNECTOR type="125" id="721" index="5" uid="c1235dae-8346-4ff4-b337-7bf010367c53" >
<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="532" />
-<P2 x="569" y="381" id="459" />
+<P1 x="423" y="344" id="710" />
+<P2 x="569" y="381" id="637" />
<AutomaticDrawing data="true" />
+<new d="false" />
<extraparam>
<info priority="0" />
<spy value="false" />
</extraparam>
</CONNECTOR>
-<CONNECTOR type="125" id="544" >
+<CONNECTOR type="125" id="722" index="6" uid="effe8ebb-6531-4c27-857f-b28e819229cc" >
<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="416" />
-<P2 x="694" y="453" id="455" />
+<P1 x="694" y="493" id="594" />
+<P2 x="694" y="453" id="633" />
<AutomaticDrawing data="true" />
+<new d="false" />
<extraparam>
<info priority="0" />
<spy value="false" />
@@ -1284,258 +1539,269 @@
<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" zoom="1.0" >
-<COMPONENT type="1105" id="578" >
+<TMLArchiDiagramPanel name="DIPLODOCUS architecture and mapping Diagram" minX="10" maxX="2500" minY="10" maxY="1500" attributes="0" considerExecOperators="true" considerTimingOperators="true" masterClockFrequency="200" zoom="1.0" >
+<COMPONENT type="1105" id="756" index="0" uid="3484f2dc-c2c9-4af1-b2b5-bd3e71f72ee1" >
<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="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" />
+<new d="false" />
+<TGConnectingPoint num="0" id="732" />
+<TGConnectingPoint num="1" id="733" />
+<TGConnectingPoint num="2" id="734" />
+<TGConnectingPoint num="3" id="735" />
+<TGConnectingPoint num="4" id="736" />
+<TGConnectingPoint num="5" id="737" />
+<TGConnectingPoint num="6" id="738" />
+<TGConnectingPoint num="7" id="739" />
+<TGConnectingPoint num="8" id="740" />
+<TGConnectingPoint num="9" id="741" />
+<TGConnectingPoint num="10" id="742" />
+<TGConnectingPoint num="11" id="743" />
+<TGConnectingPoint num="12" id="744" />
+<TGConnectingPoint num="13" id="745" />
+<TGConnectingPoint num="14" id="746" />
+<TGConnectingPoint num="15" id="747" />
+<TGConnectingPoint num="16" id="748" />
+<TGConnectingPoint num="17" id="749" />
+<TGConnectingPoint num="18" id="750" />
+<TGConnectingPoint num="19" id="751" />
+<TGConnectingPoint num="20" id="752" />
+<TGConnectingPoint num="21" id="753" />
+<TGConnectingPoint num="22" id="754" />
+<TGConnectingPoint num="23" id="755" />
<extraparam>
<info stereotype="MEMORY" nodeName="MainMemory" />
<attributes byteDataSize="4" memorySize="1024" clockRatio="1" bufferType="0" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1103" id="553" >
-<father id="578" num="0" />
+<SUBCOMPONENT type="1103" id="731" index="7" uid="eb26aaff-030f-4330-a093-dc9fdb7c0fc5" >
+<father id="756" num="0" />
<cdparam x="616" y="563" />
<sizeparam width="153" height="40" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="52" minY="0" maxY="99" />
<infoparam name="TGComponent" value="NonSecureFV::comm" />
-<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" />
+<new d="false" />
+<TGConnectingPoint num="0" id="723" />
+<TGConnectingPoint num="1" id="724" />
+<TGConnectingPoint num="2" id="725" />
+<TGConnectingPoint num="3" id="726" />
+<TGConnectingPoint num="4" id="727" />
+<TGConnectingPoint num="5" id="728" />
+<TGConnectingPoint num="6" id="729" />
+<TGConnectingPoint num="7" id="730" />
<extraparam>
-<info value="NonSecureFV::comm" communicationName="comm" referenceCommunicationName="NonSecureFV" priority="0" typeName="channel" />
+<info value="NonSecureFV::comm" communicationName="comm" referenceCommunicationName="NonSecureFV" mappedElements="" priority="0" typeName="channel" />
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="1102" id="612" >
+<COMPONENT type="1102" id="790" index="1" uid="01ada240-2413-4531-8d48-7f9da8277b7e" >
<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="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" />
+<new d="false" />
+<TGConnectingPoint num="0" id="766" />
+<TGConnectingPoint num="1" id="767" />
+<TGConnectingPoint num="2" id="768" />
+<TGConnectingPoint num="3" id="769" />
+<TGConnectingPoint num="4" id="770" />
+<TGConnectingPoint num="5" id="771" />
+<TGConnectingPoint num="6" id="772" />
+<TGConnectingPoint num="7" id="773" />
+<TGConnectingPoint num="8" id="774" />
+<TGConnectingPoint num="9" id="775" />
+<TGConnectingPoint num="10" id="776" />
+<TGConnectingPoint num="11" id="777" />
+<TGConnectingPoint num="12" id="778" />
+<TGConnectingPoint num="13" id="779" />
+<TGConnectingPoint num="14" id="780" />
+<TGConnectingPoint num="15" id="781" />
+<TGConnectingPoint num="16" id="782" />
+<TGConnectingPoint num="17" id="783" />
+<TGConnectingPoint num="18" id="784" />
+<TGConnectingPoint num="19" id="785" />
+<TGConnectingPoint num="20" id="786" />
+<TGConnectingPoint num="21" id="787" />
+<TGConnectingPoint num="22" id="788" />
+<TGConnectingPoint num="23" id="789" />
<extraparam>
<info stereotype="BUS-RR" nodeName="MainBus" />
-<attributes byteDataSize="4" arbitrationPolicy="0" sliceTime="10000" pipelineSize="1" clockRatio="1" privacy="1" referenceAttack="ReadDataOnBus" />
+<attributes byteDataSize="4" arbitrationPolicy="0" sliceTime="10000" pipelineSize="1" burstSize="100" clockRatio="1" privacy="1" referenceAttack="ReadDataOnBus" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1103" id="587" >
-<father id="612" num="0" />
+<SUBCOMPONENT type="1103" id="765" index="8" uid="7a57b30e-5089-4cbf-b78d-4dcf9d5463c3" >
+<father id="790" num="0" />
<cdparam x="609" y="398" />
<sizeparam width="153" height="40" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="97" minY="0" maxY="56" />
<infoparam name="TGComponent" value="NonSecureFV::comm" />
-<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" />
+<new d="false" />
+<TGConnectingPoint num="0" id="757" />
+<TGConnectingPoint num="1" id="758" />
+<TGConnectingPoint num="2" id="759" />
+<TGConnectingPoint num="3" id="760" />
+<TGConnectingPoint num="4" id="761" />
+<TGConnectingPoint num="5" id="762" />
+<TGConnectingPoint num="6" id="763" />
+<TGConnectingPoint num="7" id="764" />
+<extraparam>
+<info value="NonSecureFV::comm" communicationName="comm" referenceCommunicationName="NonSecureFV" mappedElements="" priority="0" typeName="channel" />
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="1100" id="646" >
+<COMPONENT type="1100" id="824" index="2" uid="3cc269cb-2924-4394-b558-fef14e147b12" >
<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="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" />
+<new d="false" />
+<TGConnectingPoint num="0" id="800" />
+<TGConnectingPoint num="1" id="801" />
+<TGConnectingPoint num="2" id="802" />
+<TGConnectingPoint num="3" id="803" />
+<TGConnectingPoint num="4" id="804" />
+<TGConnectingPoint num="5" id="805" />
+<TGConnectingPoint num="6" id="806" />
+<TGConnectingPoint num="7" id="807" />
+<TGConnectingPoint num="8" id="808" />
+<TGConnectingPoint num="9" id="809" />
+<TGConnectingPoint num="10" id="810" />
+<TGConnectingPoint num="11" id="811" />
+<TGConnectingPoint num="12" id="812" />
+<TGConnectingPoint num="13" id="813" />
+<TGConnectingPoint num="14" id="814" />
+<TGConnectingPoint num="15" id="815" />
+<TGConnectingPoint num="16" id="816" />
+<TGConnectingPoint num="17" id="817" />
+<TGConnectingPoint num="18" id="818" />
+<TGConnectingPoint num="19" id="819" />
+<TGConnectingPoint num="20" id="820" />
+<TGConnectingPoint num="21" id="821" />
+<TGConnectingPoint num="22" id="822" />
+<TGConnectingPoint num="23" id="823" />
<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" operation="" MECType="0" encryption="0"/>
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1101" id="621" >
-<father id="646" num="0" />
+<SUBCOMPONENT type="1101" id="799" index="9" uid="9d476f54-2428-45df-85e7-1af4892ceb05" >
+<father id="824" num="0" />
<cdparam x="933" y="219" />
<sizeparam width="134" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="116" minY="0" maxY="160" />
<infoparam name="TGComponent" value="NonSecureFV::T2" />
-<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" />
+<new d="false" />
+<TGConnectingPoint num="0" id="791" />
+<TGConnectingPoint num="1" id="792" />
+<TGConnectingPoint num="2" id="793" />
+<TGConnectingPoint num="3" id="794" />
+<TGConnectingPoint num="4" id="795" />
+<TGConnectingPoint num="5" id="796" />
+<TGConnectingPoint num="6" id="797" />
+<TGConnectingPoint num="7" id="798" />
<extraparam>
<info value="NonSecureFV::T2" taskName="T2" referenceTaskName="NonSecureFV" priority="0" operationMEC="T2" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="1100" id="680" >
+<COMPONENT type="1100" id="858" index="3" uid="28e114a5-cc5d-4501-a385-08dc6bedbcb8" >
<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="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" />
+<new d="false" />
+<TGConnectingPoint num="0" id="834" />
+<TGConnectingPoint num="1" id="835" />
+<TGConnectingPoint num="2" id="836" />
+<TGConnectingPoint num="3" id="837" />
+<TGConnectingPoint num="4" id="838" />
+<TGConnectingPoint num="5" id="839" />
+<TGConnectingPoint num="6" id="840" />
+<TGConnectingPoint num="7" id="841" />
+<TGConnectingPoint num="8" id="842" />
+<TGConnectingPoint num="9" id="843" />
+<TGConnectingPoint num="10" id="844" />
+<TGConnectingPoint num="11" id="845" />
+<TGConnectingPoint num="12" id="846" />
+<TGConnectingPoint num="13" id="847" />
+<TGConnectingPoint num="14" id="848" />
+<TGConnectingPoint num="15" id="849" />
+<TGConnectingPoint num="16" id="850" />
+<TGConnectingPoint num="17" id="851" />
+<TGConnectingPoint num="18" id="852" />
+<TGConnectingPoint num="19" id="853" />
+<TGConnectingPoint num="20" id="854" />
+<TGConnectingPoint num="21" id="855" />
+<TGConnectingPoint num="22" id="856" />
+<TGConnectingPoint num="23" id="857" />
<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" operation="" MECType="0" encryption="0"/>
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1101" id="655" >
-<father id="680" num="0" />
+<SUBCOMPONENT type="1101" id="833" index="10" uid="8ebaea4c-20ed-4c7e-94e0-21f6616b4a53" >
+<father id="858" num="0" />
<cdparam x="288" y="213" />
<sizeparam width="134" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="116" minY="0" maxY="160" />
<infoparam name="TGComponent" value="NonSecureFV::T1" />
-<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" />
+<new d="false" />
+<TGConnectingPoint num="0" id="825" />
+<TGConnectingPoint num="1" id="826" />
+<TGConnectingPoint num="2" id="827" />
+<TGConnectingPoint num="3" id="828" />
+<TGConnectingPoint num="4" id="829" />
+<TGConnectingPoint num="5" id="830" />
+<TGConnectingPoint num="6" id="831" />
+<TGConnectingPoint num="7" id="832" />
<extraparam>
<info value="NonSecureFV::T1" taskName="T1" referenceTaskName="NonSecureFV" priority="0" operationMEC="T2" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="125" id="681" >
+<CONNECTOR type="125" id="859" index="4" uid="f5a0d9d9-e022-465f-a8a9-56c18f708382" >
<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="636" />
-<P2 x="819" y="381" id="599" />
+<P1 x="953" y="337" id="814" />
+<P2 x="819" y="381" id="777" />
<AutomaticDrawing data="true" />
+<new d="false" />
<extraparam>
<info priority="0" />
<spy value="false" />
</extraparam>
</CONNECTOR>
-<CONNECTOR type="125" id="682" >
+<CONNECTOR type="125" id="860" index="5" uid="7d625831-2bf5-423d-9e0f-6179efc37b4a" >
<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="671" />
-<P2 x="569" y="381" id="598" />
+<P1 x="423" y="344" id="849" />
+<P2 x="569" y="381" id="776" />
<AutomaticDrawing data="true" />
+<new d="false" />
<extraparam>
<info priority="0" />
<spy value="false" />
</extraparam>
</CONNECTOR>
-<CONNECTOR type="125" id="683" >
+<CONNECTOR type="125" id="861" index="6" uid="2383240f-8659-4052-bc77-6a61680a180b" >
<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="555" />
-<P2 x="694" y="453" id="594" />
+<P1 x="696" y="511" id="733" />
+<P2 x="694" y="453" id="772" />
<AutomaticDrawing data="true" />
+<new d="false" />
<extraparam>
<info priority="0" />
<spy value="false" />
@@ -1550,44 +1816,47 @@
<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="684" >
+<TMLComponentTaskDiagramPanel name="TML Component Task Diagram" minX="10" maxX="2500" minY="10" maxY="1500" channels="true" events="true" requests="true" considerExecOperators="true" considerTimingOperators="true" zoom="1.0" >
+<CONNECTOR type="126" id="862" index="0" uid="c3a4c977-6a1c-4e9c-a8d0-95e473a1f065" >
<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="696" />
-<P2 x="583" y="185" id="685" />
+<P1 x="419" y="198" id="874" />
+<P2 x="570" y="198" id="863" />
<AutomaticDrawing data="true" />
+<new d="false" />
</CONNECTOR>
-<COMPONENT type="1202" id="695" >
+<COMPONENT type="1202" id="873" index="1" uid="0a787f9f-9563-4c32-9184-62ef776bebc7" >
<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="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" />
+<new d="false" />
+<TGConnectingPoint num="0" id="865" />
+<TGConnectingPoint num="1" id="866" />
+<TGConnectingPoint num="2" id="867" />
+<TGConnectingPoint num="3" id="868" />
+<TGConnectingPoint num="4" id="869" />
+<TGConnectingPoint num="5" id="870" />
+<TGConnectingPoint num="6" id="871" />
+<TGConnectingPoint num="7" id="872" />
<extraparam>
<Data isAttacker="No" daemon="false" periodic="false" periodValue="" unit="" Operation="" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1203" id="686" >
-<father id="695" num="0" />
-<reference id="238" />
+<SUBCOMPONENT type="1203" id="864" index="3" uid="0f4843d4-fd37-4307-84d5-a8f0db0fe91e" >
+<father id="873" num="0" />
+<reference id="416" />
<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="685" />
+<new d="false" />
+<TGConnectingPoint num="0" id="863" />
<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" vc="0" />
+<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="true" checkWeakAuthStatus="1" checkStrongAuthStatus="1" vc="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -1596,35 +1865,37 @@
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="1202" id="706" >
+<COMPONENT type="1202" id="884" index="2" uid="a06fb0ae-b6bc-41bf-8bf6-a3c2be508520" >
<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="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" />
+<new d="false" />
+<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" />
<extraparam>
<Data isAttacker="No" daemon="false" periodic="false" periodValue="" unit="" Operation="" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1203" id="697" >
-<father id="706" num="0" />
-<reference id="238" />
+<SUBCOMPONENT type="1203" id="875" index="4" uid="3d6909b3-05a7-43c4-891f-a62b41d3c942" >
+<father id="884" num="0" />
+<reference id="416" />
<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="696" />
+<new d="false" />
+<TGConnectingPoint num="0" id="874" />
<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" vc="0" />
+<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="1" checkStrongAuthStatus="1" vc="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -1637,149 +1908,163 @@
</TMLComponentTaskDiagramPanel>
<TMLActivityDiagramPanel name="T2" minX="10" maxX="2500" minY="10" maxY="1500" zoom="1.0" >
-<COMPONENT type="1036" id="709" >
+<COMPONENT type="1036" id="887" index="0" uid="25177290-a4e4-49df-a8dd-5e72bc310467" >
<cdparam x="409" y="180" />
<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="707" />
-<TGConnectingPoint num="1" id="708" />
+<new d="false" />
+<TGConnectingPoint num="0" id="885" />
+<TGConnectingPoint num="1" id="886" />
<extraparam>
<Data secPattern="Cipherdata" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1001" id="711" >
+<COMPONENT type="1001" id="889" index="1" uid="1ee82e42-edea-42cb-8100-9a7b6a2a2b19" >
<cdparam x="406" y="281" />
<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="710" />
+<new d="false" />
+<TGConnectingPoint num="0" id="888" />
</COMPONENT>
-<COMPONENT type="1009" id="714" >
+<COMPONENT type="1009" id="892" index="2" uid="12e04032-b7fa-43d7-a314-b8c448f4b0d4" >
<cdparam x="374" y="118" />
<sizeparam width="85" 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="712" />
-<TGConnectingPoint num="1" id="713" />
+<new d="false" />
+<TGConnectingPoint num="0" id="890" />
+<TGConnectingPoint num="1" id="891" />
<extraparam>
<Data channelName="comm" nbOfSamples="1" secPattern="Cipherdata" isAttacker="No" isEncForm="Yes" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1000" id="716" >
+<COMPONENT type="1000" id="894" index="3" uid="9441a2dd-22f8-40b6-807c-ff4c515b1da2" >
<cdparam x="409" y="58" />
<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="715" />
+<new d="false" />
+<TGConnectingPoint num="0" id="893" />
</COMPONENT>
-<CONNECTOR type="115" id="717" >
+<CONNECTOR type="115" id="895" index="4" uid="9864fd26-2493-468e-b13a-fd7d001bc873" >
<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="708" />
-<P2 x="416" y="276" id="710" />
+<P1 x="416" y="225" id="886" />
+<P2 x="416" y="276" id="888" />
<AutomaticDrawing data="true" />
+<new d="false" />
</CONNECTOR>
-<CONNECTOR type="115" id="718" >
+<CONNECTOR type="115" id="896" index="5" uid="4ffc018f-3100-454e-abc4-139546895370" >
<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="715" />
-<P2 x="416" y="113" id="712" />
+<P1 x="416" y="78" id="893" />
+<P2 x="416" y="113" id="890" />
<AutomaticDrawing data="true" />
+<new d="false" />
</CONNECTOR>
-<CONNECTOR type="115" id="719" >
+<CONNECTOR type="115" id="897" index="6" uid="74148569-58fc-4496-84f0-d49cb4aebc82" >
<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="713" />
-<P2 x="416" y="175" id="707" />
+<P1 x="416" y="143" id="891" />
+<P2 x="416" y="175" id="885" />
<AutomaticDrawing data="true" />
+<new d="false" />
</CONNECTOR>
</TMLActivityDiagramPanel>
<TMLActivityDiagramPanel name="T1" minX="10" maxX="2500" minY="10" maxY="1500" zoom="1.0" >
-<COMPONENT type="1035" id="722" >
+<COMPONENT type="1035" id="900" index="0" uid="9288d8d7-ba1f-4507-b2f5-7568cbe44b88" >
<cdparam x="408" y="104" />
<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="720" />
-<TGConnectingPoint num="1" id="721" />
+<new d="false" />
+<TGConnectingPoint num="0" id="898" />
+<TGConnectingPoint num="1" id="899" />
<extraparam>
<Data secContext="Cipherdata" type="Symmetric Encryption" overhead="" size="" encTime="100" decTime="100" nonce="" key="" algorithm="" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1001" id="724" >
+<COMPONENT type="1001" id="902" index="1" uid="a1e8a7be-64dc-4dad-aca6-8046e45a7d02" >
<cdparam x="405" y="265" />
<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="723" />
+<new d="false" />
+<TGConnectingPoint num="0" id="901" />
</COMPONENT>
-<COMPONENT type="1006" id="727" >
+<COMPONENT type="1006" id="905" index="2" uid="deffe867-20c7-4b9a-a305-f5889b69e9b5" >
<cdparam x="375" y="184" />
<sizeparam width="81" 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="725" />
-<TGConnectingPoint num="1" id="726" />
+<new d="false" />
+<TGConnectingPoint num="0" id="903" />
+<TGConnectingPoint num="1" id="904" />
<extraparam>
<Data channelName="comm" nbOfSamples="1" secPattern="Cipherdata" isAttacker="No" isEncForm="Yes" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1000" id="729" >
+<COMPONENT type="1000" id="907" index="3" uid="3d587876-6831-4852-8656-ff523de1a7f5" >
<cdparam x="408" y="41" />
<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="728" />
+<new d="false" />
+<TGConnectingPoint num="0" id="906" />
</COMPONENT>
-<CONNECTOR type="115" id="730" >
+<CONNECTOR type="115" id="908" index="4" uid="450214b1-7b34-4cad-bb09-cd17fd487990" >
<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="721" />
-<P2 x="415" y="179" id="725" />
+<P1 x="415" y="149" id="899" />
+<P2 x="415" y="179" id="903" />
<AutomaticDrawing data="true" />
+<new d="false" />
</CONNECTOR>
-<CONNECTOR type="115" id="731" >
+<CONNECTOR type="115" id="909" index="5" uid="5d82eb05-73e6-484d-b633-acfbcf21cedf" >
<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="728" />
-<P2 x="415" y="99" id="720" />
+<P1 x="415" y="61" id="906" />
+<P2 x="415" y="99" id="898" />
<AutomaticDrawing data="true" />
+<new d="false" />
</CONNECTOR>
-<CONNECTOR type="115" id="732" >
+<CONNECTOR type="115" id="910" index="6" uid="47486b85-861b-4cd0-ab2e-3bc790ca8604" >
<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="726" />
-<P2 x="415" y="260" id="723" />
+<P1 x="415" y="209" id="904" />
+<P2 x="415" y="260" id="901" />
<AutomaticDrawing data="true" />
+<new d="false" />
</CONNECTOR>
</TMLActivityDiagramPanel>
@@ -1790,258 +2075,289 @@
<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" zoom="1.0" >
-<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" />
+<TMLArchiDiagramPanel name="DIPLODOCUS architecture and mapping Diagram" minX="10" maxX="2500" minY="10" maxY="1500" attributes="0" considerExecOperators="true" considerTimingOperators="true" masterClockFrequency="200" zoom="1.0" >
+<COMPONENT type="1105" id="953" index="0" uid="381bdee2-9fbc-4094-892b-5408ef9eaa67" >
+<cdparam x="562" y="492" />
+<sizeparam width="273" height="144" 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="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" />
+<new d="false" />
+<TGConnectingPoint num="0" id="929" />
+<TGConnectingPoint num="1" id="930" />
+<TGConnectingPoint num="2" id="931" />
+<TGConnectingPoint num="3" id="932" />
+<TGConnectingPoint num="4" id="933" />
+<TGConnectingPoint num="5" id="934" />
+<TGConnectingPoint num="6" id="935" />
+<TGConnectingPoint num="7" id="936" />
+<TGConnectingPoint num="8" id="937" />
+<TGConnectingPoint num="9" id="938" />
+<TGConnectingPoint num="10" id="939" />
+<TGConnectingPoint num="11" id="940" />
+<TGConnectingPoint num="12" id="941" />
+<TGConnectingPoint num="13" id="942" />
+<TGConnectingPoint num="14" id="943" />
+<TGConnectingPoint num="15" id="944" />
+<TGConnectingPoint num="16" id="945" />
+<TGConnectingPoint num="17" id="946" />
+<TGConnectingPoint num="18" id="947" />
+<TGConnectingPoint num="19" id="948" />
+<TGConnectingPoint num="20" id="949" />
+<TGConnectingPoint num="21" id="950" />
+<TGConnectingPoint num="22" id="951" />
+<TGConnectingPoint num="23" id="952" />
<extraparam>
<info stereotype="MEMORY" nodeName="MainMemory" />
<attributes byteDataSize="4" memorySize="1024" clockRatio="1" bufferType="0" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1103" id="741" >
-<father id="766" num="0" />
-<cdparam x="622" y="549" />
+<SUBCOMPONENT type="1111" id="919" index="7" uid="0acfc1db-b1b2-414f-8921-97e25a1dfdee" >
+<father id="953" num="0" />
+<cdparam x="599" y="584" />
+<sizeparam width="95" height="39" minWidth="75" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="0" maxX="178" minY="0" maxY="105" />
+<infoparam name="TGComponent" value="Cipherdata" />
+<new d="false" />
+<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" />
+<extraparam>
+<info value="Cipherdata" referenceKeyName="Cipherdata" priority="5" typeName="key" />
+</extraparam>
+</SUBCOMPONENT>
+<SUBCOMPONENT type="1103" id="928" index="8" uid="ec253bf8-8c3e-4999-a477-62fa04920940" >
+<father id="953" num="1" />
+<cdparam x="590" y="530" />
<sizeparam width="130" height="40" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="75" minY="0" maxY="99" />
+<cdrectangleparam minX="0" maxX="143" minY="0" maxY="104" />
<infoparam name="TGComponent" value="SecureFV::comm" />
-<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" />
+<new d="false" />
+<TGConnectingPoint num="0" id="920" />
+<TGConnectingPoint num="1" id="921" />
+<TGConnectingPoint num="2" id="922" />
+<TGConnectingPoint num="3" id="923" />
+<TGConnectingPoint num="4" id="924" />
+<TGConnectingPoint num="5" id="925" />
+<TGConnectingPoint num="6" id="926" />
+<TGConnectingPoint num="7" id="927" />
+<extraparam>
+<info value="SecureFV::comm" communicationName="comm" referenceCommunicationName="SecureFV" mappedElements="" priority="0" typeName="channel" />
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="1102" id="800" >
+<COMPONENT type="1102" id="987" index="1" uid="63b90e1a-7904-401d-bc8f-6263202ae888" >
<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="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" />
+<new d="false" />
+<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>
<info stereotype="BUS-RR" nodeName="MainBus" />
-<attributes byteDataSize="4" arbitrationPolicy="0" sliceTime="10000" pipelineSize="1" clockRatio="1" privacy="0" referenceAttack="ReadDataOnBus" />
+<attributes byteDataSize="4" arbitrationPolicy="0" sliceTime="10000" pipelineSize="1" burstSize="100" clockRatio="1" privacy="0" referenceAttack="ReadDataOnBus" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1103" id="775" >
-<father id="800" num="0" />
+<SUBCOMPONENT type="1103" id="962" index="9" uid="9b5c33fe-67af-4022-8f1e-e0a61f6d2a2e" >
+<father id="987" num="0" />
<cdparam x="611" y="393" />
<sizeparam width="130" height="40" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="120" minY="0" maxY="56" />
<infoparam name="TGComponent" value="SecureFV::comm" />
-<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" />
+<new d="false" />
+<TGConnectingPoint num="0" id="954" />
+<TGConnectingPoint num="1" id="955" />
+<TGConnectingPoint num="2" id="956" />
+<TGConnectingPoint num="3" id="957" />
+<TGConnectingPoint num="4" id="958" />
+<TGConnectingPoint num="5" id="959" />
+<TGConnectingPoint num="6" id="960" />
+<TGConnectingPoint num="7" id="961" />
+<extraparam>
+<info value="SecureFV::comm" communicationName="comm" referenceCommunicationName="SecureFV" mappedElements="" priority="0" typeName="channel" />
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="1100" id="834" >
+<COMPONENT type="1100" id="1021" index="2" uid="b0e5645c-c9ee-46a7-b0c6-664fdc8c14f6" >
<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="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" />
+<new d="false" />
+<TGConnectingPoint num="0" id="997" />
+<TGConnectingPoint num="1" id="998" />
+<TGConnectingPoint num="2" id="999" />
+<TGConnectingPoint num="3" id="1000" />
+<TGConnectingPoint num="4" id="1001" />
+<TGConnectingPoint num="5" id="1002" />
+<TGConnectingPoint num="6" id="1003" />
+<TGConnectingPoint num="7" id="1004" />
+<TGConnectingPoint num="8" id="1005" />
+<TGConnectingPoint num="9" id="1006" />
+<TGConnectingPoint num="10" id="1007" />
+<TGConnectingPoint num="11" id="1008" />
+<TGConnectingPoint num="12" id="1009" />
+<TGConnectingPoint num="13" id="1010" />
+<TGConnectingPoint num="14" id="1011" />
+<TGConnectingPoint num="15" id="1012" />
+<TGConnectingPoint num="16" id="1013" />
+<TGConnectingPoint num="17" id="1014" />
+<TGConnectingPoint num="18" id="1015" />
+<TGConnectingPoint num="19" id="1016" />
+<TGConnectingPoint num="20" id="1017" />
+<TGConnectingPoint num="21" id="1018" />
+<TGConnectingPoint num="22" id="1019" />
+<TGConnectingPoint num="23" id="1020" />
<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" operation="" MECType="0" encryption="0"/>
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1101" id="809" >
-<father id="834" num="0" />
+<SUBCOMPONENT type="1101" id="996" index="10" uid="2f2b12e7-e1b6-42e1-9a2d-ae3ab34499d0" >
+<father id="1021" num="0" />
<cdparam x="918" y="206" />
<sizeparam width="111" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="139" minY="0" maxY="160" />
<infoparam name="TGComponent" value="SecureFV::T2" />
-<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" />
+<new d="false" />
+<TGConnectingPoint num="0" id="988" />
+<TGConnectingPoint num="1" id="989" />
+<TGConnectingPoint num="2" id="990" />
+<TGConnectingPoint num="3" id="991" />
+<TGConnectingPoint num="4" id="992" />
+<TGConnectingPoint num="5" id="993" />
+<TGConnectingPoint num="6" id="994" />
+<TGConnectingPoint num="7" id="995" />
<extraparam>
<info value="SecureFV::T2" taskName="T2" referenceTaskName="SecureFV" priority="0" operationMEC="T2" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="1100" id="868" >
+<COMPONENT type="1100" id="1055" index="3" uid="c4a5f267-ae70-41e2-bb24-9181058d011d" >
<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="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" />
+<new d="false" />
+<TGConnectingPoint num="0" id="1031" />
+<TGConnectingPoint num="1" id="1032" />
+<TGConnectingPoint num="2" id="1033" />
+<TGConnectingPoint num="3" id="1034" />
+<TGConnectingPoint num="4" id="1035" />
+<TGConnectingPoint num="5" id="1036" />
+<TGConnectingPoint num="6" id="1037" />
+<TGConnectingPoint num="7" id="1038" />
+<TGConnectingPoint num="8" id="1039" />
+<TGConnectingPoint num="9" id="1040" />
+<TGConnectingPoint num="10" id="1041" />
+<TGConnectingPoint num="11" id="1042" />
+<TGConnectingPoint num="12" id="1043" />
+<TGConnectingPoint num="13" id="1044" />
+<TGConnectingPoint num="14" id="1045" />
+<TGConnectingPoint num="15" id="1046" />
+<TGConnectingPoint num="16" id="1047" />
+<TGConnectingPoint num="17" id="1048" />
+<TGConnectingPoint num="18" id="1049" />
+<TGConnectingPoint num="19" id="1050" />
+<TGConnectingPoint num="20" id="1051" />
+<TGConnectingPoint num="21" id="1052" />
+<TGConnectingPoint num="22" id="1053" />
+<TGConnectingPoint num="23" id="1054" />
<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" operation="" MECType="0" encryption="0"/>
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1101" id="843" >
-<father id="868" num="0" />
+<SUBCOMPONENT type="1101" id="1030" index="11" uid="4b0bf450-dc51-4da8-b0b5-65544926c745" >
+<father id="1055" num="0" />
<cdparam x="290" y="207" />
<sizeparam width="111" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="139" minY="0" maxY="160" />
<infoparam name="TGComponent" value="SecureFV::T1" />
-<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" />
+<new d="false" />
+<TGConnectingPoint num="0" id="1022" />
+<TGConnectingPoint num="1" id="1023" />
+<TGConnectingPoint num="2" id="1024" />
+<TGConnectingPoint num="3" id="1025" />
+<TGConnectingPoint num="4" id="1026" />
+<TGConnectingPoint num="5" id="1027" />
+<TGConnectingPoint num="6" id="1028" />
+<TGConnectingPoint num="7" id="1029" />
<extraparam>
<info value="SecureFV::T1" taskName="T1" referenceTaskName="SecureFV" priority="0" operationMEC="T1" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="125" id="869" >
+<CONNECTOR type="125" id="1056" index="4" uid="6e777845-0340-46ce-9631-262576b28bae" >
<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="824" />
-<P2 x="821" y="376" id="787" />
+<P1 x="938" y="324" id="1011" />
+<P2 x="821" y="376" id="974" />
<AutomaticDrawing data="true" />
+<new d="false" />
<extraparam>
<info priority="0" />
<spy value="false" />
</extraparam>
</CONNECTOR>
-<CONNECTOR type="125" id="870" >
+<CONNECTOR type="125" id="1057" index="5" uid="aa779f44-fea2-49c5-98f6-f16ad5ccade9" >
<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="859" />
-<P2 x="571" y="376" id="786" />
+<P1 x="425" y="338" id="1046" />
+<P2 x="571" y="376" id="973" />
<AutomaticDrawing data="true" />
+<new d="false" />
<extraparam>
<info priority="0" />
<spy value="false" />
</extraparam>
</CONNECTOR>
-<CONNECTOR type="125" id="871" >
+<CONNECTOR type="125" id="1058" index="6" uid="12529d6b-ee8c-41a4-993e-b95f2820f5d6" >
<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="743" />
-<P2 x="696" y="448" id="782" />
+<P1 x="698" y="492" id="930" />
+<P2 x="696" y="448" id="969" />
<AutomaticDrawing data="true" />
+<new d="false" />
<extraparam>
<info priority="0" />
<spy value="false" />
@@ -2055,7 +2371,7 @@
-<Modeling type="AVATAR Design" nameTab="SecurityMechanismDesign" tabs="Block Diagram$System$T2$T1" >
+<Modeling type="AVATAR Design" nameTab="SecurityMechanismDesign" tabs="Block Diagram$System$T2$T1$Block$Block" >
<AVATARBlockDiagramPanel name="Block Diagram" minX="10" maxX="1900" minY="10" maxY="900" zoom="1.0" >
<MainCode value="void __user_init() {"/>
<MainCode value="}"/>
@@ -2064,41 +2380,292 @@
<Validated value="" />
<Ignored value="" />
-<CONNECTOR type="5002" id="877" >
+<COMPONENT type="5003" id="1067" index="0" uid="f597a960-58fc-4421-a1b3-cff6f8a83853" >
+<cdparam x="450" y="340" />
+<sizeparam width="200" height="100" 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="DataType" value="Key" />
+<new d="false" />
+<TGConnectingPoint num="0" id="1059" />
+<TGConnectingPoint num="1" id="1060" />
+<TGConnectingPoint num="2" id="1061" />
+<TGConnectingPoint num="3" id="1062" />
+<TGConnectingPoint num="4" id="1063" />
+<TGConnectingPoint num="5" id="1064" />
+<TGConnectingPoint num="6" id="1065" />
+<TGConnectingPoint num="7" id="1066" />
+<extraparam>
+<Attribute access="2" id="data" value="0" type="8" typeOther="" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5003" id="1076" index="1" uid="e806e800-876c-4300-afa9-799548be8133" >
+<cdparam x="50" y="340" />
+<sizeparam width="200" height="100" 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="DataType" value="Message" />
+<new d="false" />
+<TGConnectingPoint num="0" id="1068" />
+<TGConnectingPoint num="1" id="1069" />
+<TGConnectingPoint num="2" id="1070" />
+<TGConnectingPoint num="3" id="1071" />
+<TGConnectingPoint num="4" id="1072" />
+<TGConnectingPoint num="5" id="1073" />
+<TGConnectingPoint num="6" id="1074" />
+<TGConnectingPoint num="7" id="1075" />
+<extraparam>
+<Attribute access="2" id="data" value="0" type="8" typeOther="" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="302" id="1093" index="2" uid="36d17f8a-ca5c-43c6-9d8e-d0849f29aa15" >
+<cdparam x="410" y="140" />
+<sizeparam width="251" height="1" 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="#Confidentiality T1.comm_chData
+#Confidentiality T1.Cipherdata
+" />
+<new d="false" />
+<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" />
+<extraparam>
+<Line value="#Confidentiality T1.comm_chData " />
+<Line value="#Confidentiality T1.Cipherdata " />
+</extraparam>
+</COMPONENT>
+
+<CONNECTOR type="5002" id="1095" index="3" uid="de75917b-0b14-4c88-85cb-f76c112c259f" >
+<cdparam x="0" y="0" />
+<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="1094" />
+<P1 x="206" y="130" id="1096" />
+<P2 x="583" y="132" id="1137" />
+<AutomaticDrawing data="true" />
+<new d="false" />
+<extraparam>
+<isd value="in comm(int SecureFV__comm_chData)" />
+<oso value="out comm(int comm_chData)" />
+<FIFOType asynchronous="true" synchronousCH="false" size="40" blocking="true" private="false" broadcast="false" lossy="false" ams="false" />
+</extraparam>
+</CONNECTOR>
+<COMPONENT type="5000" id="1136" index="4" uid="bfc342b9-45b2-4cdd-8c35-139db47aafa7" >
+<cdparam x="206" y="130" />
+<sizeparam width="200" height="150" 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="Block" value="T1" />
+<new d="false" />
+<TGConnectingPoint num="0" id="1096" />
+<TGConnectingPoint num="1" id="1097" />
+<TGConnectingPoint num="2" id="1098" />
+<TGConnectingPoint num="3" id="1099" />
+<TGConnectingPoint num="4" id="1100" />
+<TGConnectingPoint num="5" id="1101" />
+<TGConnectingPoint num="6" id="1102" />
+<TGConnectingPoint num="7" id="1103" />
+<TGConnectingPoint num="8" id="1104" />
+<TGConnectingPoint num="9" id="1105" />
+<TGConnectingPoint num="10" id="1106" />
+<TGConnectingPoint num="11" id="1107" />
+<TGConnectingPoint num="12" id="1108" />
+<TGConnectingPoint num="13" id="1109" />
+<TGConnectingPoint num="14" id="1110" />
+<TGConnectingPoint num="15" id="1111" />
+<TGConnectingPoint num="16" id="1112" />
+<TGConnectingPoint num="17" id="1113" />
+<TGConnectingPoint num="18" id="1114" />
+<TGConnectingPoint num="19" id="1115" />
+<TGConnectingPoint num="20" id="1116" />
+<TGConnectingPoint num="21" id="1117" />
+<TGConnectingPoint num="22" id="1118" />
+<TGConnectingPoint num="23" id="1119" />
+<TGConnectingPoint num="24" id="1120" />
+<TGConnectingPoint num="25" id="1121" />
+<TGConnectingPoint num="26" id="1122" />
+<TGConnectingPoint num="27" id="1123" />
+<TGConnectingPoint num="28" id="1124" />
+<TGConnectingPoint num="29" id="1125" />
+<TGConnectingPoint num="30" id="1126" />
+<TGConnectingPoint num="31" id="1127" />
+<TGConnectingPoint num="32" id="1128" />
+<TGConnectingPoint num="33" id="1129" />
+<TGConnectingPoint num="34" id="1130" />
+<TGConnectingPoint num="35" id="1131" />
+<TGConnectingPoint num="36" id="1132" />
+<TGConnectingPoint num="37" id="1133" />
+<TGConnectingPoint num="38" id="1134" />
+<TGConnectingPoint num="39" id="1135" />
+<extraparam>
+<blockType data="cryptoblock" color="-4072719" />
+<CryptoBlock value="true" />
+<Attribute access="0" id="comm_chData" value="0" type="0" typeOther="" />
+<Attribute access="0" id="tmp" value="0" type="0" typeOther="" />
+<Attribute access="0" id="loop_index" value="0" type="0" typeOther="" />
+<Attribute access="0" id="Cipherdata" value="0" type="0" typeOther="" />
+<Attribute access="0" id="Cipherdata_encrypted" value="0" type="0" typeOther="" />
+<Attribute access="0" id="key_Cipherdata" value="0" type="0" typeOther="" />
+<Method value="Message aencrypt(Message msg, Key k)" />
+<Method value="Message adecrypt(Message msg, Key k)" />
+<Method value="Key pk(Key k)" />
+<Method value="Message sign(Message msg, Key k)" />
+<Method value="bool verifySign(Message msg1, Message sig, Key k)" />
+<Method value="Message cert(Key k, Message msg)" />
+<Method value="bool verifyCert(Message cert, Key k)" />
+<Method value="Key getpk(Message cert)" />
+<Method value="Message sencrypt(Message msg, Key k)" />
+<Method value="Message sdecrypt(Message msg, Key k)" />
+<Method value="Key DH(Key pubK, Key privK)" />
+<Method value="Message hash(Message msg)" />
+<Method value="Message MAC(Message msg, Key k)" />
+<Method value="bool verifyMAC(Message msg, Key k, Message macmsg)" />
+<Method value="Message concat2(Message msg1, Message msg2)" />
+<Method value="Message concat3(Message msg1, Message msg2, Message msg3)" />
+<Method value="Message concat4(Message msg1, Message msg2, Message msg3, Message msg4)" />
+<Method value="get2(Message msg, Message msg1, Message msg2)" />
+<Method value="get3(Message msg, Message msg1, Message msg2, Message msg3)" />
+<Method value="get4(Message msg, Message msg1, Message msg2, Message msg3, Message msg4)" />
+<Method value="int sencrypt(int Cipherdata, int key_Cipherdata)" />
+<Signal value="out comm(int comm_chData)" attached="false" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5000" id="1177" index="5" uid="d5f8e037-89d3-4076-a6b2-74c8e376871a" >
+<cdparam x="583" y="132" />
+<sizeparam width="200" height="150" 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="Block" value="T2" />
+<new d="false" />
+<TGConnectingPoint num="0" id="1137" />
+<TGConnectingPoint num="1" id="1138" />
+<TGConnectingPoint num="2" id="1139" />
+<TGConnectingPoint num="3" id="1140" />
+<TGConnectingPoint num="4" id="1141" />
+<TGConnectingPoint num="5" id="1142" />
+<TGConnectingPoint num="6" id="1143" />
+<TGConnectingPoint num="7" id="1144" />
+<TGConnectingPoint num="8" id="1145" />
+<TGConnectingPoint num="9" id="1146" />
+<TGConnectingPoint num="10" id="1147" />
+<TGConnectingPoint num="11" id="1148" />
+<TGConnectingPoint num="12" id="1149" />
+<TGConnectingPoint num="13" id="1150" />
+<TGConnectingPoint num="14" id="1151" />
+<TGConnectingPoint num="15" id="1152" />
+<TGConnectingPoint num="16" id="1153" />
+<TGConnectingPoint num="17" id="1154" />
+<TGConnectingPoint num="18" id="1155" />
+<TGConnectingPoint num="19" id="1156" />
+<TGConnectingPoint num="20" id="1157" />
+<TGConnectingPoint num="21" id="1158" />
+<TGConnectingPoint num="22" id="1159" />
+<TGConnectingPoint num="23" id="1160" />
+<TGConnectingPoint num="24" id="1161" />
+<TGConnectingPoint num="25" id="1162" />
+<TGConnectingPoint num="26" id="1163" />
+<TGConnectingPoint num="27" id="1164" />
+<TGConnectingPoint num="28" id="1165" />
+<TGConnectingPoint num="29" id="1166" />
+<TGConnectingPoint num="30" id="1167" />
+<TGConnectingPoint num="31" id="1168" />
+<TGConnectingPoint num="32" id="1169" />
+<TGConnectingPoint num="33" id="1170" />
+<TGConnectingPoint num="34" id="1171" />
+<TGConnectingPoint num="35" id="1172" />
+<TGConnectingPoint num="36" id="1173" />
+<TGConnectingPoint num="37" id="1174" />
+<TGConnectingPoint num="38" id="1175" />
+<TGConnectingPoint num="39" id="1176" />
+<extraparam>
+<blockType data="cryptoblock" color="-4072719" />
+<CryptoBlock value="true" />
+<Attribute access="0" id="SecureFV__comm_chData" value="0" type="0" typeOther="" />
+<Attribute access="0" id="tmp" value="0" type="0" typeOther="" />
+<Attribute access="0" id="loop_index" value="0" type="0" typeOther="" />
+<Attribute access="0" id="Cipherdata_encrypted" value="0" type="0" typeOther="" />
+<Attribute access="0" id="Cipherdata" value="0" type="0" typeOther="" />
+<Attribute access="0" id="key_Cipherdata" value="0" type="0" typeOther="" />
+<Method value="Message aencrypt(Message msg, Key k)" />
+<Method value="Message adecrypt(Message msg, Key k)" />
+<Method value="Key pk(Key k)" />
+<Method value="Message sign(Message msg, Key k)" />
+<Method value="bool verifySign(Message msg1, Message sig, Key k)" />
+<Method value="Message cert(Key k, Message msg)" />
+<Method value="bool verifyCert(Message cert, Key k)" />
+<Method value="Key getpk(Message cert)" />
+<Method value="Message sencrypt(Message msg, Key k)" />
+<Method value="Message sdecrypt(Message msg, Key k)" />
+<Method value="Key DH(Key pubK, Key privK)" />
+<Method value="Message hash(Message msg)" />
+<Method value="Message MAC(Message msg, Key k)" />
+<Method value="bool verifyMAC(Message msg, Key k, Message macmsg)" />
+<Method value="Message concat2(Message msg1, Message msg2)" />
+<Method value="Message concat3(Message msg1, Message msg2, Message msg3)" />
+<Method value="Message concat4(Message msg1, Message msg2, Message msg3, Message msg4)" />
+<Method value="get2(Message msg, Message msg1, Message msg2)" />
+<Method value="get3(Message msg, Message msg1, Message msg2, Message msg3)" />
+<Method value="get4(Message msg, Message msg1, Message msg2, Message msg3, Message msg4)" />
+<Method value="int sdecrypt(int Cipherdata_encrypted, int key_Cipherdata)" />
+<Signal value="in comm(int SecureFV__comm_chData)" attached="false" />
+</extraparam>
+</COMPONENT>
+
+<CONNECTOR type="5002" id="1183" index="6" uid="57bf5a29-2794-4791-9381-5ae9ec79989a" >
<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="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" />
+<TGConnectingPoint num="0" id="1180" />
+<TGConnectingPoint num="1" id="1181" />
+<TGConnectingPoint num="2" id="1182" />
+<P1 x="459" y="88" id="1312" />
+<P2 x="459" y="143" id="1305" />
<Point x="490" y="88" />
<Point x="490" y="143" />
<AutomaticDrawing data="true" />
+<new d="false" />
<extraparam>
<iso value="in chin(Message msg)" />
<osd value="out chout(Message msg)" />
<FIFOType asynchronous="false" synchronousCH="true" size="1" blocking="false" private="false" broadcast="false" lossy="false" ams="false" />
</extraparam>
-</CONNECTOR><SUBCOMPONENT type="-1" id="872" >
-<father id="877" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1178" index="11" uid="3c00520f-5ad9-4ce4-a254-242a4e994208" >
+<father id="1183" num="0" />
<cdparam x="490" y="88" />
<sizeparam width="8" height="8" 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" />
+<new d="false" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="873" >
-<father id="877" num="1" />
+<SUBCOMPONENT type="-1" id="1179" index="12" uid="4b38daa0-222b-49e0-b12b-1278f4f4a2cd" >
+<father id="1183" num="1" />
<cdparam x="490" y="143" />
<sizeparam width="8" height="8" 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" />
+<new d="false" />
</SUBCOMPONENT>
-<COMPONENT type="302" id="894" >
+<COMPONENT type="302" id="1200" index="7" uid="12bc1e8f-c160-40b5-9c76-535083b73fe1" >
<cdparam x="517" y="43" />
<sizeparam width="260" height="66" minWidth="80" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -2107,22 +2674,23 @@
#Confidentiality T1.secretData
" />
-<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" />
+<new d="false" />
+<TGConnectingPoint num="0" id="1184" />
+<TGConnectingPoint num="1" id="1185" />
+<TGConnectingPoint num="2" id="1186" />
+<TGConnectingPoint num="3" id="1187" />
+<TGConnectingPoint num="4" id="1188" />
+<TGConnectingPoint num="5" id="1189" />
+<TGConnectingPoint num="6" id="1190" />
+<TGConnectingPoint num="7" id="1191" />
+<TGConnectingPoint num="8" id="1192" />
+<TGConnectingPoint num="9" id="1193" />
+<TGConnectingPoint num="10" id="1194" />
+<TGConnectingPoint num="11" id="1195" />
+<TGConnectingPoint num="12" id="1196" />
+<TGConnectingPoint num="13" id="1197" />
+<TGConnectingPoint num="14" id="1198" />
+<TGConnectingPoint num="15" id="1199" />
<extraparam>
<Line value="#InitialSystemKnowledge T1.sk T2.sk" />
<Line value="" />
@@ -2130,74 +2698,93 @@
</extraparam>
</COMPONENT>
-<COMPONENT type="5003" id="903" >
+<COMPONENT type="5003" id="1209" index="8" uid="c53b882a-3bdd-42ec-b942-b9febe1ac229" >
<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="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" />
+<new d="false" />
+<TGConnectingPoint num="0" id="1201" />
+<TGConnectingPoint num="1" id="1202" />
+<TGConnectingPoint num="2" id="1203" />
+<TGConnectingPoint num="3" id="1204" />
+<TGConnectingPoint num="4" id="1205" />
+<TGConnectingPoint num="5" id="1206" />
+<TGConnectingPoint num="6" id="1207" />
+<TGConnectingPoint num="7" id="1208" />
<extraparam>
<Attribute access="0" id="data" value="" type="8" typeOther="" />
</extraparam>
</COMPONENT>
-<COMPONENT type="5003" id="912" >
+<COMPONENT type="5003" id="1218" index="9" uid="451d5e5e-bf99-48b4-85ad-e63209864c9b" >
<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="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" />
+<new d="false" />
+<TGConnectingPoint num="0" id="1210" />
+<TGConnectingPoint num="1" id="1211" />
+<TGConnectingPoint num="2" id="1212" />
+<TGConnectingPoint num="3" id="1213" />
+<TGConnectingPoint num="4" id="1214" />
+<TGConnectingPoint num="5" id="1215" />
+<TGConnectingPoint num="6" id="1216" />
+<TGConnectingPoint num="7" id="1217" />
<extraparam>
<Attribute access="0" id="data" value="" type="8" typeOther="" />
</extraparam>
</COMPONENT>
-<COMPONENT type="5000" id="987" >
+<COMPONENT type="5000" id="1341" index="10" uid="b2874923-24b8-4f17-bd28-ee88aa64f45c" >
<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="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" />
+<new d="false" />
+<TGConnectingPoint num="0" id="1301" />
+<TGConnectingPoint num="1" id="1302" />
+<TGConnectingPoint num="2" id="1303" />
+<TGConnectingPoint num="3" id="1304" />
+<TGConnectingPoint num="4" id="1305" />
+<TGConnectingPoint num="5" id="1306" />
+<TGConnectingPoint num="6" id="1307" />
+<TGConnectingPoint num="7" id="1308" />
+<TGConnectingPoint num="8" id="1309" />
+<TGConnectingPoint num="9" id="1310" />
+<TGConnectingPoint num="10" id="1311" />
+<TGConnectingPoint num="11" id="1312" />
+<TGConnectingPoint num="12" id="1313" />
+<TGConnectingPoint num="13" id="1314" />
+<TGConnectingPoint num="14" id="1315" />
+<TGConnectingPoint num="15" id="1316" />
+<TGConnectingPoint num="16" id="1317" />
+<TGConnectingPoint num="17" id="1318" />
+<TGConnectingPoint num="18" id="1319" />
+<TGConnectingPoint num="19" id="1320" />
+<TGConnectingPoint num="20" id="1321" />
+<TGConnectingPoint num="21" id="1322" />
+<TGConnectingPoint num="22" id="1323" />
+<TGConnectingPoint num="23" id="1324" />
+<TGConnectingPoint num="24" id="1325" />
+<TGConnectingPoint num="25" id="1326" />
+<TGConnectingPoint num="26" id="1327" />
+<TGConnectingPoint num="27" id="1328" />
+<TGConnectingPoint num="28" id="1329" />
+<TGConnectingPoint num="29" id="1330" />
+<TGConnectingPoint num="30" id="1331" />
+<TGConnectingPoint num="31" id="1332" />
+<TGConnectingPoint num="32" id="1333" />
+<TGConnectingPoint num="33" id="1334" />
+<TGConnectingPoint num="34" id="1335" />
+<TGConnectingPoint num="35" id="1336" />
+<TGConnectingPoint num="36" id="1337" />
+<TGConnectingPoint num="37" id="1338" />
+<TGConnectingPoint num="38" id="1339" />
+<TGConnectingPoint num="39" id="1340" />
<extraparam>
<blockType data="block" color="-4072719" />
<CryptoBlock value="false" />
@@ -2205,44 +2792,61 @@
<Signal value="out chout(Message msg)" attached="true" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="5000" id="937" >
-<father id="987" 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="1259" index="13" uid="5e66075c-c37b-4b3e-ac45-2340e7ead245" >
+<father id="1341" 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="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" />
+<cdrectangleparam minX="0" maxX="223" minY="0" maxY="93" />
+<infoparam name="Block0" value="T1" />
+<new d="false" />
+<TGConnectingPoint num="0" id="1219" />
+<TGConnectingPoint num="1" id="1220" />
+<TGConnectingPoint num="2" id="1221" />
+<TGConnectingPoint num="3" id="1222" />
+<TGConnectingPoint num="4" id="1223" />
+<TGConnectingPoint num="5" id="1224" />
+<TGConnectingPoint num="6" id="1225" />
+<TGConnectingPoint num="7" id="1226" />
+<TGConnectingPoint num="8" id="1227" />
+<TGConnectingPoint num="9" id="1228" />
+<TGConnectingPoint num="10" id="1229" />
+<TGConnectingPoint num="11" id="1230" />
+<TGConnectingPoint num="12" id="1231" />
+<TGConnectingPoint num="13" id="1232" />
+<TGConnectingPoint num="14" id="1233" />
+<TGConnectingPoint num="15" id="1234" />
+<TGConnectingPoint num="16" id="1235" />
+<TGConnectingPoint num="17" id="1236" />
+<TGConnectingPoint num="18" id="1237" />
+<TGConnectingPoint num="19" id="1238" />
+<TGConnectingPoint num="20" id="1239" />
+<TGConnectingPoint num="21" id="1240" />
+<TGConnectingPoint num="22" id="1241" />
+<TGConnectingPoint num="23" id="1242" />
+<TGConnectingPoint num="24" id="1243" />
+<TGConnectingPoint num="25" id="1244" />
+<TGConnectingPoint num="26" id="1245" />
+<TGConnectingPoint num="27" id="1246" />
+<TGConnectingPoint num="28" id="1247" />
+<TGConnectingPoint num="29" id="1248" />
+<TGConnectingPoint num="30" id="1249" />
+<TGConnectingPoint num="31" id="1250" />
+<TGConnectingPoint num="32" id="1251" />
+<TGConnectingPoint num="33" id="1252" />
+<TGConnectingPoint num="34" id="1253" />
+<TGConnectingPoint num="35" id="1254" />
+<TGConnectingPoint num="36" id="1255" />
+<TGConnectingPoint num="37" id="1256" />
+<TGConnectingPoint num="38" id="1257" />
+<TGConnectingPoint num="39" id="1258" />
<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)" />
@@ -2267,44 +2871,61 @@
<Method value="Message hash(Message msg)" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="5000" id="962" >
-<father id="987" 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="1300" index="14" uid="8227d454-31f1-4610-afd9-7ec516c8d9f4" >
+<father id="1341" 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="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" />
+<cdrectangleparam minX="0" maxX="299" minY="0" maxY="93" />
+<infoparam name="Block0" value="T2" />
+<new d="false" />
+<TGConnectingPoint num="0" id="1260" />
+<TGConnectingPoint num="1" id="1261" />
+<TGConnectingPoint num="2" id="1262" />
+<TGConnectingPoint num="3" id="1263" />
+<TGConnectingPoint num="4" id="1264" />
+<TGConnectingPoint num="5" id="1265" />
+<TGConnectingPoint num="6" id="1266" />
+<TGConnectingPoint num="7" id="1267" />
+<TGConnectingPoint num="8" id="1268" />
+<TGConnectingPoint num="9" id="1269" />
+<TGConnectingPoint num="10" id="1270" />
+<TGConnectingPoint num="11" id="1271" />
+<TGConnectingPoint num="12" id="1272" />
+<TGConnectingPoint num="13" id="1273" />
+<TGConnectingPoint num="14" id="1274" />
+<TGConnectingPoint num="15" id="1275" />
+<TGConnectingPoint num="16" id="1276" />
+<TGConnectingPoint num="17" id="1277" />
+<TGConnectingPoint num="18" id="1278" />
+<TGConnectingPoint num="19" id="1279" />
+<TGConnectingPoint num="20" id="1280" />
+<TGConnectingPoint num="21" id="1281" />
+<TGConnectingPoint num="22" id="1282" />
+<TGConnectingPoint num="23" id="1283" />
+<TGConnectingPoint num="24" id="1284" />
+<TGConnectingPoint num="25" id="1285" />
+<TGConnectingPoint num="26" id="1286" />
+<TGConnectingPoint num="27" id="1287" />
+<TGConnectingPoint num="28" id="1288" />
+<TGConnectingPoint num="29" id="1289" />
+<TGConnectingPoint num="30" id="1290" />
+<TGConnectingPoint num="31" id="1291" />
+<TGConnectingPoint num="32" id="1292" />
+<TGConnectingPoint num="33" id="1293" />
+<TGConnectingPoint num="34" id="1294" />
+<TGConnectingPoint num="35" id="1295" />
+<TGConnectingPoint num="36" id="1296" />
+<TGConnectingPoint num="37" id="1297" />
+<TGConnectingPoint num="38" id="1298" />
+<TGConnectingPoint num="39" id="1299" />
<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)" />
@@ -2333,40 +2954,43 @@
</AVATARBlockDiagramPanel>
-<AVATARStateMachineDiagramPanel name="System" minX="10" maxX="1400" minY="10" maxY="900" >
-<COMPONENT type="5100" id="989" >
+<AVATARStateMachineDiagramPanel name="System" minX="10" maxX="1400" minY="10" maxY="900" zoom="1.0" >
+<COMPONENT type="5100" id="1343" index="0" uid="2a2c10a3-2522-4320-932b-b2a72310dc26" >
<cdparam x="400" y="50" />
<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="988" />
+<new d="false" />
+<TGConnectingPoint num="0" id="1342" />
</COMPONENT>
</AVATARStateMachineDiagramPanel>
-<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="1099" />
+<AVATARStateMachineDiagramPanel name="T2" minX="10" maxX="1400" minY="10" maxY="900" zoom="1.0" >
+<CONNECTOR type="5102" id="1350" index="0" uid="d136535c-615e-448c-af04-d358fe7a731b" >
+<cdparam x="407" y="60" />
+<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="1349" />
+<P1 x="407" y="60" id="1611" />
+<P2 x="609" y="140" id="1539" />
<AutomaticDrawing data="true" />
-</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" />
+<new d="false" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1348" index="11" uid="a4480bd7-059a-4123-8886-d7757d7b6529" >
+<father id="1350" num="0" />
+<cdparam x="508" y="100" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" 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="990" />
-<TGConnectingPoint num="1" id="991" />
-<TGConnectingPoint num="2" id="992" />
-<TGConnectingPoint num="3" id="993" />
+<new d="false" />
+<TGConnectingPoint num="0" id="1344" />
+<TGConnectingPoint num="1" id="1345" />
+<TGConnectingPoint num="2" id="1346" />
+<TGConnectingPoint num="3" id="1347" />
<extraparam>
<guard value="[ ]" enabled="true"/>
<afterMin value="" enabled="true"/>
@@ -2377,30 +3001,31 @@
<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="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="1177" />
-<P2 x="407" y="339" id="1026" />
+<CONNECTOR type="5102" id="1357" index="1" uid="a444de41-918b-4483-bb92-d487ccb52c85" >
+<cdparam x="400" y="140" />
+<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="1356" />
+<P1 x="400" y="140" id="1538" />
+<P2 x="415" y="235" id="1527" />
<AutomaticDrawing data="true" />
-</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" />
+<new d="false" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1355" index="12" uid="ada740d3-6df3-4121-940a-0b71069da521" >
+<father id="1357" num="0" />
+<cdparam x="407" y="187" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" 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="997" />
-<TGConnectingPoint num="1" id="998" />
-<TGConnectingPoint num="2" id="999" />
-<TGConnectingPoint num="3" id="1000" />
+<new d="false" />
+<TGConnectingPoint num="0" id="1351" />
+<TGConnectingPoint num="1" id="1352" />
+<TGConnectingPoint num="2" id="1353" />
+<TGConnectingPoint num="3" id="1354" />
<extraparam>
<guard value="[ ]" enabled="true"/>
<afterMin value="" enabled="true"/>
@@ -2411,30 +3036,31 @@
<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="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 Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="1009" />
-<P1 x="407" y="201" id="1245" />
-<P2 x="407" y="233" id="1172" />
+<CONNECTOR type="5102" id="1364" index="2" uid="0c933618-60ab-421c-81f2-f3bf291f51f3" >
+<cdparam x="400" y="440" />
+<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="1363" />
+<P1 x="400" y="440" id="1381" />
+<P2 x="410" y="535" id="1379" />
<AutomaticDrawing data="true" />
-</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" />
+<new d="false" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1362" index="13" uid="31756fd6-c1df-4358-98b9-7cf140f7f6c0" >
+<father id="1364" num="0" />
+<cdparam x="405" y="487" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" 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="1004" />
-<TGConnectingPoint num="1" id="1005" />
-<TGConnectingPoint num="2" id="1006" />
-<TGConnectingPoint num="3" id="1007" />
+<new d="false" />
+<TGConnectingPoint num="0" id="1358" />
+<TGConnectingPoint num="1" id="1359" />
+<TGConnectingPoint num="2" id="1360" />
+<TGConnectingPoint num="3" id="1361" />
<extraparam>
<guard value="[ ]" enabled="true"/>
<afterMin value="" enabled="true"/>
@@ -2448,26 +3074,28 @@
</extraparam>
</SUBCOMPONENT>
-<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 Send signal" value="null" />
-<TGConnectingPoint num="0" id="1016" />
-<P1 x="407" y="141" id="1261" />
-<P2 x="407" y="171" id="1244" />
+<CONNECTOR type="5102" id="1371" index="3" uid="cdad3972-1c37-43a2-81ed-308b5c055d99" >
+<cdparam x="415" y="265" />
+<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="1370" />
+<P1 x="415" y="265" id="1528" />
+<P2 x="504" y="340" id="1455" />
<AutomaticDrawing data="true" />
-</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" />
+<new d="false" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1369" index="14" uid="b47789a1-4759-4155-b788-2f064eddbd93" >
+<father id="1371" num="0" />
+<cdparam x="459" y="302" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" 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="1011" />
-<TGConnectingPoint num="1" id="1012" />
-<TGConnectingPoint num="2" id="1013" />
-<TGConnectingPoint num="3" id="1014" />
+<new d="false" />
+<TGConnectingPoint num="0" id="1365" />
+<TGConnectingPoint num="1" id="1366" />
+<TGConnectingPoint num="2" id="1367" />
+<TGConnectingPoint num="3" id="1368" />
<extraparam>
<guard value="[ ]" enabled="true"/>
<afterMin value="" enabled="true"/>
@@ -2481,26 +3109,28 @@
</extraparam>
</SUBCOMPONENT>
-<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="1023" />
-<P1 x="407" y="70" id="1328" />
-<P2 x="407" y="102" id="1256" />
+<CONNECTOR type="5102" id="1378" index="4" uid="5c465d11-1f71-4a51-ab67-99d03bab40dc" >
+<cdparam x="400" y="340" />
+<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="1377" />
+<P1 x="400" y="340" id="1454" />
+<P2 x="532" y="440" id="1382" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1022" >
-<father id="1024" num="0" />
-<cdparam x="407" y="110" />
-<sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<new d="false" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1376" index="15" uid="6230852b-cc2f-4400-9236-0511c3339d22" >
+<father id="1378" num="0" />
+<cdparam x="466" y="390" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" 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="1018" />
-<TGConnectingPoint num="1" id="1019" />
-<TGConnectingPoint num="2" id="1020" />
-<TGConnectingPoint num="3" id="1021" />
+<new d="false" />
+<TGConnectingPoint num="0" id="1372" />
+<TGConnectingPoint num="1" id="1373" />
+<TGConnectingPoint num="2" id="1374" />
+<TGConnectingPoint num="3" id="1375" />
<extraparam>
<guard value="[ ]" enabled="true"/>
<afterMin value="" enabled="true"/>
@@ -2511,393 +3141,328 @@
<computeMin value="" enabled="true"/>
<computeMax value="" enabled="true"/>
<probability value="" enabled="true"/>
+<actions value="Cipherdata=sdecrypt(Cipherdata_encrypted,key_Cipherdata)" enabled="true"/>
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="5106" id="1097" >
-<cdparam x="318" y="339" />
-<sizeparam width="178" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5101" id="1380" index="5" uid="c4862c1a-f4bb-4e99-9bc5-f49a58b81d73" >
+<cdparam x="400" y="540" />
+<sizeparam width="20" height="20" minWidth="0" minHeight="0" 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="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" />
-<TGConnectingPoint num="40" id="1065" />
-<TGConnectingPoint num="41" id="1066" />
-<TGConnectingPoint num="42" id="1067" />
-<TGConnectingPoint num="43" id="1068" />
-<TGConnectingPoint num="44" id="1069" />
-<TGConnectingPoint num="45" id="1070" />
-<TGConnectingPoint num="46" id="1071" />
-<TGConnectingPoint num="47" id="1072" />
-<TGConnectingPoint num="48" id="1073" />
-<TGConnectingPoint num="49" id="1074" />
-<TGConnectingPoint num="50" id="1075" />
-<TGConnectingPoint num="51" id="1076" />
-<TGConnectingPoint num="52" id="1077" />
-<TGConnectingPoint num="53" id="1078" />
-<TGConnectingPoint num="54" id="1079" />
-<TGConnectingPoint num="55" id="1080" />
-<TGConnectingPoint num="56" id="1081" />
-<TGConnectingPoint num="57" id="1082" />
-<TGConnectingPoint num="58" id="1083" />
-<TGConnectingPoint num="59" id="1084" />
-<TGConnectingPoint num="60" id="1085" />
-<TGConnectingPoint num="61" id="1086" />
-<TGConnectingPoint num="62" id="1087" />
-<TGConnectingPoint num="63" id="1088" />
-<TGConnectingPoint num="64" id="1089" />
-<TGConnectingPoint num="65" id="1090" />
-<TGConnectingPoint num="66" id="1091" />
-<TGConnectingPoint num="67" id="1092" />
-<TGConnectingPoint num="68" id="1093" />
-<TGConnectingPoint num="69" id="1094" />
-<TGConnectingPoint num="70" id="1095" />
-<TGConnectingPoint num="71" id="1096" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5106" id="1170" >
-<cdparam x="337" y="424" />
-<sizeparam width="140" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="stop state" value="null" />
+<new d="false" />
+<TGConnectingPoint num="0" id="1379" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="1453" index="6" uid="4ae46258-7124-4479-ad91-be3253050953" >
+<cdparam x="400" y="440" />
+<sizeparam width="264" 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" />
-<TGConnectingPoint num="0" id="1098" />
-<TGConnectingPoint num="1" id="1099" />
-<TGConnectingPoint num="2" id="1100" />
-<TGConnectingPoint num="3" id="1101" />
-<TGConnectingPoint num="4" id="1102" />
-<TGConnectingPoint num="5" id="1103" />
-<TGConnectingPoint num="6" id="1104" />
-<TGConnectingPoint num="7" id="1105" />
-<TGConnectingPoint num="8" id="1106" />
-<TGConnectingPoint num="9" id="1107" />
-<TGConnectingPoint num="10" id="1108" />
-<TGConnectingPoint num="11" id="1109" />
-<TGConnectingPoint num="12" id="1110" />
-<TGConnectingPoint num="13" id="1111" />
-<TGConnectingPoint num="14" id="1112" />
-<TGConnectingPoint num="15" id="1113" />
-<TGConnectingPoint num="16" id="1114" />
-<TGConnectingPoint num="17" id="1115" />
-<TGConnectingPoint num="18" id="1116" />
-<TGConnectingPoint num="19" id="1117" />
-<TGConnectingPoint num="20" id="1118" />
-<TGConnectingPoint num="21" id="1119" />
-<TGConnectingPoint num="22" id="1120" />
-<TGConnectingPoint num="23" id="1121" />
-<TGConnectingPoint num="24" id="1122" />
-<TGConnectingPoint num="25" id="1123" />
-<TGConnectingPoint num="26" id="1124" />
-<TGConnectingPoint num="27" id="1125" />
-<TGConnectingPoint num="28" id="1126" />
-<TGConnectingPoint num="29" id="1127" />
-<TGConnectingPoint num="30" id="1128" />
-<TGConnectingPoint num="31" id="1129" />
-<TGConnectingPoint num="32" id="1130" />
-<TGConnectingPoint num="33" id="1131" />
-<TGConnectingPoint num="34" id="1132" />
-<TGConnectingPoint num="35" id="1133" />
-<TGConnectingPoint num="36" id="1134" />
-<TGConnectingPoint num="37" id="1135" />
-<TGConnectingPoint num="38" id="1136" />
-<TGConnectingPoint num="39" id="1137" />
-<TGConnectingPoint num="40" id="1138" />
-<TGConnectingPoint num="41" id="1139" />
-<TGConnectingPoint num="42" id="1140" />
-<TGConnectingPoint num="43" id="1141" />
-<TGConnectingPoint num="44" id="1142" />
-<TGConnectingPoint num="45" id="1143" />
-<TGConnectingPoint num="46" id="1144" />
-<TGConnectingPoint num="47" id="1145" />
-<TGConnectingPoint num="48" id="1146" />
-<TGConnectingPoint num="49" id="1147" />
-<TGConnectingPoint num="50" id="1148" />
-<TGConnectingPoint num="51" id="1149" />
-<TGConnectingPoint num="52" id="1150" />
-<TGConnectingPoint num="53" id="1151" />
-<TGConnectingPoint num="54" id="1152" />
-<TGConnectingPoint num="55" id="1153" />
-<TGConnectingPoint num="56" id="1154" />
-<TGConnectingPoint num="57" id="1155" />
-<TGConnectingPoint num="58" id="1156" />
-<TGConnectingPoint num="59" id="1157" />
-<TGConnectingPoint num="60" id="1158" />
-<TGConnectingPoint num="61" id="1159" />
-<TGConnectingPoint num="62" id="1160" />
-<TGConnectingPoint num="63" id="1161" />
-<TGConnectingPoint num="64" id="1162" />
-<TGConnectingPoint num="65" id="1163" />
-<TGConnectingPoint num="66" id="1164" />
-<TGConnectingPoint num="67" id="1165" />
-<TGConnectingPoint num="68" id="1166" />
-<TGConnectingPoint num="69" id="1167" />
-<TGConnectingPoint num="70" id="1168" />
-<TGConnectingPoint num="71" id="1169" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5106" id="1243" >
-<cdparam x="336" y="233" />
-<sizeparam width="142" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="state" value="decrypt_Cipherdata_dummy" />
+<new d="false" />
+<TGConnectingPoint num="0" id="1381" />
+<TGConnectingPoint num="1" id="1382" />
+<TGConnectingPoint num="2" id="1383" />
+<TGConnectingPoint num="3" id="1384" />
+<TGConnectingPoint num="4" id="1385" />
+<TGConnectingPoint num="5" id="1386" />
+<TGConnectingPoint num="6" id="1387" />
+<TGConnectingPoint num="7" id="1388" />
+<TGConnectingPoint num="8" id="1389" />
+<TGConnectingPoint num="9" id="1390" />
+<TGConnectingPoint num="10" id="1391" />
+<TGConnectingPoint num="11" id="1392" />
+<TGConnectingPoint num="12" id="1393" />
+<TGConnectingPoint num="13" id="1394" />
+<TGConnectingPoint num="14" id="1395" />
+<TGConnectingPoint num="15" id="1396" />
+<TGConnectingPoint num="16" id="1397" />
+<TGConnectingPoint num="17" id="1398" />
+<TGConnectingPoint num="18" id="1399" />
+<TGConnectingPoint num="19" id="1400" />
+<TGConnectingPoint num="20" id="1401" />
+<TGConnectingPoint num="21" id="1402" />
+<TGConnectingPoint num="22" id="1403" />
+<TGConnectingPoint num="23" id="1404" />
+<TGConnectingPoint num="24" id="1405" />
+<TGConnectingPoint num="25" id="1406" />
+<TGConnectingPoint num="26" id="1407" />
+<TGConnectingPoint num="27" id="1408" />
+<TGConnectingPoint num="28" id="1409" />
+<TGConnectingPoint num="29" id="1410" />
+<TGConnectingPoint num="30" id="1411" />
+<TGConnectingPoint num="31" id="1412" />
+<TGConnectingPoint num="32" id="1413" />
+<TGConnectingPoint num="33" id="1414" />
+<TGConnectingPoint num="34" id="1415" />
+<TGConnectingPoint num="35" id="1416" />
+<TGConnectingPoint num="36" id="1417" />
+<TGConnectingPoint num="37" id="1418" />
+<TGConnectingPoint num="38" id="1419" />
+<TGConnectingPoint num="39" id="1420" />
+<TGConnectingPoint num="40" id="1421" />
+<TGConnectingPoint num="41" id="1422" />
+<TGConnectingPoint num="42" id="1423" />
+<TGConnectingPoint num="43" id="1424" />
+<TGConnectingPoint num="44" id="1425" />
+<TGConnectingPoint num="45" id="1426" />
+<TGConnectingPoint num="46" id="1427" />
+<TGConnectingPoint num="47" id="1428" />
+<TGConnectingPoint num="48" id="1429" />
+<TGConnectingPoint num="49" id="1430" />
+<TGConnectingPoint num="50" id="1431" />
+<TGConnectingPoint num="51" id="1432" />
+<TGConnectingPoint num="52" id="1433" />
+<TGConnectingPoint num="53" id="1434" />
+<TGConnectingPoint num="54" id="1435" />
+<TGConnectingPoint num="55" id="1436" />
+<TGConnectingPoint num="56" id="1437" />
+<TGConnectingPoint num="57" id="1438" />
+<TGConnectingPoint num="58" id="1439" />
+<TGConnectingPoint num="59" id="1440" />
+<TGConnectingPoint num="60" id="1441" />
+<TGConnectingPoint num="61" id="1442" />
+<TGConnectingPoint num="62" id="1443" />
+<TGConnectingPoint num="63" id="1444" />
+<TGConnectingPoint num="64" id="1445" />
+<TGConnectingPoint num="65" id="1446" />
+<TGConnectingPoint num="66" id="1447" />
+<TGConnectingPoint num="67" id="1448" />
+<TGConnectingPoint num="68" id="1449" />
+<TGConnectingPoint num="69" id="1450" />
+<TGConnectingPoint num="70" id="1451" />
+<TGConnectingPoint num="71" id="1452" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5106" id="1526" index="7" uid="11cdf67c-cc38-497a-8568-8d06b6685b50" >
+<cdparam x="400" y="340" />
+<sizeparam width="209" 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="messageDecrypt" />
-<TGConnectingPoint num="0" id="1171" />
-<TGConnectingPoint num="1" id="1172" />
-<TGConnectingPoint num="2" id="1173" />
-<TGConnectingPoint num="3" id="1174" />
-<TGConnectingPoint num="4" id="1175" />
-<TGConnectingPoint num="5" id="1176" />
-<TGConnectingPoint num="6" id="1177" />
-<TGConnectingPoint num="7" id="1178" />
-<TGConnectingPoint num="8" id="1179" />
-<TGConnectingPoint num="9" id="1180" />
-<TGConnectingPoint num="10" id="1181" />
-<TGConnectingPoint num="11" id="1182" />
-<TGConnectingPoint num="12" id="1183" />
-<TGConnectingPoint num="13" id="1184" />
-<TGConnectingPoint num="14" id="1185" />
-<TGConnectingPoint num="15" id="1186" />
-<TGConnectingPoint num="16" id="1187" />
-<TGConnectingPoint num="17" id="1188" />
-<TGConnectingPoint num="18" id="1189" />
-<TGConnectingPoint num="19" id="1190" />
-<TGConnectingPoint num="20" id="1191" />
-<TGConnectingPoint num="21" id="1192" />
-<TGConnectingPoint num="22" id="1193" />
-<TGConnectingPoint num="23" id="1194" />
-<TGConnectingPoint num="24" id="1195" />
-<TGConnectingPoint num="25" id="1196" />
-<TGConnectingPoint num="26" id="1197" />
-<TGConnectingPoint num="27" id="1198" />
-<TGConnectingPoint num="28" id="1199" />
-<TGConnectingPoint num="29" id="1200" />
-<TGConnectingPoint num="30" id="1201" />
-<TGConnectingPoint num="31" id="1202" />
-<TGConnectingPoint num="32" id="1203" />
-<TGConnectingPoint num="33" id="1204" />
-<TGConnectingPoint num="34" id="1205" />
-<TGConnectingPoint num="35" id="1206" />
-<TGConnectingPoint num="36" id="1207" />
-<TGConnectingPoint num="37" id="1208" />
-<TGConnectingPoint num="38" id="1209" />
-<TGConnectingPoint num="39" id="1210" />
-<TGConnectingPoint num="40" id="1211" />
-<TGConnectingPoint num="41" id="1212" />
-<TGConnectingPoint num="42" id="1213" />
-<TGConnectingPoint num="43" id="1214" />
-<TGConnectingPoint num="44" id="1215" />
-<TGConnectingPoint num="45" id="1216" />
-<TGConnectingPoint num="46" id="1217" />
-<TGConnectingPoint num="47" id="1218" />
-<TGConnectingPoint num="48" id="1219" />
-<TGConnectingPoint num="49" id="1220" />
-<TGConnectingPoint num="50" id="1221" />
-<TGConnectingPoint num="51" id="1222" />
-<TGConnectingPoint num="52" id="1223" />
-<TGConnectingPoint num="53" id="1224" />
-<TGConnectingPoint num="54" id="1225" />
-<TGConnectingPoint num="55" id="1226" />
-<TGConnectingPoint num="56" id="1227" />
-<TGConnectingPoint num="57" id="1228" />
-<TGConnectingPoint num="58" id="1229" />
-<TGConnectingPoint num="59" id="1230" />
-<TGConnectingPoint num="60" id="1231" />
-<TGConnectingPoint num="61" id="1232" />
-<TGConnectingPoint num="62" id="1233" />
-<TGConnectingPoint num="63" id="1234" />
-<TGConnectingPoint num="64" id="1235" />
-<TGConnectingPoint num="65" id="1236" />
-<TGConnectingPoint num="66" id="1237" />
-<TGConnectingPoint num="67" id="1238" />
-<TGConnectingPoint num="68" id="1239" />
-<TGConnectingPoint num="69" id="1240" />
-<TGConnectingPoint num="70" id="1241" />
-<TGConnectingPoint num="71" id="1242" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5104" id="1254" >
-<cdparam x="371" y="176" />
-<sizeparam width="73" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="state" value="_decrypt_Cipherdata" />
+<new d="false" />
+<TGConnectingPoint num="0" id="1454" />
+<TGConnectingPoint num="1" id="1455" />
+<TGConnectingPoint num="2" id="1456" />
+<TGConnectingPoint num="3" id="1457" />
+<TGConnectingPoint num="4" id="1458" />
+<TGConnectingPoint num="5" id="1459" />
+<TGConnectingPoint num="6" id="1460" />
+<TGConnectingPoint num="7" id="1461" />
+<TGConnectingPoint num="8" id="1462" />
+<TGConnectingPoint num="9" id="1463" />
+<TGConnectingPoint num="10" id="1464" />
+<TGConnectingPoint num="11" id="1465" />
+<TGConnectingPoint num="12" id="1466" />
+<TGConnectingPoint num="13" id="1467" />
+<TGConnectingPoint num="14" id="1468" />
+<TGConnectingPoint num="15" id="1469" />
+<TGConnectingPoint num="16" id="1470" />
+<TGConnectingPoint num="17" id="1471" />
+<TGConnectingPoint num="18" id="1472" />
+<TGConnectingPoint num="19" id="1473" />
+<TGConnectingPoint num="20" id="1474" />
+<TGConnectingPoint num="21" id="1475" />
+<TGConnectingPoint num="22" id="1476" />
+<TGConnectingPoint num="23" id="1477" />
+<TGConnectingPoint num="24" id="1478" />
+<TGConnectingPoint num="25" id="1479" />
+<TGConnectingPoint num="26" id="1480" />
+<TGConnectingPoint num="27" id="1481" />
+<TGConnectingPoint num="28" id="1482" />
+<TGConnectingPoint num="29" id="1483" />
+<TGConnectingPoint num="30" id="1484" />
+<TGConnectingPoint num="31" id="1485" />
+<TGConnectingPoint num="32" id="1486" />
+<TGConnectingPoint num="33" id="1487" />
+<TGConnectingPoint num="34" id="1488" />
+<TGConnectingPoint num="35" id="1489" />
+<TGConnectingPoint num="36" id="1490" />
+<TGConnectingPoint num="37" id="1491" />
+<TGConnectingPoint num="38" id="1492" />
+<TGConnectingPoint num="39" id="1493" />
+<TGConnectingPoint num="40" id="1494" />
+<TGConnectingPoint num="41" id="1495" />
+<TGConnectingPoint num="42" id="1496" />
+<TGConnectingPoint num="43" id="1497" />
+<TGConnectingPoint num="44" id="1498" />
+<TGConnectingPoint num="45" id="1499" />
+<TGConnectingPoint num="46" id="1500" />
+<TGConnectingPoint num="47" id="1501" />
+<TGConnectingPoint num="48" id="1502" />
+<TGConnectingPoint num="49" id="1503" />
+<TGConnectingPoint num="50" id="1504" />
+<TGConnectingPoint num="51" id="1505" />
+<TGConnectingPoint num="52" id="1506" />
+<TGConnectingPoint num="53" id="1507" />
+<TGConnectingPoint num="54" id="1508" />
+<TGConnectingPoint num="55" id="1509" />
+<TGConnectingPoint num="56" id="1510" />
+<TGConnectingPoint num="57" id="1511" />
+<TGConnectingPoint num="58" id="1512" />
+<TGConnectingPoint num="59" id="1513" />
+<TGConnectingPoint num="60" id="1514" />
+<TGConnectingPoint num="61" id="1515" />
+<TGConnectingPoint num="62" id="1516" />
+<TGConnectingPoint num="63" id="1517" />
+<TGConnectingPoint num="64" id="1518" />
+<TGConnectingPoint num="65" id="1519" />
+<TGConnectingPoint num="66" id="1520" />
+<TGConnectingPoint num="67" id="1521" />
+<TGConnectingPoint num="68" id="1522" />
+<TGConnectingPoint num="69" id="1523" />
+<TGConnectingPoint num="70" id="1524" />
+<TGConnectingPoint num="71" id="1525" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5104" id="1537" index="8" uid="fec71be0-2548-4a96-beab-ca3a8083b8b6" >
+<cdparam x="400" y="240" />
+<sizeparam width="30" height="20" minWidth="30" minHeight="0" 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="chin(m2)" />
-<TGConnectingPoint num="0" id="1244" />
-<TGConnectingPoint num="1" id="1245" />
-<TGConnectingPoint num="2" id="1246" />
-<TGConnectingPoint num="3" id="1247" />
-<TGConnectingPoint num="4" id="1248" />
-<TGConnectingPoint num="5" id="1249" />
-<TGConnectingPoint num="6" id="1250" />
-<TGConnectingPoint num="7" id="1251" />
-<TGConnectingPoint num="8" id="1252" />
-<TGConnectingPoint num="9" id="1253" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="1327" >
-<cdparam x="333" y="102" />
-<sizeparam width="149" height="39" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="Receive signal" value="comm(Cipherdata_encrypted)" />
+<new d="false" />
+<TGConnectingPoint num="0" id="1527" />
+<TGConnectingPoint num="1" id="1528" />
+<TGConnectingPoint num="2" id="1529" />
+<TGConnectingPoint num="3" id="1530" />
+<TGConnectingPoint num="4" id="1531" />
+<TGConnectingPoint num="5" id="1532" />
+<TGConnectingPoint num="6" id="1533" />
+<TGConnectingPoint num="7" id="1534" />
+<TGConnectingPoint num="8" id="1535" />
+<TGConnectingPoint num="9" id="1536" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="1610" index="9" uid="bbe520fa-9f06-41af-b196-10fb5500ee31" >
+<cdparam x="400" y="140" />
+<sizeparam width="418" 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="waitingForMessage" />
-<TGConnectingPoint num="0" id="1255" />
-<TGConnectingPoint num="1" id="1256" />
-<TGConnectingPoint num="2" id="1257" />
-<TGConnectingPoint num="3" id="1258" />
-<TGConnectingPoint num="4" id="1259" />
-<TGConnectingPoint num="5" id="1260" />
-<TGConnectingPoint num="6" id="1261" />
-<TGConnectingPoint num="7" id="1262" />
-<TGConnectingPoint num="8" id="1263" />
-<TGConnectingPoint num="9" id="1264" />
-<TGConnectingPoint num="10" id="1265" />
-<TGConnectingPoint num="11" id="1266" />
-<TGConnectingPoint num="12" id="1267" />
-<TGConnectingPoint num="13" id="1268" />
-<TGConnectingPoint num="14" id="1269" />
-<TGConnectingPoint num="15" id="1270" />
-<TGConnectingPoint num="16" id="1271" />
-<TGConnectingPoint num="17" id="1272" />
-<TGConnectingPoint num="18" id="1273" />
-<TGConnectingPoint num="19" id="1274" />
-<TGConnectingPoint num="20" id="1275" />
-<TGConnectingPoint num="21" id="1276" />
-<TGConnectingPoint num="22" id="1277" />
-<TGConnectingPoint num="23" id="1278" />
-<TGConnectingPoint num="24" id="1279" />
-<TGConnectingPoint num="25" id="1280" />
-<TGConnectingPoint num="26" id="1281" />
-<TGConnectingPoint num="27" id="1282" />
-<TGConnectingPoint num="28" id="1283" />
-<TGConnectingPoint num="29" id="1284" />
-<TGConnectingPoint num="30" id="1285" />
-<TGConnectingPoint num="31" id="1286" />
-<TGConnectingPoint num="32" id="1287" />
-<TGConnectingPoint num="33" id="1288" />
-<TGConnectingPoint num="34" id="1289" />
-<TGConnectingPoint num="35" id="1290" />
-<TGConnectingPoint num="36" id="1291" />
-<TGConnectingPoint num="37" id="1292" />
-<TGConnectingPoint num="38" id="1293" />
-<TGConnectingPoint num="39" id="1294" />
-<TGConnectingPoint num="40" id="1295" />
-<TGConnectingPoint num="41" id="1296" />
-<TGConnectingPoint num="42" id="1297" />
-<TGConnectingPoint num="43" id="1298" />
-<TGConnectingPoint num="44" id="1299" />
-<TGConnectingPoint num="45" id="1300" />
-<TGConnectingPoint num="46" id="1301" />
-<TGConnectingPoint num="47" id="1302" />
-<TGConnectingPoint num="48" id="1303" />
-<TGConnectingPoint num="49" id="1304" />
-<TGConnectingPoint num="50" id="1305" />
-<TGConnectingPoint num="51" id="1306" />
-<TGConnectingPoint num="52" id="1307" />
-<TGConnectingPoint num="53" id="1308" />
-<TGConnectingPoint num="54" id="1309" />
-<TGConnectingPoint num="55" id="1310" />
-<TGConnectingPoint num="56" id="1311" />
-<TGConnectingPoint num="57" id="1312" />
-<TGConnectingPoint num="58" id="1313" />
-<TGConnectingPoint num="59" id="1314" />
-<TGConnectingPoint num="60" id="1315" />
-<TGConnectingPoint num="61" id="1316" />
-<TGConnectingPoint num="62" id="1317" />
-<TGConnectingPoint num="63" id="1318" />
-<TGConnectingPoint num="64" id="1319" />
-<TGConnectingPoint num="65" id="1320" />
-<TGConnectingPoint num="66" id="1321" />
-<TGConnectingPoint num="67" id="1322" />
-<TGConnectingPoint num="68" id="1323" />
-<TGConnectingPoint num="69" id="1324" />
-<TGConnectingPoint num="70" id="1325" />
-<TGConnectingPoint num="71" id="1326" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5100" id="1329" >
-<cdparam x="400" y="50" />
-<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="state" value="signalstate_readchannel_SecureFV__comm" />
+<new d="false" />
+<TGConnectingPoint num="0" id="1538" />
+<TGConnectingPoint num="1" id="1539" />
+<TGConnectingPoint num="2" id="1540" />
+<TGConnectingPoint num="3" id="1541" />
+<TGConnectingPoint num="4" id="1542" />
+<TGConnectingPoint num="5" id="1543" />
+<TGConnectingPoint num="6" id="1544" />
+<TGConnectingPoint num="7" id="1545" />
+<TGConnectingPoint num="8" id="1546" />
+<TGConnectingPoint num="9" id="1547" />
+<TGConnectingPoint num="10" id="1548" />
+<TGConnectingPoint num="11" id="1549" />
+<TGConnectingPoint num="12" id="1550" />
+<TGConnectingPoint num="13" id="1551" />
+<TGConnectingPoint num="14" id="1552" />
+<TGConnectingPoint num="15" id="1553" />
+<TGConnectingPoint num="16" id="1554" />
+<TGConnectingPoint num="17" id="1555" />
+<TGConnectingPoint num="18" id="1556" />
+<TGConnectingPoint num="19" id="1557" />
+<TGConnectingPoint num="20" id="1558" />
+<TGConnectingPoint num="21" id="1559" />
+<TGConnectingPoint num="22" id="1560" />
+<TGConnectingPoint num="23" id="1561" />
+<TGConnectingPoint num="24" id="1562" />
+<TGConnectingPoint num="25" id="1563" />
+<TGConnectingPoint num="26" id="1564" />
+<TGConnectingPoint num="27" id="1565" />
+<TGConnectingPoint num="28" id="1566" />
+<TGConnectingPoint num="29" id="1567" />
+<TGConnectingPoint num="30" id="1568" />
+<TGConnectingPoint num="31" id="1569" />
+<TGConnectingPoint num="32" id="1570" />
+<TGConnectingPoint num="33" id="1571" />
+<TGConnectingPoint num="34" id="1572" />
+<TGConnectingPoint num="35" id="1573" />
+<TGConnectingPoint num="36" id="1574" />
+<TGConnectingPoint num="37" id="1575" />
+<TGConnectingPoint num="38" id="1576" />
+<TGConnectingPoint num="39" id="1577" />
+<TGConnectingPoint num="40" id="1578" />
+<TGConnectingPoint num="41" id="1579" />
+<TGConnectingPoint num="42" id="1580" />
+<TGConnectingPoint num="43" id="1581" />
+<TGConnectingPoint num="44" id="1582" />
+<TGConnectingPoint num="45" id="1583" />
+<TGConnectingPoint num="46" id="1584" />
+<TGConnectingPoint num="47" id="1585" />
+<TGConnectingPoint num="48" id="1586" />
+<TGConnectingPoint num="49" id="1587" />
+<TGConnectingPoint num="50" id="1588" />
+<TGConnectingPoint num="51" id="1589" />
+<TGConnectingPoint num="52" id="1590" />
+<TGConnectingPoint num="53" id="1591" />
+<TGConnectingPoint num="54" id="1592" />
+<TGConnectingPoint num="55" id="1593" />
+<TGConnectingPoint num="56" id="1594" />
+<TGConnectingPoint num="57" id="1595" />
+<TGConnectingPoint num="58" id="1596" />
+<TGConnectingPoint num="59" id="1597" />
+<TGConnectingPoint num="60" id="1598" />
+<TGConnectingPoint num="61" id="1599" />
+<TGConnectingPoint num="62" id="1600" />
+<TGConnectingPoint num="63" id="1601" />
+<TGConnectingPoint num="64" id="1602" />
+<TGConnectingPoint num="65" id="1603" />
+<TGConnectingPoint num="66" id="1604" />
+<TGConnectingPoint num="67" id="1605" />
+<TGConnectingPoint num="68" id="1606" />
+<TGConnectingPoint num="69" id="1607" />
+<TGConnectingPoint num="70" id="1608" />
+<TGConnectingPoint num="71" id="1609" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5100" id="1612" index="10" uid="dff5c2b0-8221-4467-aa4e-ee8e4f930297" >
+<cdparam x="400" y="40" />
+<sizeparam width="15" height="15" minWidth="0" minHeight="0" 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="1328" />
+<new d="false" />
+<TGConnectingPoint num="0" id="1611" />
</COMPONENT>
</AVATARStateMachineDiagramPanel>
-<AVATARStateMachineDiagramPanel name="T1" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="5102" id="1336" >
-<cdparam x="407" y="310" />
+<AVATARStateMachineDiagramPanel name="T1" minX="10" maxX="1400" minY="10" maxY="900" zoom="1.0" >
+<CONNECTOR type="5102" id="1619" index="0" uid="b61e36ff-3b23-41b8-88e9-ee79fcb65d8e" >
+<cdparam x="400" y="140" />
<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="1335" />
-<P1 x="407" y="310" id="1439" />
-<P2 x="407" y="356" id="1366" />
+<TGConnectingPoint num="0" id="1618" />
+<P1 x="400" y="140" id="1727" />
+<P2 x="614" y="240" id="1655" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1334" >
-<father id="1336" num="0" />
-<cdparam x="449" y="353" />
-<sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<new d="false" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1617" index="9" uid="9d2c4db1-7b0a-4691-b3cf-74689db805e1" >
+<father id="1619" num="0" />
+<cdparam x="507" y="190" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" 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="1330" />
-<TGConnectingPoint num="1" id="1331" />
-<TGConnectingPoint num="2" id="1332" />
-<TGConnectingPoint num="3" id="1333" />
+<new d="false" />
+<TGConnectingPoint num="0" id="1613" />
+<TGConnectingPoint num="1" id="1614" />
+<TGConnectingPoint num="2" id="1615" />
+<TGConnectingPoint num="3" id="1616" />
<extraparam>
<guard value="[ ]" enabled="true"/>
<afterMin value="" enabled="true"/>
@@ -2908,29 +3473,32 @@
<computeMin value="" enabled="true"/>
<computeMax value="" enabled="true"/>
<probability value="" enabled="true"/>
+<actions value="Cipherdata_encrypted=sencrypt(Cipherdata,key_Cipherdata)" enabled="true"/>
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="1343" >
-<cdparam x="492" y="446" />
+<CONNECTOR type="5102" id="1626" index="1" uid="2e61c8bc-771a-4afa-883c-1aac7412efe4" >
+<cdparam x="400" y="240" />
<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="1342" />
-<P1 x="407" y="406" id="1371" />
-<P2 x="407" y="451" id="1449" />
+<TGConnectingPoint num="0" id="1625" />
+<P1 x="400" y="240" id="1654" />
+<P2 x="415" y="335" id="1643" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1341" >
-<father id="1343" num="0" />
-<cdparam x="449" y="440" />
-<sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<new d="false" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1624" index="10" uid="14080b12-95f6-4511-abde-58253a90f3fc" >
+<father id="1626" num="0" />
+<cdparam x="407" y="287" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" 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="1337" />
-<TGConnectingPoint num="1" id="1338" />
-<TGConnectingPoint num="2" id="1339" />
-<TGConnectingPoint num="3" id="1340" />
+<new d="false" />
+<TGConnectingPoint num="0" id="1620" />
+<TGConnectingPoint num="1" id="1621" />
+<TGConnectingPoint num="2" id="1622" />
+<TGConnectingPoint num="3" id="1623" />
<extraparam>
<guard value="[ ]" enabled="true"/>
<afterMin value="" enabled="true"/>
@@ -2944,26 +3512,28 @@
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="1350" >
-<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 state0 to stop state" value="null" />
-<TGConnectingPoint num="0" id="1349" />
-<P1 x="407" y="251" id="1457" />
-<P2 x="407" y="280" id="1438" />
+<CONNECTOR type="5102" id="1633" index="2" uid="ae7b6eab-db51-44de-90c6-bed005fbd336" >
+<cdparam x="415" y="365" />
+<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="1632" />
+<P1 x="415" y="365" id="1644" />
+<P2 x="410" y="435" id="1641" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1348" >
-<father id="1350" num="0" />
-<cdparam x="407" y="291" />
-<sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<new d="false" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1631" index="11" uid="629a7d2d-49c0-480c-b9ff-0f5bbce32279" >
+<father id="1633" num="0" />
+<cdparam x="412" y="400" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" 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="1344" />
-<TGConnectingPoint num="1" id="1345" />
-<TGConnectingPoint num="2" id="1346" />
-<TGConnectingPoint num="3" id="1347" />
+<new d="false" />
+<TGConnectingPoint num="0" id="1627" />
+<TGConnectingPoint num="1" id="1628" />
+<TGConnectingPoint num="2" id="1629" />
+<TGConnectingPoint num="3" id="1630" />
<extraparam>
<guard value="[ ]" enabled="true"/>
<afterMin value="" enabled="true"/>
@@ -2977,26 +3547,28 @@
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="1357" >
-<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 state0" value="null" />
-<TGConnectingPoint num="0" id="1356" />
-<P1 x="407" y="132" id="1530" />
-<P2 x="407" y="211" id="1452" />
+<CONNECTOR type="5102" id="1640" index="3" uid="6b2834ee-e8d2-482c-8aa2-57eb340a4499" >
+<cdparam x="407" y="60" />
+<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="1639" />
+<P1 x="407" y="60" id="1800" />
+<P2 x="504" y="140" id="1728" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1355" >
-<father id="1357" num="0" />
-<cdparam x="415" y="162" />
-<sizeparam width="134" height="30" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<new d="false" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1638" index="12" uid="cd48c035-0ba6-4a91-86f5-c99b5437b132" >
+<father id="1640" num="0" />
+<cdparam x="455" y="100" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" 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="1351" />
-<TGConnectingPoint num="1" id="1352" />
-<TGConnectingPoint num="2" id="1353" />
-<TGConnectingPoint num="3" id="1354" />
+<new d="false" />
+<TGConnectingPoint num="0" id="1634" />
+<TGConnectingPoint num="1" id="1635" />
+<TGConnectingPoint num="2" id="1636" />
+<TGConnectingPoint num="3" id="1637" />
<extraparam>
<guard value="[ ]" enabled="true"/>
<afterMin value="" enabled="true"/>
@@ -3007,328 +3579,243 @@
<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="1364" >
-<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="1363" />
-<P1 x="407" y="70" id="1597" />
-<P2 x="407" y="92" id="1525" />
-<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1362" >
-<father id="1364" num="0" />
-<cdparam x="407" y="110" />
-<sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5101" id="1642" index="4" uid="ce8751fb-e861-4e9a-8c82-efe7bf4edff1" >
+<cdparam x="400" y="440" />
+<sizeparam width="20" height="20" minWidth="0" minHeight="0" 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="1358" />
-<TGConnectingPoint num="1" id="1359" />
-<TGConnectingPoint num="2" id="1360" />
-<TGConnectingPoint num="3" id="1361" />
-<extraparam>
-<guard value="[ ]" enabled="true"/>
-<afterMin value="" enabled="true"/>
-<afterMax value="" enabled="true"/>
-<extraDelay1 value="" enabled="true"/>
-<extraDelay2 value="" enabled="true"/>
-<delayDistributionLaw value="0" enabled="true"/>
-<computeMin value="" enabled="true"/>
-<computeMax value="" enabled="true"/>
-<probability value="" enabled="true"/>
-</extraparam>
-</SUBCOMPONENT>
+<infoparam name="stop state" value="null" />
+<new d="false" />
+<TGConnectingPoint num="0" id="1641" />
+</COMPONENT>
-<COMPONENT type="5106" id="1437" >
-<cdparam x="357" y="356" />
-<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5103" id="1653" index="5" uid="a39e2538-52e8-49bd-bb41-d1ac8936c4d4" >
+<cdparam x="400" y="340" />
+<sizeparam width="30" height="20" minWidth="30" minHeight="0" 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="1365" />
-<TGConnectingPoint num="1" id="1366" />
-<TGConnectingPoint num="2" id="1367" />
-<TGConnectingPoint num="3" id="1368" />
-<TGConnectingPoint num="4" id="1369" />
-<TGConnectingPoint num="5" id="1370" />
-<TGConnectingPoint num="6" id="1371" />
-<TGConnectingPoint num="7" id="1372" />
-<TGConnectingPoint num="8" id="1373" />
-<TGConnectingPoint num="9" id="1374" />
-<TGConnectingPoint num="10" id="1375" />
-<TGConnectingPoint num="11" id="1376" />
-<TGConnectingPoint num="12" id="1377" />
-<TGConnectingPoint num="13" id="1378" />
-<TGConnectingPoint num="14" id="1379" />
-<TGConnectingPoint num="15" id="1380" />
-<TGConnectingPoint num="16" id="1381" />
-<TGConnectingPoint num="17" id="1382" />
-<TGConnectingPoint num="18" id="1383" />
-<TGConnectingPoint num="19" id="1384" />
-<TGConnectingPoint num="20" id="1385" />
-<TGConnectingPoint num="21" id="1386" />
-<TGConnectingPoint num="22" id="1387" />
-<TGConnectingPoint num="23" id="1388" />
-<TGConnectingPoint num="24" id="1389" />
-<TGConnectingPoint num="25" id="1390" />
-<TGConnectingPoint num="26" id="1391" />
-<TGConnectingPoint num="27" id="1392" />
-<TGConnectingPoint num="28" id="1393" />
-<TGConnectingPoint num="29" id="1394" />
-<TGConnectingPoint num="30" id="1395" />
-<TGConnectingPoint num="31" id="1396" />
-<TGConnectingPoint num="32" id="1397" />
-<TGConnectingPoint num="33" id="1398" />
-<TGConnectingPoint num="34" id="1399" />
-<TGConnectingPoint num="35" id="1400" />
-<TGConnectingPoint num="36" id="1401" />
-<TGConnectingPoint num="37" id="1402" />
-<TGConnectingPoint num="38" id="1403" />
-<TGConnectingPoint num="39" id="1404" />
-<TGConnectingPoint num="40" id="1405" />
-<TGConnectingPoint num="41" id="1406" />
-<TGConnectingPoint num="42" id="1407" />
-<TGConnectingPoint num="43" id="1408" />
-<TGConnectingPoint num="44" id="1409" />
-<TGConnectingPoint num="45" id="1410" />
-<TGConnectingPoint num="46" id="1411" />
-<TGConnectingPoint num="47" id="1412" />
-<TGConnectingPoint num="48" id="1413" />
-<TGConnectingPoint num="49" id="1414" />
-<TGConnectingPoint num="50" id="1415" />
-<TGConnectingPoint num="51" id="1416" />
-<TGConnectingPoint num="52" id="1417" />
-<TGConnectingPoint num="53" id="1418" />
-<TGConnectingPoint num="54" id="1419" />
-<TGConnectingPoint num="55" id="1420" />
-<TGConnectingPoint num="56" id="1421" />
-<TGConnectingPoint num="57" id="1422" />
-<TGConnectingPoint num="58" id="1423" />
-<TGConnectingPoint num="59" id="1424" />
-<TGConnectingPoint num="60" id="1425" />
-<TGConnectingPoint num="61" id="1426" />
-<TGConnectingPoint num="62" id="1427" />
-<TGConnectingPoint num="63" id="1428" />
-<TGConnectingPoint num="64" id="1429" />
-<TGConnectingPoint num="65" id="1430" />
-<TGConnectingPoint num="66" id="1431" />
-<TGConnectingPoint num="67" id="1432" />
-<TGConnectingPoint num="68" id="1433" />
-<TGConnectingPoint num="69" id="1434" />
-<TGConnectingPoint num="70" id="1435" />
-<TGConnectingPoint num="71" id="1436" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5103" id="1448" >
-<cdparam x="370" y="285" />
-<sizeparam width="75" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="Send signal" value="comm(Cipherdata_encrypted)" />
+<new d="false" />
+<TGConnectingPoint num="0" id="1643" />
+<TGConnectingPoint num="1" id="1644" />
+<TGConnectingPoint num="2" id="1645" />
+<TGConnectingPoint num="3" id="1646" />
+<TGConnectingPoint num="4" id="1647" />
+<TGConnectingPoint num="5" id="1648" />
+<TGConnectingPoint num="6" id="1649" />
+<TGConnectingPoint num="7" id="1650" />
+<TGConnectingPoint num="8" id="1651" />
+<TGConnectingPoint num="9" id="1652" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="1726" index="6" uid="483e1849-7a0d-4d31-a4d1-0ab29a3514bd" >
+<cdparam x="400" y="240" />
+<sizeparam width="429" 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="Send signal" value="chout(m1)" />
-<TGConnectingPoint num="0" id="1438" />
-<TGConnectingPoint num="1" id="1439" />
-<TGConnectingPoint num="2" id="1440" />
-<TGConnectingPoint num="3" id="1441" />
-<TGConnectingPoint num="4" id="1442" />
-<TGConnectingPoint num="5" id="1443" />
-<TGConnectingPoint num="6" id="1444" />
-<TGConnectingPoint num="7" id="1445" />
-<TGConnectingPoint num="8" id="1446" />
-<TGConnectingPoint num="9" id="1447" />
-</COMPONENT>
-
-<COMPONENT type="5101" id="1450" >
-<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="stop state" value="null" />
-<TGConnectingPoint num="0" id="1449" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="1523" >
-<cdparam x="336" y="211" />
-<sizeparam width="143" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="state" value="signalstate_writechannel_SecureFV__comm" />
+<new d="false" />
+<TGConnectingPoint num="0" id="1654" />
+<TGConnectingPoint num="1" id="1655" />
+<TGConnectingPoint num="2" id="1656" />
+<TGConnectingPoint num="3" id="1657" />
+<TGConnectingPoint num="4" id="1658" />
+<TGConnectingPoint num="5" id="1659" />
+<TGConnectingPoint num="6" id="1660" />
+<TGConnectingPoint num="7" id="1661" />
+<TGConnectingPoint num="8" id="1662" />
+<TGConnectingPoint num="9" id="1663" />
+<TGConnectingPoint num="10" id="1664" />
+<TGConnectingPoint num="11" id="1665" />
+<TGConnectingPoint num="12" id="1666" />
+<TGConnectingPoint num="13" id="1667" />
+<TGConnectingPoint num="14" id="1668" />
+<TGConnectingPoint num="15" id="1669" />
+<TGConnectingPoint num="16" id="1670" />
+<TGConnectingPoint num="17" id="1671" />
+<TGConnectingPoint num="18" id="1672" />
+<TGConnectingPoint num="19" id="1673" />
+<TGConnectingPoint num="20" id="1674" />
+<TGConnectingPoint num="21" id="1675" />
+<TGConnectingPoint num="22" id="1676" />
+<TGConnectingPoint num="23" id="1677" />
+<TGConnectingPoint num="24" id="1678" />
+<TGConnectingPoint num="25" id="1679" />
+<TGConnectingPoint num="26" id="1680" />
+<TGConnectingPoint num="27" id="1681" />
+<TGConnectingPoint num="28" id="1682" />
+<TGConnectingPoint num="29" id="1683" />
+<TGConnectingPoint num="30" id="1684" />
+<TGConnectingPoint num="31" id="1685" />
+<TGConnectingPoint num="32" id="1686" />
+<TGConnectingPoint num="33" id="1687" />
+<TGConnectingPoint num="34" id="1688" />
+<TGConnectingPoint num="35" id="1689" />
+<TGConnectingPoint num="36" id="1690" />
+<TGConnectingPoint num="37" id="1691" />
+<TGConnectingPoint num="38" id="1692" />
+<TGConnectingPoint num="39" id="1693" />
+<TGConnectingPoint num="40" id="1694" />
+<TGConnectingPoint num="41" id="1695" />
+<TGConnectingPoint num="42" id="1696" />
+<TGConnectingPoint num="43" id="1697" />
+<TGConnectingPoint num="44" id="1698" />
+<TGConnectingPoint num="45" id="1699" />
+<TGConnectingPoint num="46" id="1700" />
+<TGConnectingPoint num="47" id="1701" />
+<TGConnectingPoint num="48" id="1702" />
+<TGConnectingPoint num="49" id="1703" />
+<TGConnectingPoint num="50" id="1704" />
+<TGConnectingPoint num="51" id="1705" />
+<TGConnectingPoint num="52" id="1706" />
+<TGConnectingPoint num="53" id="1707" />
+<TGConnectingPoint num="54" id="1708" />
+<TGConnectingPoint num="55" id="1709" />
+<TGConnectingPoint num="56" id="1710" />
+<TGConnectingPoint num="57" id="1711" />
+<TGConnectingPoint num="58" id="1712" />
+<TGConnectingPoint num="59" id="1713" />
+<TGConnectingPoint num="60" id="1714" />
+<TGConnectingPoint num="61" id="1715" />
+<TGConnectingPoint num="62" id="1716" />
+<TGConnectingPoint num="63" id="1717" />
+<TGConnectingPoint num="64" id="1718" />
+<TGConnectingPoint num="65" id="1719" />
+<TGConnectingPoint num="66" id="1720" />
+<TGConnectingPoint num="67" id="1721" />
+<TGConnectingPoint num="68" id="1722" />
+<TGConnectingPoint num="69" id="1723" />
+<TGConnectingPoint num="70" id="1724" />
+<TGConnectingPoint num="71" id="1725" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5106" id="1799" index="7" uid="9b7363fc-969d-4b41-b1b6-12db4c3224fe" >
+<cdparam x="400" y="140" />
+<sizeparam width="209" 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="sendingMessage" />
-<TGConnectingPoint num="0" id="1451" />
-<TGConnectingPoint num="1" id="1452" />
-<TGConnectingPoint num="2" id="1453" />
-<TGConnectingPoint num="3" id="1454" />
-<TGConnectingPoint num="4" id="1455" />
-<TGConnectingPoint num="5" id="1456" />
-<TGConnectingPoint num="6" id="1457" />
-<TGConnectingPoint num="7" id="1458" />
-<TGConnectingPoint num="8" id="1459" />
-<TGConnectingPoint num="9" id="1460" />
-<TGConnectingPoint num="10" id="1461" />
-<TGConnectingPoint num="11" id="1462" />
-<TGConnectingPoint num="12" id="1463" />
-<TGConnectingPoint num="13" id="1464" />
-<TGConnectingPoint num="14" id="1465" />
-<TGConnectingPoint num="15" id="1466" />
-<TGConnectingPoint num="16" id="1467" />
-<TGConnectingPoint num="17" id="1468" />
-<TGConnectingPoint num="18" id="1469" />
-<TGConnectingPoint num="19" id="1470" />
-<TGConnectingPoint num="20" id="1471" />
-<TGConnectingPoint num="21" id="1472" />
-<TGConnectingPoint num="22" id="1473" />
-<TGConnectingPoint num="23" id="1474" />
-<TGConnectingPoint num="24" id="1475" />
-<TGConnectingPoint num="25" id="1476" />
-<TGConnectingPoint num="26" id="1477" />
-<TGConnectingPoint num="27" id="1478" />
-<TGConnectingPoint num="28" id="1479" />
-<TGConnectingPoint num="29" id="1480" />
-<TGConnectingPoint num="30" id="1481" />
-<TGConnectingPoint num="31" id="1482" />
-<TGConnectingPoint num="32" id="1483" />
-<TGConnectingPoint num="33" id="1484" />
-<TGConnectingPoint num="34" id="1485" />
-<TGConnectingPoint num="35" id="1486" />
-<TGConnectingPoint num="36" id="1487" />
-<TGConnectingPoint num="37" id="1488" />
-<TGConnectingPoint num="38" id="1489" />
-<TGConnectingPoint num="39" id="1490" />
-<TGConnectingPoint num="40" id="1491" />
-<TGConnectingPoint num="41" id="1492" />
-<TGConnectingPoint num="42" id="1493" />
-<TGConnectingPoint num="43" id="1494" />
-<TGConnectingPoint num="44" id="1495" />
-<TGConnectingPoint num="45" id="1496" />
-<TGConnectingPoint num="46" id="1497" />
-<TGConnectingPoint num="47" id="1498" />
-<TGConnectingPoint num="48" id="1499" />
-<TGConnectingPoint num="49" id="1500" />
-<TGConnectingPoint num="50" id="1501" />
-<TGConnectingPoint num="51" id="1502" />
-<TGConnectingPoint num="52" id="1503" />
-<TGConnectingPoint num="53" id="1504" />
-<TGConnectingPoint num="54" id="1505" />
-<TGConnectingPoint num="55" id="1506" />
-<TGConnectingPoint num="56" id="1507" />
-<TGConnectingPoint num="57" id="1508" />
-<TGConnectingPoint num="58" id="1509" />
-<TGConnectingPoint num="59" id="1510" />
-<TGConnectingPoint num="60" id="1511" />
-<TGConnectingPoint num="61" id="1512" />
-<TGConnectingPoint num="62" id="1513" />
-<TGConnectingPoint num="63" id="1514" />
-<TGConnectingPoint num="64" id="1515" />
-<TGConnectingPoint num="65" id="1516" />
-<TGConnectingPoint num="66" id="1517" />
-<TGConnectingPoint num="67" id="1518" />
-<TGConnectingPoint num="68" id="1519" />
-<TGConnectingPoint num="69" id="1520" />
-<TGConnectingPoint num="70" id="1521" />
-<TGConnectingPoint num="71" id="1522" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5106" id="1596" >
-<cdparam x="340" y="92" />
-<sizeparam width="134" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="state" value="_encrypt_Cipherdata" />
+<new d="false" />
+<TGConnectingPoint num="0" id="1727" />
+<TGConnectingPoint num="1" id="1728" />
+<TGConnectingPoint num="2" id="1729" />
+<TGConnectingPoint num="3" id="1730" />
+<TGConnectingPoint num="4" id="1731" />
+<TGConnectingPoint num="5" id="1732" />
+<TGConnectingPoint num="6" id="1733" />
+<TGConnectingPoint num="7" id="1734" />
+<TGConnectingPoint num="8" id="1735" />
+<TGConnectingPoint num="9" id="1736" />
+<TGConnectingPoint num="10" id="1737" />
+<TGConnectingPoint num="11" id="1738" />
+<TGConnectingPoint num="12" id="1739" />
+<TGConnectingPoint num="13" id="1740" />
+<TGConnectingPoint num="14" id="1741" />
+<TGConnectingPoint num="15" id="1742" />
+<TGConnectingPoint num="16" id="1743" />
+<TGConnectingPoint num="17" id="1744" />
+<TGConnectingPoint num="18" id="1745" />
+<TGConnectingPoint num="19" id="1746" />
+<TGConnectingPoint num="20" id="1747" />
+<TGConnectingPoint num="21" id="1748" />
+<TGConnectingPoint num="22" id="1749" />
+<TGConnectingPoint num="23" id="1750" />
+<TGConnectingPoint num="24" id="1751" />
+<TGConnectingPoint num="25" id="1752" />
+<TGConnectingPoint num="26" id="1753" />
+<TGConnectingPoint num="27" id="1754" />
+<TGConnectingPoint num="28" id="1755" />
+<TGConnectingPoint num="29" id="1756" />
+<TGConnectingPoint num="30" id="1757" />
+<TGConnectingPoint num="31" id="1758" />
+<TGConnectingPoint num="32" id="1759" />
+<TGConnectingPoint num="33" id="1760" />
+<TGConnectingPoint num="34" id="1761" />
+<TGConnectingPoint num="35" id="1762" />
+<TGConnectingPoint num="36" id="1763" />
+<TGConnectingPoint num="37" id="1764" />
+<TGConnectingPoint num="38" id="1765" />
+<TGConnectingPoint num="39" id="1766" />
+<TGConnectingPoint num="40" id="1767" />
+<TGConnectingPoint num="41" id="1768" />
+<TGConnectingPoint num="42" id="1769" />
+<TGConnectingPoint num="43" id="1770" />
+<TGConnectingPoint num="44" id="1771" />
+<TGConnectingPoint num="45" id="1772" />
+<TGConnectingPoint num="46" id="1773" />
+<TGConnectingPoint num="47" id="1774" />
+<TGConnectingPoint num="48" id="1775" />
+<TGConnectingPoint num="49" id="1776" />
+<TGConnectingPoint num="50" id="1777" />
+<TGConnectingPoint num="51" id="1778" />
+<TGConnectingPoint num="52" id="1779" />
+<TGConnectingPoint num="53" id="1780" />
+<TGConnectingPoint num="54" id="1781" />
+<TGConnectingPoint num="55" id="1782" />
+<TGConnectingPoint num="56" id="1783" />
+<TGConnectingPoint num="57" id="1784" />
+<TGConnectingPoint num="58" id="1785" />
+<TGConnectingPoint num="59" id="1786" />
+<TGConnectingPoint num="60" id="1787" />
+<TGConnectingPoint num="61" id="1788" />
+<TGConnectingPoint num="62" id="1789" />
+<TGConnectingPoint num="63" id="1790" />
+<TGConnectingPoint num="64" id="1791" />
+<TGConnectingPoint num="65" id="1792" />
+<TGConnectingPoint num="66" id="1793" />
+<TGConnectingPoint num="67" id="1794" />
+<TGConnectingPoint num="68" id="1795" />
+<TGConnectingPoint num="69" id="1796" />
+<TGConnectingPoint num="70" id="1797" />
+<TGConnectingPoint num="71" id="1798" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5100" id="1801" index="8" uid="542f6f80-1cb0-4084-a232-40e30f3cf9b7" >
+<cdparam x="400" y="40" />
+<sizeparam width="15" height="15" minWidth="0" minHeight="0" 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="1524" />
-<TGConnectingPoint num="1" id="1525" />
-<TGConnectingPoint num="2" id="1526" />
-<TGConnectingPoint num="3" id="1527" />
-<TGConnectingPoint num="4" id="1528" />
-<TGConnectingPoint num="5" id="1529" />
-<TGConnectingPoint num="6" id="1530" />
-<TGConnectingPoint num="7" id="1531" />
-<TGConnectingPoint num="8" id="1532" />
-<TGConnectingPoint num="9" id="1533" />
-<TGConnectingPoint num="10" id="1534" />
-<TGConnectingPoint num="11" id="1535" />
-<TGConnectingPoint num="12" id="1536" />
-<TGConnectingPoint num="13" id="1537" />
-<TGConnectingPoint num="14" id="1538" />
-<TGConnectingPoint num="15" id="1539" />
-<TGConnectingPoint num="16" id="1540" />
-<TGConnectingPoint num="17" id="1541" />
-<TGConnectingPoint num="18" id="1542" />
-<TGConnectingPoint num="19" id="1543" />
-<TGConnectingPoint num="20" id="1544" />
-<TGConnectingPoint num="21" id="1545" />
-<TGConnectingPoint num="22" id="1546" />
-<TGConnectingPoint num="23" id="1547" />
-<TGConnectingPoint num="24" id="1548" />
-<TGConnectingPoint num="25" id="1549" />
-<TGConnectingPoint num="26" id="1550" />
-<TGConnectingPoint num="27" id="1551" />
-<TGConnectingPoint num="28" id="1552" />
-<TGConnectingPoint num="29" id="1553" />
-<TGConnectingPoint num="30" id="1554" />
-<TGConnectingPoint num="31" id="1555" />
-<TGConnectingPoint num="32" id="1556" />
-<TGConnectingPoint num="33" id="1557" />
-<TGConnectingPoint num="34" id="1558" />
-<TGConnectingPoint num="35" id="1559" />
-<TGConnectingPoint num="36" id="1560" />
-<TGConnectingPoint num="37" id="1561" />
-<TGConnectingPoint num="38" id="1562" />
-<TGConnectingPoint num="39" id="1563" />
-<TGConnectingPoint num="40" id="1564" />
-<TGConnectingPoint num="41" id="1565" />
-<TGConnectingPoint num="42" id="1566" />
-<TGConnectingPoint num="43" id="1567" />
-<TGConnectingPoint num="44" id="1568" />
-<TGConnectingPoint num="45" id="1569" />
-<TGConnectingPoint num="46" id="1570" />
-<TGConnectingPoint num="47" id="1571" />
-<TGConnectingPoint num="48" id="1572" />
-<TGConnectingPoint num="49" id="1573" />
-<TGConnectingPoint num="50" id="1574" />
-<TGConnectingPoint num="51" id="1575" />
-<TGConnectingPoint num="52" id="1576" />
-<TGConnectingPoint num="53" id="1577" />
-<TGConnectingPoint num="54" id="1578" />
-<TGConnectingPoint num="55" id="1579" />
-<TGConnectingPoint num="56" id="1580" />
-<TGConnectingPoint num="57" id="1581" />
-<TGConnectingPoint num="58" id="1582" />
-<TGConnectingPoint num="59" id="1583" />
-<TGConnectingPoint num="60" id="1584" />
-<TGConnectingPoint num="61" id="1585" />
-<TGConnectingPoint num="62" id="1586" />
-<TGConnectingPoint num="63" id="1587" />
-<TGConnectingPoint num="64" id="1588" />
-<TGConnectingPoint num="65" id="1589" />
-<TGConnectingPoint num="66" id="1590" />
-<TGConnectingPoint num="67" id="1591" />
-<TGConnectingPoint num="68" id="1592" />
-<TGConnectingPoint num="69" id="1593" />
-<TGConnectingPoint num="70" id="1594" />
-<TGConnectingPoint num="71" id="1595" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5100" id="1598" >
+<infoparam name="start state" value="null" />
+<new d="false" />
+<TGConnectingPoint num="0" id="1800" />
+</COMPONENT>
+
+
+</AVATARStateMachineDiagramPanel>
+
+<AVATARStateMachineDiagramPanel name="Block" minX="10" maxX="2500" minY="10" maxY="1500" zoom="1.0" >
+<COMPONENT type="5100" id="1803" index="0" uid="4c3c8484-535c-4b95-aaa2-26f03b5f0371" >
<cdparam x="400" y="50" />
-<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="start state" value="null" />
+<new d="false" />
+<TGConnectingPoint num="0" id="1802" />
+</COMPONENT>
+
+
+</AVATARStateMachineDiagramPanel>
+
+<AVATARStateMachineDiagramPanel name="Block" minX="10" maxX="2500" minY="10" maxY="1500" zoom="1.0" >
+<COMPONENT type="5100" id="1805" index="0" uid="cc504eef-3b15-49c9-86ea-d4ecd41e8022" >
+<cdparam x="400" y="50" />
+<sizeparam width="15" height="15" minWidth="0" minHeight="0" 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="1597" />
+<new d="false" />
+<TGConnectingPoint num="0" id="1804" />
</COMPONENT>
diff --git a/src/main/java/ui/TDiagramPanel.java b/src/main/java/ui/TDiagramPanel.java
index b4ad82872b7a36894dfd36684e931e47c91cba3b..b25eaa15a16ba01c48fb30302b462e4e99f57df5 100644
--- a/src/main/java/ui/TDiagramPanel.java
+++ b/src/main/java/ui/TDiagramPanel.java
@@ -3154,6 +3154,7 @@ public abstract class TDiagramPanel extends JPanel implements GenericTree {
}
public boolean checkAvatarBDLibraryFunction(AvatarBDLibraryFunction o, String name) {
+ TraceManager.addDev("checkAvatarBDLibraryFunction with func=" + o.getFunctionName() + " vs. " + name);
return false;
}
@@ -3476,6 +3477,7 @@ public abstract class TDiagramPanel extends JPanel implements GenericTree {
}
public boolean checkAvatarBDLibraryFunction(AvatarBDLibraryFunction o, String name) {
+ TraceManager.addDev("checkAvatarBDLibraryFunction with func=" + o.getFunctionName() + " vs. " + name);
return o.getFunctionName().equals(name);
}
diff --git a/src/main/java/ui/avatarbd/AvatarBDLibraryFunction.java b/src/main/java/ui/avatarbd/AvatarBDLibraryFunction.java
index 89aca79de7c55146ba4d3d4cf59665a1ff8bb271..2be3645cca58a8d16a90da09486a9d37e7cd9c7c 100644
--- a/src/main/java/ui/avatarbd/AvatarBDLibraryFunction.java
+++ b/src/main/java/ui/avatarbd/AvatarBDLibraryFunction.java
@@ -593,6 +593,23 @@ public class AvatarBDLibraryFunction extends TGCScalableWithoutInternalComponent
this.setValue(s);
}
+ @Override
+ public void setValue(String s) {
+ //TraceManager.addDev("Set value lib function");
+ if (s.equals(value)) {
+ return;
+ }
+ value = s;
+ this.name = s;
+ }
+
+ @Override
+ public void setValueWithChange(String v) {
+ super.setValueWithChange(v);
+ name = v;
+ }
+
+
@Override
public TGComponent isOnMe(int x1, int y1) {