diff --git a/Makefile b/Makefile
index 41a33420fd12611c82ae8ff5f4d8f2b64c0676ec..44513b434b03791adfd1346110c8320b7e09b625 100755
--- a/Makefile
+++ b/Makefile
@@ -213,7 +213,7 @@ html: $(MD2HTML)
@chmod u+x $(TTOOL_SIMULATORS)/c++2/src_simulator/helpGeneration.sh
@$(TTOOL_SIMULATORS)/c++2/src_simulator/helpGeneration.sh $(TTOOL_SIMULATORS)/c++2/src_simulator/ServerHelpData.h $(TTOOL_HELP_DIR)/diplodocussimulator.html
%.html: %.md
- pandoc $< -f markdown -t html -s -o $@ --lua-filter=doc/ttoolfilter.lua --metadata pagetitle="TTool help" --css $(TTOOL_RESOURCES)/help/help.css
+ pandoc $< -f markdown -t html -s -o $@ --lua-filter=doc/ttoolfilter.lua --metadata pagetitle="TTool help" --css help.css
# ========================================
# ========== DOCUMENTATION ==========
diff --git a/doc/SysMLSec/fig/channelsecurityTab.png b/doc/SysMLSec/fig/channelsecurityTab.png
new file mode 100644
index 0000000000000000000000000000000000000000..47ca2bd77ef423fb9ac5cbcd9469b989ffdd881f
Binary files /dev/null and b/doc/SysMLSec/fig/channelsecurityTab.png differ
diff --git a/doc/SysMLSec/fig/fv_auth_check.svg b/doc/SysMLSec/fig/fv_auth_check.svg
new file mode 100644
index 0000000000000000000000000000000000000000..c1ad9db3ba79c23f2b7d24e7437ec1efd34dab56
--- /dev/null
+++ b/doc/SysMLSec/fig/fv_auth_check.svg
@@ -0,0 +1,137 @@
+<?xml version="1.0"?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN'
+ 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" style="fill-opacity:1; color-rendering:auto; color-interpolation:auto; text-rendering:auto; stroke:black; stroke-linecap:square; stroke-miterlimit:10; shape-rendering:auto; stroke-opacity:1; fill:black; stroke-dasharray:none; font-weight:normal; stroke-width:1; font-family:'Dialog'; font-style:normal; stroke-linejoin:miter; font-size:12px; stroke-dashoffset:0; image-rendering:auto;" width="544" height="186" xmlns="http://www.w3.org/2000/svg"
+><!--Generated by the Batik Graphics2D SVG Generator--><defs id="genericDefs"
+ /><g
+ ><defs id="defs1"
+ ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath1"
+ ><path d="M0 0 L544 0 L544 186 L0 186 L0 0 Z"
+ /></clipPath
+ ></defs
+ ><g style="fill:white; font-family:sans-serif; stroke:white;"
+ ><rect x="0" y="0" width="544" style="clip-path:url(#clipPath1); stroke:none;" height="186"
+ /></g
+ ><g style="font-family:sans-serif;"
+ ><rect x="16" y="23" width="200" style="fill:none; clip-path:url(#clipPath1);" height="150"
+ /></g
+ ><g style="fill:rgb(201,243,188); fill-opacity:0.7843; font-family:sans-serif; stroke-opacity:0.7843; stroke:rgb(201,243,188);"
+ ><rect x="17" y="24" width="198" style="clip-path:url(#clipPath1); stroke:none;" height="148"
+ /><rect x="16" y="23" width="1" style="clip-path:url(#clipPath1); fill:rgb(255,255,255); stroke:none;" height="150"
+ /><rect x="17" y="23" width="198" style="clip-path:url(#clipPath1); fill:rgb(255,255,255); stroke:none;" height="1"
+ /><rect x="17" y="172" width="199" style="clip-path:url(#clipPath1); fill:rgb(140,170,131); stroke:none;" height="1"
+ /><rect x="215" y="23" width="1" style="clip-path:url(#clipPath1); fill:rgb(140,170,131); stroke:none;" height="149"
+ /></g
+ ><g style="font-family:sans-serif; font-weight:bold;"
+ ><text x="108" xml:space="preserve" y="50" style="clip-path:url(#clipPath1); stroke:none;"
+ >T1</text
+ ><image x="186" y="38" width="15" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA8AAAAQCAYAAADJViUEAAAAYklEQVR4Xs2PWw5A
+EQxEu//F2cLdhx+SS4Xp1ONHTHIiZA4l8krSASYpfHGJ9ppEmGWU4ca2Evp+2SD9
+JWTcQZZFWUPPzctQ1nDZGWtPRrSEMJn+2cPINeYlDyb/E+yC7r1k/CUznLqz88wAAAAASUVORK5CYII=" style="clip-path:url(#clipPath1); font-weight:normal;" height="16" preserveAspectRatio="none"
+ /><rect x="203" y="78" width="26" style="clip-path:url(#clipPath1); fill:rgb(104,229,255); stroke:none;" height="26"
+ /><rect x="203" y="78" width="26" style="fill:none; clip-path:url(#clipPath1);" height="26"
+ /><polygon style="fill:none; clip-path:url(#clipPath1);" points=" 206 81 206 101 226 91"
+ /><polygon style="clip-path:url(#clipPath1); stroke:none;" points=" 206 81 206 101 226 91"
+ /><line x1="226" x2="226" y1="101" style="fill:none; clip-path:url(#clipPath1);" y2="81"
+ /><text x="203" y="77" style="clip-path:url(#clipPath1); font-weight:normal; stroke:none;" xml:space="preserve"
+ >comm</text
+ ><rect x="334" y="26" width="200" style="fill:none; clip-path:url(#clipPath1);" height="150"
+ /></g
+ ><g style="fill:rgb(201,243,188); fill-opacity:0.7843; font-family:sans-serif; stroke-opacity:0.7843; stroke:rgb(201,243,188);"
+ ><rect x="335" y="27" width="198" style="clip-path:url(#clipPath1); stroke:none;" height="148"
+ /><rect x="334" y="26" width="1" style="clip-path:url(#clipPath1); fill:rgb(255,255,255); stroke:none;" height="150"
+ /><rect x="335" y="26" width="198" style="clip-path:url(#clipPath1); fill:rgb(255,255,255); stroke:none;" height="1"
+ /><rect x="335" y="175" width="199" style="clip-path:url(#clipPath1); fill:rgb(140,170,131); stroke:none;" height="1"
+ /><rect x="533" y="26" width="1" style="clip-path:url(#clipPath1); fill:rgb(140,170,131); stroke:none;" height="149"
+ /></g
+ ><g style="font-family:sans-serif; font-weight:bold;"
+ ><text x="426" xml:space="preserve" y="53" style="clip-path:url(#clipPath1); stroke:none;"
+ >T2</text
+ ><image x="504" y="41" width="15" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA8AAAAQCAYAAADJViUEAAAAYklEQVR4Xs2PWw5A
+EQxEu//F2cLdhx+SS4Xp1ONHTHIiZA4l8krSASYpfHGJ9ppEmGWU4ca2Evp+2SD9
+JWTcQZZFWUPPzctQ1nDZGWtPRrSEMJn+2cPINeYlDyb/E+yC7r1k/CUznLqz88wAAAAASUVORK5CYII=" style="clip-path:url(#clipPath1); font-weight:normal;" height="16" preserveAspectRatio="none"
+ /><rect x="321" y="79" width="26" style="clip-path:url(#clipPath1); fill:rgb(104,229,255); stroke:none;" height="26"
+ /><rect x="321" y="79" width="26" style="fill:none; clip-path:url(#clipPath1);" height="26"
+ /><polygon style="fill:none; clip-path:url(#clipPath1);" points=" 324 82 324 102 344 92"
+ /><polygon style="clip-path:url(#clipPath1); stroke:none;" points=" 324 82 324 102 344 92"
+ /><line x1="344" x2="344" y1="102" style="fill:none; clip-path:url(#clipPath1);" y2="82"
+ /><text x="321" y="78" style="clip-path:url(#clipPath1); font-weight:normal; stroke:none;" xml:space="preserve"
+ >comm</text
+ ><text x="309" y="87" style="clip-path:url(#clipPath1); font-weight:normal; stroke:none;" xml:space="preserve"
+ ></text
+ ><ellipse style="fill:none; clip-path:url(#clipPath1);" rx="5" cx="308" ry="7.5" cy="98.5"
+ /><polygon style="fill:gray; clip-path:url(#clipPath1); stroke:none;" points=" 301 97 301 113 317 113"
+ /><polygon style="fill:gray; clip-path:url(#clipPath1); stroke:none;" points=" 317 113 317 97 301 97"
+ /><polygon style="fill:none; clip-path:url(#clipPath1);" points=" 301 97 301 113 317 113"
+ /><polygon style="fill:none; clip-path:url(#clipPath1);" points=" 317 113 317 97 301 97"
+ /><text x="302" y="109" style="clip-path:url(#clipPath1); font-weight:normal; stroke:none;" xml:space="preserve"
+ >S</text
+ ><text x="309" y="106" style="clip-path:url(#clipPath1); font-weight:normal; stroke:none;" xml:space="preserve"
+ >W</text
+ ><text x="256" y="91" style="clip-path:url(#clipPath1); font-style:italic; stroke:none; font-weight:normal;" xml:space="preserve"
+ >comm</text
+ ><line x1="229" x2="321" y1="91" style="fill:none; clip-path:url(#clipPath1);" y2="92"
+ /></g
+ ><g style="font-family:sans-serif;"
+ ><rect x="16" width="200" height="150" y="23" style="fill:none;"
+ /></g
+ ><g style="fill:rgb(201,243,188); fill-opacity:0.7843; font-family:sans-serif; stroke-opacity:0.7843; stroke:rgb(201,243,188);"
+ ><rect x="17" width="198" height="148" y="24" style="stroke:none;"
+ /><rect x="16" y="23" width="1" style="fill:rgb(255,255,255); stroke:none;" height="150"
+ /><rect x="17" y="23" width="198" style="fill:rgb(255,255,255); stroke:none;" height="1"
+ /><rect x="17" y="172" width="199" style="fill:rgb(140,170,131); stroke:none;" height="1"
+ /><rect x="215" y="23" width="1" style="fill:rgb(140,170,131); stroke:none;" height="149"
+ /></g
+ ><g style="font-family:sans-serif; font-weight:bold;"
+ ><text x="108" xml:space="preserve" y="50" style="stroke:none;"
+ >T1</text
+ ><image x="186" y="38" width="15" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA8AAAAQCAYAAADJViUEAAAAYklEQVR4Xs2PWw5A
+EQxEu//F2cLdhx+SS4Xp1ONHTHIiZA4l8krSASYpfHGJ9ppEmGWU4ca2Evp+2SD9
+JWTcQZZFWUPPzctQ1nDZGWtPRrSEMJn+2cPINeYlDyb/E+yC7r1k/CUznLqz88wAAAAASUVORK5CYII=" style="font-weight:normal;" height="16" preserveAspectRatio="none"
+ /><rect x="203" y="78" width="26" style="fill:rgb(104,229,255); stroke:none;" height="26"
+ /><rect x="203" width="26" height="26" y="78" style="fill:none;"
+ /><polygon style="fill:none;" points=" 206 81 206 101 226 91"
+ /><polygon style="stroke:none;" points=" 206 81 206 101 226 91"
+ /><line y2="81" style="fill:none;" x1="226" x2="226" y1="101"
+ /><text x="203" xml:space="preserve" y="77" style="font-weight:normal; stroke:none;"
+ >comm</text
+ ><rect x="334" width="200" height="150" y="26" style="fill:none;"
+ /></g
+ ><g style="fill:rgb(201,243,188); fill-opacity:0.7843; font-family:sans-serif; stroke-opacity:0.7843; stroke:rgb(201,243,188);"
+ ><rect x="335" width="198" height="148" y="27" style="stroke:none;"
+ /><rect x="334" y="26" width="1" style="fill:rgb(255,255,255); stroke:none;" height="150"
+ /><rect x="335" y="26" width="198" style="fill:rgb(255,255,255); stroke:none;" height="1"
+ /><rect x="335" y="175" width="199" style="fill:rgb(140,170,131); stroke:none;" height="1"
+ /><rect x="533" y="26" width="1" style="fill:rgb(140,170,131); stroke:none;" height="149"
+ /></g
+ ><g style="font-family:sans-serif; font-weight:bold;"
+ ><text x="426" xml:space="preserve" y="53" style="stroke:none;"
+ >T2</text
+ ><image x="504" y="41" width="15" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA8AAAAQCAYAAADJViUEAAAAYklEQVR4Xs2PWw5A
+EQxEu//F2cLdhx+SS4Xp1ONHTHIiZA4l8krSASYpfHGJ9ppEmGWU4ca2Evp+2SD9
+JWTcQZZFWUPPzctQ1nDZGWtPRrSEMJn+2cPINeYlDyb/E+yC7r1k/CUznLqz88wAAAAASUVORK5CYII=" style="font-weight:normal;" height="16" preserveAspectRatio="none"
+ /><rect x="321" y="79" width="26" style="fill:rgb(104,229,255); stroke:none;" height="26"
+ /><rect x="321" width="26" height="26" y="79" style="fill:none;"
+ /><polygon style="fill:none;" points=" 324 82 324 102 344 92"
+ /><polygon style="stroke:none;" points=" 324 82 324 102 344 92"
+ /><line y2="82" style="fill:none;" x1="344" x2="344" y1="102"
+ /><text x="321" xml:space="preserve" y="78" style="font-weight:normal; stroke:none;"
+ >comm</text
+ ><text x="309" xml:space="preserve" y="87" style="font-weight:normal; stroke:none;"
+ ></text
+ ><ellipse rx="5" ry="7.5" style="fill:none;" cx="308" cy="98.5"
+ /><polygon style="fill:gray; stroke:none;" points=" 301 97 301 113 317 113"
+ /><polygon style="fill:gray; stroke:none;" points=" 317 113 317 97 301 97"
+ /><polygon style="fill:none;" points=" 301 97 301 113 317 113"
+ /><polygon style="fill:none;" points=" 317 113 317 97 301 97"
+ /><text x="302" xml:space="preserve" y="109" style="font-weight:normal; stroke:none;"
+ >S</text
+ ><text x="309" xml:space="preserve" y="106" style="font-weight:normal; stroke:none;"
+ >W</text
+ ><text x="256" y="91" style="font-style:italic; font-weight:normal; stroke:none;" xml:space="preserve"
+ >comm</text
+ ><line y2="92" style="fill:none;" x1="229" x2="321" y1="91"
+ /></g
+ ></g
+></svg
+>
diff --git a/doc/SysMLSec/fig/hsm_ad_hsm_cpu1.svg b/doc/SysMLSec/fig/hsm_ad_hsm_cpu1.svg
new file mode 100644
index 0000000000000000000000000000000000000000..f2fc7906cc3bb386eddf24caed4a268bac892686
--- /dev/null
+++ b/doc/SysMLSec/fig/hsm_ad_hsm_cpu1.svg
@@ -0,0 +1,205 @@
+<?xml version="1.0"?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN'
+ 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" style="fill-opacity:1; color-rendering:auto; color-interpolation:auto; text-rendering:auto; stroke:black; stroke-linecap:square; stroke-miterlimit:10; shape-rendering:auto; stroke-opacity:1; fill:black; stroke-dasharray:none; font-weight:normal; stroke-width:1; font-family:'Dialog'; font-style:normal; stroke-linejoin:miter; font-size:12px; stroke-dashoffset:0; image-rendering:auto;" width="258" height="343" xmlns="http://www.w3.org/2000/svg"
+><!--Generated by the Batik Graphics2D SVG Generator--><defs id="genericDefs"
+ /><g
+ ><defs id="defs1"
+ ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath1"
+ ><path d="M0 0 L258 0 L258 343 L0 343 L0 0 Z"
+ /></clipPath
+ ></defs
+ ><g style="fill:white; font-family:sans-serif; stroke:white;"
+ ><rect x="0" y="0" width="258" style="clip-path:url(#clipPath1); stroke:none;" height="343"
+ /></g
+ ><g style="font-family:sans-serif;"
+ ><circle r="7" style="clip-path:url(#clipPath1); stroke:none;" cx="153" cy="22"
+ /><line x1="153" x2="153" y1="30" style="fill:none; clip-path:url(#clipPath1);" y2="35"
+ /><rect x="58" y="56" width="189" style="clip-path:url(#clipPath1); fill:none; stroke:rgb(196,166,122);" rx="2.5" ry="2.5" height="20"
+ /><rect x="59" y="57" width="189" style="clip-path:url(#clipPath1); fill:none;" rx="2.5" ry="2.5" height="20"
+ /><line x1="153" x2="153" y1="57" style="fill:none; clip-path:url(#clipPath1);" y2="52"
+ /><line x1="153" x2="153" y1="77" style="fill:none; clip-path:url(#clipPath1);" y2="82"
+ /><text x="74" xml:space="preserve" y="72" style="clip-path:url(#clipPath1); stroke:none;"
+ >getReqArg(channelIndex)</text
+ ><line x1="153" x2="153" y1="35" style="fill:none; clip-path:url(#clipPath1);" y2="52"
+ /><polygon style="clip-path:url(#clipPath1); stroke:none;" points=" 153 52 148 43 157 43"
+ /><polygon style="fill:none; clip-path:url(#clipPath1);" points=" 153 52 148 43 157 43"
+ /><line x1="153" x2="163" y1="108" style="fill:none; clip-path:url(#clipPath1);" y2="118"
+ /><line x1="143" x2="153" y1="118" style="fill:none; clip-path:url(#clipPath1);" y2="128"
+ /><line x1="153" x2="143" y1="108" style="fill:none; clip-path:url(#clipPath1);" y2="118"
+ /><line x1="163" x2="153" y1="118" style="fill:none; clip-path:url(#clipPath1);" y2="128"
+ /><line x1="153" x2="153" y1="108" style="fill:none; clip-path:url(#clipPath1);" y2="103"
+ /><line x1="143" x2="118" y1="118" style="fill:none; clip-path:url(#clipPath1);" y2="118"
+ /><line x1="163" x2="188" y1="118" style="fill:none; clip-path:url(#clipPath1);" y2="118"
+ /><line x1="153" x2="153" y1="128" style="fill:none; clip-path:url(#clipPath1);" y2="153"
+ /><text x="18" xml:space="preserve" y="113" style="clip-path:url(#clipPath1); stroke:none;"
+ >[channelIndex==0]</text
+ ><line x1="153" x2="153" y1="82" style="fill:none; clip-path:url(#clipPath1);" y2="103"
+ /><polygon style="clip-path:url(#clipPath1); stroke:none;" points=" 153 103 148 94 157 94"
+ /><polygon style="fill:none; clip-path:url(#clipPath1);" points=" 153 103 148 94 157 94"
+ /><line x1="91" x2="91" y1="159" style="fill:none; clip-path:url(#clipPath1);" y2="154"
+ /><line x1="91" x2="91" y1="179" style="fill:none; clip-path:url(#clipPath1);" y2="184"
+ /><line x1="20" x2="165" y1="160" style="clip-path:url(#clipPath1); fill:none; stroke:rgb(104,229,255);" y2="160"
+ /><line x1="165" x2="165" y1="160" style="clip-path:url(#clipPath1); fill:none; stroke:rgb(104,229,255);" y2="180"
+ /><line x1="20" x2="165" y1="180" style="clip-path:url(#clipPath1); fill:none; stroke:rgb(104,229,255);" y2="180"
+ /><line x1="20" x2="30" y1="160" style="clip-path:url(#clipPath1); fill:none; stroke:rgb(104,229,255);" y2="170"
+ /><line x1="20" x2="30" y1="180" style="clip-path:url(#clipPath1); fill:none; stroke:rgb(104,229,255);" y2="170"
+ /><line x1="19" x2="164" y1="159" style="fill:none; clip-path:url(#clipPath1);" y2="159"
+ /><line x1="164" x2="164" y1="159" style="fill:none; clip-path:url(#clipPath1);" y2="179"
+ /><line x1="19" x2="164" y1="179" style="fill:none; clip-path:url(#clipPath1);" y2="179"
+ /><line x1="19" x2="29" y1="159" style="fill:none; clip-path:url(#clipPath1);" y2="169"
+ /><line x1="19" x2="29" y1="179" style="fill:none; clip-path:url(#clipPath1);" y2="169"
+ /><text x="34" xml:space="preserve" y="159" style="clip-path:url(#clipPath1); stroke:none;"
+ >chl</text
+ ><text x="31" xml:space="preserve" y="174" style="clip-path:url(#clipPath1); stroke:none;"
+ >data_comm_T1(1) </text
+ ><line x1="118" x2="91" y1="118" style="fill:none; clip-path:url(#clipPath1);" y2="154"
+ /><polygon style="clip-path:url(#clipPath1); stroke:none;" points=" 91 154 92 144 100 150"
+ /><polygon style="fill:none; clip-path:url(#clipPath1);" points=" 91 154 92 144 100 150"
+ /><line x1="91" x2="91" y1="264" style="fill:none; clip-path:url(#clipPath1);" y2="259"
+ /><line x1="91" x2="91" y1="284" style="fill:none; clip-path:url(#clipPath1);" y2="289"
+ /><line x1="12" x2="162" y1="265" style="clip-path:url(#clipPath1); fill:none; stroke:rgb(104,229,255);" y2="265"
+ /><line x1="12" x2="162" y1="285" style="clip-path:url(#clipPath1); fill:none; stroke:rgb(104,229,255);" y2="285"
+ /><line x1="12" x2="12" y1="265" style="clip-path:url(#clipPath1); fill:none; stroke:rgb(104,229,255);" y2="285"
+ /><line x1="162" x2="172" y1="265" style="clip-path:url(#clipPath1); fill:none; stroke:rgb(104,229,255);" y2="275"
+ /><line x1="162" x2="172" y1="285" style="clip-path:url(#clipPath1); fill:none; stroke:rgb(104,229,255);" y2="275"
+ /><line x1="11" x2="161" y1="264" style="fill:none; clip-path:url(#clipPath1);" y2="264"
+ /><line x1="11" x2="161" y1="284" style="fill:none; clip-path:url(#clipPath1);" y2="284"
+ /><line x1="11" x2="11" y1="264" style="fill:none; clip-path:url(#clipPath1);" y2="284"
+ /><line x1="161" x2="171" y1="264" style="fill:none; clip-path:url(#clipPath1);" y2="274"
+ /><line x1="161" x2="171" y1="284" style="fill:none; clip-path:url(#clipPath1);" y2="274"
+ /><text x="26" xml:space="preserve" y="264" style="clip-path:url(#clipPath1); stroke:none;"
+ >chl</text
+ ><text x="26" xml:space="preserve" y="279" style="clip-path:url(#clipPath1); stroke:none;"
+ >retData_comm_T1(1)</text
+ ><text x="131" xml:space="preserve" y="295" style="clip-path:url(#clipPath1); stroke:none;"
+ >sec:hsmSec_comm</text
+ ><line x1="84" x2="99" y1="196" style="fill:none; clip-path:url(#clipPath1);" y2="196"
+ /><line x1="84" x2="84" y1="196" style="fill:none; clip-path:url(#clipPath1);" y2="231"
+ /><line x1="99" x2="99" y1="196" style="fill:none; clip-path:url(#clipPath1);" y2="231"
+ /><line x1="84" x2="91" y1="231" style="fill:none; clip-path:url(#clipPath1);" y2="236"
+ /><line x1="91" x2="99" y1="236" style="fill:none; clip-path:url(#clipPath1);" y2="231"
+ /><line x1="91" x2="91" y1="196" style="fill:none; clip-path:url(#clipPath1);" y2="191"
+ /><line x1="91" x2="91" y1="236" style="fill:none; clip-path:url(#clipPath1);" y2="241"
+ /><line x1="89" x2="94" y1="201" style="fill:none; clip-path:url(#clipPath1);" y2="201"
+ /><line x1="89" x2="94" y1="213" style="fill:none; clip-path:url(#clipPath1);" y2="213"
+ /><line x1="89" x2="94" y1="207" style="fill:none; clip-path:url(#clipPath1);" y2="207"
+ /><line x1="89" x2="89" y1="201" style="fill:none; clip-path:url(#clipPath1);" y2="207"
+ /><line x1="94" x2="94" y1="207" style="fill:none; clip-path:url(#clipPath1);" y2="213"
+ /><line x1="89" x2="94" y1="216" style="fill:none; clip-path:url(#clipPath1);" y2="216"
+ /><line x1="89" x2="94" y1="228" style="fill:none; clip-path:url(#clipPath1);" y2="228"
+ /><line x1="89" x2="94" y1="222" style="fill:none; clip-path:url(#clipPath1);" y2="222"
+ /><line x1="89" x2="89" y1="216" style="fill:none; clip-path:url(#clipPath1);" y2="228"
+ /><text x="106" xml:space="preserve" y="213" style="clip-path:url(#clipPath1); stroke:none;"
+ >sec:hsmSec_comm</text
+ ><image x="62" y="213" width="20" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAQCAYAAAAWGF8bAAAAVklEQVR4XmNgGErg
+PxqmCKAbRpHB6AZQgsEAXZBsfO7+LxCNKUEuJspAkCJkjE2OZANBipAANjl0PqZB
+MAVYDAQBbHLofKINAwNschhiMEMIGTYKaAsAlkPEzZtFB24AAAAASUVORK5CYII=" style="clip-path:url(#clipPath1);" height="16" preserveAspectRatio="none"
+ /><line x1="91" x2="91" y1="184" style="fill:none; clip-path:url(#clipPath1);" y2="191"
+ /><line x1="91" x2="91" y1="241" style="fill:none; clip-path:url(#clipPath1);" y2="259"
+ /><polygon style="clip-path:url(#clipPath1); stroke:none;" points=" 91 259 86 250 95 250"
+ /><polygon style="fill:none; clip-path:url(#clipPath1);" points=" 91 259 86 250 95 250"
+ /><circle r="8" style="clip-path:url(#clipPath1); stroke:none;" cx="92" cy="323"
+ /><circle r="10" style="fill:none; clip-path:url(#clipPath1);" cx="92" cy="323"
+ /><line x1="92" x2="92" y1="313" style="fill:none; clip-path:url(#clipPath1);" y2="308"
+ /><line x1="91" x2="92" y1="289" style="fill:none; clip-path:url(#clipPath1);" y2="308"
+ /><polygon style="clip-path:url(#clipPath1); stroke:none;" points=" 92 308 86 299 96 299"
+ /><polygon style="fill:none; clip-path:url(#clipPath1);" points=" 92 308 86 299 96 299"
+ /></g
+ ><g style="font-family:sans-serif;"
+ ><circle r="7" style="stroke:none;" cx="153" cy="22"
+ /><line y2="35" style="fill:none;" x1="153" x2="153" y1="30"
+ /><rect x="58" y="56" width="189" style="fill:none; stroke:rgb(196,166,122);" rx="2.5" ry="2.5" height="20"
+ /><rect x="59" y="57" width="189" style="fill:none;" rx="2.5" ry="2.5" height="20"
+ /><line y2="52" style="fill:none;" x1="153" x2="153" y1="57"
+ /><line y2="82" style="fill:none;" x1="153" x2="153" y1="77"
+ /><text x="74" xml:space="preserve" y="72" style="stroke:none;"
+ >getReqArg(channelIndex)</text
+ ><line y2="52" style="fill:none;" x1="153" x2="153" y1="35"
+ /><polygon style="stroke:none;" points=" 153 52 148 43 157 43"
+ /><polygon style="fill:none;" points=" 153 52 148 43 157 43"
+ /><line y2="118" style="fill:none;" x1="153" x2="163" y1="108"
+ /><line y2="128" style="fill:none;" x1="143" x2="153" y1="118"
+ /><line y2="118" style="fill:none;" x1="153" x2="143" y1="108"
+ /><line y2="128" style="fill:none;" x1="163" x2="153" y1="118"
+ /><line y2="103" style="fill:none;" x1="153" x2="153" y1="108"
+ /><line y2="118" style="fill:none;" x1="143" x2="118" y1="118"
+ /><line y2="118" style="fill:none;" x1="163" x2="188" y1="118"
+ /><line y2="153" style="fill:none;" x1="153" x2="153" y1="128"
+ /><text x="18" xml:space="preserve" y="113" style="stroke:none;"
+ >[channelIndex==0]</text
+ ><line y2="103" style="fill:none;" x1="153" x2="153" y1="82"
+ /><polygon style="stroke:none;" points=" 153 103 148 94 157 94"
+ /><polygon style="fill:none;" points=" 153 103 148 94 157 94"
+ /><line y2="154" style="fill:none;" x1="91" x2="91" y1="159"
+ /><line y2="184" style="fill:none;" x1="91" x2="91" y1="179"
+ /><line x1="20" x2="165" y1="160" style="fill:none; stroke:rgb(104,229,255);" y2="160"
+ /><line x1="165" x2="165" y1="160" style="fill:none; stroke:rgb(104,229,255);" y2="180"
+ /><line x1="20" x2="165" y1="180" style="fill:none; stroke:rgb(104,229,255);" y2="180"
+ /><line x1="20" x2="30" y1="160" style="fill:none; stroke:rgb(104,229,255);" y2="170"
+ /><line x1="20" x2="30" y1="180" style="fill:none; stroke:rgb(104,229,255);" y2="170"
+ /><line y2="159" style="fill:none;" x1="19" x2="164" y1="159"
+ /><line y2="179" style="fill:none;" x1="164" x2="164" y1="159"
+ /><line y2="179" style="fill:none;" x1="19" x2="164" y1="179"
+ /><line y2="169" style="fill:none;" x1="19" x2="29" y1="159"
+ /><line y2="169" style="fill:none;" x1="19" x2="29" y1="179"
+ /><text x="34" xml:space="preserve" y="159" style="stroke:none;"
+ >chl</text
+ ><text x="31" xml:space="preserve" y="174" style="stroke:none;"
+ >data_comm_T1(1) </text
+ ><line y2="154" style="fill:none;" x1="118" x2="91" y1="118"
+ /><polygon style="stroke:none;" points=" 91 154 92 144 100 150"
+ /><polygon style="fill:none;" points=" 91 154 92 144 100 150"
+ /><line y2="259" style="fill:none;" x1="91" x2="91" y1="264"
+ /><line y2="289" style="fill:none;" x1="91" x2="91" y1="284"
+ /><line x1="12" x2="162" y1="265" style="fill:none; stroke:rgb(104,229,255);" y2="265"
+ /><line x1="12" x2="162" y1="285" style="fill:none; stroke:rgb(104,229,255);" y2="285"
+ /><line x1="12" x2="12" y1="265" style="fill:none; stroke:rgb(104,229,255);" y2="285"
+ /><line x1="162" x2="172" y1="265" style="fill:none; stroke:rgb(104,229,255);" y2="275"
+ /><line x1="162" x2="172" y1="285" style="fill:none; stroke:rgb(104,229,255);" y2="275"
+ /><line y2="264" style="fill:none;" x1="11" x2="161" y1="264"
+ /><line y2="284" style="fill:none;" x1="11" x2="161" y1="284"
+ /><line y2="284" style="fill:none;" x1="11" x2="11" y1="264"
+ /><line y2="274" style="fill:none;" x1="161" x2="171" y1="264"
+ /><line y2="274" style="fill:none;" x1="161" x2="171" y1="284"
+ /><text x="26" xml:space="preserve" y="264" style="stroke:none;"
+ >chl</text
+ ><text x="26" xml:space="preserve" y="279" style="stroke:none;"
+ >retData_comm_T1(1)</text
+ ><text x="131" xml:space="preserve" y="295" style="stroke:none;"
+ >sec:hsmSec_comm</text
+ ><line y2="196" style="fill:none;" x1="84" x2="99" y1="196"
+ /><line y2="231" style="fill:none;" x1="84" x2="84" y1="196"
+ /><line y2="231" style="fill:none;" x1="99" x2="99" y1="196"
+ /><line y2="236" style="fill:none;" x1="84" x2="91" y1="231"
+ /><line y2="231" style="fill:none;" x1="91" x2="99" y1="236"
+ /><line y2="191" style="fill:none;" x1="91" x2="91" y1="196"
+ /><line y2="241" style="fill:none;" x1="91" x2="91" y1="236"
+ /><line y2="201" style="fill:none;" x1="89" x2="94" y1="201"
+ /><line y2="213" style="fill:none;" x1="89" x2="94" y1="213"
+ /><line y2="207" style="fill:none;" x1="89" x2="94" y1="207"
+ /><line y2="207" style="fill:none;" x1="89" x2="89" y1="201"
+ /><line y2="213" style="fill:none;" x1="94" x2="94" y1="207"
+ /><line y2="216" style="fill:none;" x1="89" x2="94" y1="216"
+ /><line y2="228" style="fill:none;" x1="89" x2="94" y1="228"
+ /><line y2="222" style="fill:none;" x1="89" x2="94" y1="222"
+ /><line y2="228" style="fill:none;" x1="89" x2="89" y1="216"
+ /><text x="106" xml:space="preserve" y="213" style="stroke:none;"
+ >sec:hsmSec_comm</text
+ ><image preserveAspectRatio="none" x="62" width="20" y="213" height="16" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAQCAYAAAAWGF8bAAAAVklEQVR4XmNgGErg
+PxqmCKAbRpHB6AZQgsEAXZBsfO7+LxCNKUEuJspAkCJkjE2OZANBipAANjl0PqZB
+MAVYDAQBbHLofKINAwNschhiMEMIGTYKaAsAlkPEzZtFB24AAAAASUVORK5CYII="
+ /><line y2="191" style="fill:none;" x1="91" x2="91" y1="184"
+ /><line y2="259" style="fill:none;" x1="91" x2="91" y1="241"
+ /><polygon style="stroke:none;" points=" 91 259 86 250 95 250"
+ /><polygon style="fill:none;" points=" 91 259 86 250 95 250"
+ /><circle r="8" style="stroke:none;" cx="92" cy="323"
+ /><circle r="10" style="fill:none;" cx="92" cy="323"
+ /><line y2="308" style="fill:none;" x1="92" x2="92" y1="313"
+ /><line y2="308" style="fill:none;" x1="91" x2="92" y1="289"
+ /><polygon style="stroke:none;" points=" 92 308 86 299 96 299"
+ /><polygon style="fill:none;" points=" 92 308 86 299 96 299"
+ /></g
+ ></g
+></svg
+>
diff --git a/doc/SysMLSec/fig/hsm_ad_t1.svg b/doc/SysMLSec/fig/hsm_ad_t1.svg
new file mode 100644
index 0000000000000000000000000000000000000000..bd1c3f6635f1f0683d24f2f82ed676d1281888b0
--- /dev/null
+++ b/doc/SysMLSec/fig/hsm_ad_t1.svg
@@ -0,0 +1,197 @@
+<?xml version="1.0"?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN'
+ 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" style="fill-opacity:1; color-rendering:auto; color-interpolation:auto; text-rendering:auto; stroke:black; stroke-linecap:square; stroke-miterlimit:10; shape-rendering:auto; stroke-opacity:1; fill:black; stroke-dasharray:none; font-weight:normal; stroke-width:1; font-family:'Dialog'; font-style:normal; stroke-linejoin:miter; font-size:12px; stroke-dashoffset:0; image-rendering:auto;" width="185" height="289" xmlns="http://www.w3.org/2000/svg"
+><!--Generated by the Batik Graphics2D SVG Generator--><defs id="genericDefs"
+ /><g
+ ><defs id="defs1"
+ ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath1"
+ ><path d="M0 0 L185 0 L185 289 L0 289 L0 0 Z"
+ /></clipPath
+ ></defs
+ ><g style="fill:white; font-family:sans-serif; stroke:white;"
+ ><rect x="0" y="0" width="185" style="clip-path:url(#clipPath1); stroke:none;" height="289"
+ /></g
+ ><g style="font-family:sans-serif;"
+ ><line x1="94" x2="94" y1="235" style="fill:none; clip-path:url(#clipPath1);" y2="254"
+ /><polygon style="clip-path:url(#clipPath1); stroke:none;" points=" 94 254 89 245 98 245"
+ /><polygon style="fill:none; clip-path:url(#clipPath1);" points=" 94 254 89 245 98 245"
+ /><line x1="94" x2="94" y1="32" style="fill:none; clip-path:url(#clipPath1);" y2="54"
+ /><polygon style="clip-path:url(#clipPath1); stroke:none;" points=" 94 54 89 45 98 45"
+ /><polygon style="fill:none; clip-path:url(#clipPath1);" points=" 94 54 89 45 98 45"
+ /><circle r="7" style="clip-path:url(#clipPath1); stroke:none;" cx="94" cy="19"
+ /><line x1="94" x2="94" y1="27" style="fill:none; clip-path:url(#clipPath1);" y2="32"
+ /><line x1="94" x2="94" y1="210" style="fill:none; clip-path:url(#clipPath1);" y2="205"
+ /><line x1="94" x2="94" y1="230" style="fill:none; clip-path:url(#clipPath1);" y2="235"
+ /><line x1="53" x2="128" y1="211" style="clip-path:url(#clipPath1); fill:none; stroke:rgb(104,229,255);" y2="211"
+ /><line x1="53" x2="128" y1="231" style="clip-path:url(#clipPath1); fill:none; stroke:rgb(104,229,255);" y2="231"
+ /><line x1="53" x2="53" y1="211" style="clip-path:url(#clipPath1); fill:none; stroke:rgb(104,229,255);" y2="231"
+ /><line x1="128" x2="138" y1="211" style="clip-path:url(#clipPath1); fill:none; stroke:rgb(104,229,255);" y2="221"
+ /><line x1="128" x2="138" y1="231" style="clip-path:url(#clipPath1); fill:none; stroke:rgb(104,229,255);" y2="221"
+ /><line x1="52" x2="127" y1="210" style="fill:none; clip-path:url(#clipPath1);" y2="210"
+ /><line x1="52" x2="127" y1="230" style="fill:none; clip-path:url(#clipPath1);" y2="230"
+ /><line x1="52" x2="52" y1="210" style="fill:none; clip-path:url(#clipPath1);" y2="230"
+ /><line x1="127" x2="137" y1="210" style="fill:none; clip-path:url(#clipPath1);" y2="220"
+ /><line x1="127" x2="137" y1="230" style="fill:none; clip-path:url(#clipPath1);" y2="220"
+ /><text x="67" xml:space="preserve" y="210" style="clip-path:url(#clipPath1); stroke:none;"
+ >chl</text
+ ><text x="67" xml:space="preserve" y="225" style="clip-path:url(#clipPath1); stroke:none;"
+ >comm(1)</text
+ ><text x="115" xml:space="preserve" y="241" style="clip-path:url(#clipPath1); stroke:none;"
+ >sec:hsmSec_comm</text
+ ><circle r="8" style="clip-path:url(#clipPath1); stroke:none;" cx="94" cy="269"
+ /><circle r="10" style="fill:none; clip-path:url(#clipPath1);" cx="94" cy="269"
+ /><line x1="94" x2="94" y1="259" style="fill:none; clip-path:url(#clipPath1);" y2="254"
+ /><line x1="23" x2="157" y1="60" style="clip-path:url(#clipPath1); fill:none; stroke:rgb(196,166,122);" y2="60"
+ /><line x1="23" x2="157" y1="80" style="clip-path:url(#clipPath1); fill:none; stroke:rgb(196,166,122);" y2="80"
+ /><line x1="23" x2="23" y1="60" style="clip-path:url(#clipPath1); fill:none; stroke:rgb(196,166,122);" y2="80"
+ /><line x1="157" x2="167" y1="60" style="clip-path:url(#clipPath1); fill:none; stroke:rgb(196,166,122);" y2="70"
+ /><line x1="157" x2="167" y1="80" style="clip-path:url(#clipPath1); fill:none; stroke:rgb(196,166,122);" y2="70"
+ /><line x1="94" x2="94" y1="59" style="fill:none; clip-path:url(#clipPath1);" y2="54"
+ /><line x1="94" x2="94" y1="79" style="fill:none; clip-path:url(#clipPath1);" y2="84"
+ /><line x1="22" x2="156" y1="59" style="fill:none; clip-path:url(#clipPath1);" y2="59"
+ /><line x1="22" x2="156" y1="79" style="fill:none; clip-path:url(#clipPath1);" y2="79"
+ /><line x1="22" x2="22" y1="59" style="fill:none; clip-path:url(#clipPath1);" y2="79"
+ /><line x1="156" x2="166" y1="59" style="fill:none; clip-path:url(#clipPath1);" y2="69"
+ /><line x1="156" x2="166" y1="79" style="fill:none; clip-path:url(#clipPath1);" y2="69"
+ /><text x="37" xml:space="preserve" y="59" style="clip-path:url(#clipPath1); stroke:none;"
+ >req</text
+ ><text x="37" xml:space="preserve" y="74" style="clip-path:url(#clipPath1); stroke:none;"
+ >startHSM_CPU1(0)</text
+ ><line x1="94" x2="94" y1="109" style="fill:none; clip-path:url(#clipPath1);" y2="104"
+ /><line x1="94" x2="94" y1="129" style="fill:none; clip-path:url(#clipPath1);" y2="134"
+ /><line x1="25" x2="156" y1="110" style="clip-path:url(#clipPath1); fill:none; stroke:rgb(104,229,255);" y2="110"
+ /><line x1="25" x2="156" y1="130" style="clip-path:url(#clipPath1); fill:none; stroke:rgb(104,229,255);" y2="130"
+ /><line x1="25" x2="25" y1="110" style="clip-path:url(#clipPath1); fill:none; stroke:rgb(104,229,255);" y2="130"
+ /><line x1="156" x2="166" y1="110" style="clip-path:url(#clipPath1); fill:none; stroke:rgb(104,229,255);" y2="120"
+ /><line x1="156" x2="166" y1="130" style="clip-path:url(#clipPath1); fill:none; stroke:rgb(104,229,255);" y2="120"
+ /><line x1="24" x2="155" y1="109" style="fill:none; clip-path:url(#clipPath1);" y2="109"
+ /><line x1="24" x2="155" y1="129" style="fill:none; clip-path:url(#clipPath1);" y2="129"
+ /><line x1="24" x2="24" y1="109" style="fill:none; clip-path:url(#clipPath1);" y2="129"
+ /><line x1="155" x2="165" y1="109" style="fill:none; clip-path:url(#clipPath1);" y2="119"
+ /><line x1="155" x2="165" y1="129" style="fill:none; clip-path:url(#clipPath1);" y2="119"
+ /><text x="39" xml:space="preserve" y="109" style="clip-path:url(#clipPath1); stroke:none;"
+ >chl</text
+ ><text x="39" xml:space="preserve" y="124" style="clip-path:url(#clipPath1); stroke:none;"
+ >data_comm_T1(1)</text
+ ><line x1="94" x2="94" y1="84" style="fill:none; clip-path:url(#clipPath1);" y2="104"
+ /><polygon style="clip-path:url(#clipPath1); stroke:none;" points=" 94 104 89 95 98 95"
+ /><polygon style="fill:none; clip-path:url(#clipPath1);" points=" 94 104 89 95 98 95"
+ /><line x1="94" x2="93" y1="134" style="fill:none; clip-path:url(#clipPath1);" y2="156"
+ /><polygon style="clip-path:url(#clipPath1); stroke:none;" points=" 93 156 88 147 98 147"
+ /><polygon style="fill:none; clip-path:url(#clipPath1);" points=" 93 156 88 147 98 147"
+ /><line x1="93" x2="93" y1="161" style="fill:none; clip-path:url(#clipPath1);" y2="156"
+ /><line x1="93" x2="93" y1="181" style="fill:none; clip-path:url(#clipPath1);" y2="186"
+ /><line x1="12" x2="176" y1="162" style="clip-path:url(#clipPath1); fill:none; stroke:rgb(104,229,255);" y2="162"
+ /><line x1="176" x2="176" y1="162" style="clip-path:url(#clipPath1); fill:none; stroke:rgb(104,229,255);" y2="182"
+ /><line x1="12" x2="176" y1="182" style="clip-path:url(#clipPath1); fill:none; stroke:rgb(104,229,255);" y2="182"
+ /><line x1="12" x2="22" y1="162" style="clip-path:url(#clipPath1); fill:none; stroke:rgb(104,229,255);" y2="172"
+ /><line x1="12" x2="22" y1="182" style="clip-path:url(#clipPath1); fill:none; stroke:rgb(104,229,255);" y2="172"
+ /><line x1="11" x2="175" y1="161" style="fill:none; clip-path:url(#clipPath1);" y2="161"
+ /><line x1="175" x2="175" y1="161" style="fill:none; clip-path:url(#clipPath1);" y2="181"
+ /><line x1="11" x2="175" y1="181" style="fill:none; clip-path:url(#clipPath1);" y2="181"
+ /><line x1="11" x2="21" y1="161" style="fill:none; clip-path:url(#clipPath1);" y2="171"
+ /><line x1="11" x2="21" y1="181" style="fill:none; clip-path:url(#clipPath1);" y2="171"
+ /><text x="26" xml:space="preserve" y="161" style="clip-path:url(#clipPath1); stroke:none;"
+ >chl</text
+ ><text x="23" xml:space="preserve" y="176" style="clip-path:url(#clipPath1); stroke:none;"
+ >retData_comm_T1(1) </text
+ ><text x="134" xml:space="preserve" y="192" style="clip-path:url(#clipPath1); stroke:none;"
+ >sec:hsmSec_comm</text
+ ><line x1="93" x2="94" y1="186" style="fill:none; clip-path:url(#clipPath1);" y2="205"
+ /><polygon style="clip-path:url(#clipPath1); stroke:none;" points=" 94 205 88 196 98 196"
+ /><polygon style="fill:none; clip-path:url(#clipPath1);" points=" 94 205 88 196 98 196"
+ /></g
+ ><g style="font-family:sans-serif;"
+ ><line y2="254" style="fill:none;" x1="94" x2="94" y1="235"
+ /><polygon style="stroke:none;" points=" 94 254 89 245 98 245"
+ /><polygon style="fill:none;" points=" 94 254 89 245 98 245"
+ /><line y2="54" style="fill:none;" x1="94" x2="94" y1="32"
+ /><polygon style="stroke:none;" points=" 94 54 89 45 98 45"
+ /><polygon style="fill:none;" points=" 94 54 89 45 98 45"
+ /><circle r="7" style="stroke:none;" cx="94" cy="19"
+ /><line y2="32" style="fill:none;" x1="94" x2="94" y1="27"
+ /><line y2="205" style="fill:none;" x1="94" x2="94" y1="210"
+ /><line y2="235" style="fill:none;" x1="94" x2="94" y1="230"
+ /><line x1="53" x2="128" y1="211" style="fill:none; stroke:rgb(104,229,255);" y2="211"
+ /><line x1="53" x2="128" y1="231" style="fill:none; stroke:rgb(104,229,255);" y2="231"
+ /><line x1="53" x2="53" y1="211" style="fill:none; stroke:rgb(104,229,255);" y2="231"
+ /><line x1="128" x2="138" y1="211" style="fill:none; stroke:rgb(104,229,255);" y2="221"
+ /><line x1="128" x2="138" y1="231" style="fill:none; stroke:rgb(104,229,255);" y2="221"
+ /><line y2="210" style="fill:none;" x1="52" x2="127" y1="210"
+ /><line y2="230" style="fill:none;" x1="52" x2="127" y1="230"
+ /><line y2="230" style="fill:none;" x1="52" x2="52" y1="210"
+ /><line y2="220" style="fill:none;" x1="127" x2="137" y1="210"
+ /><line y2="220" style="fill:none;" x1="127" x2="137" y1="230"
+ /><text x="67" xml:space="preserve" y="210" style="stroke:none;"
+ >chl</text
+ ><text x="67" xml:space="preserve" y="225" style="stroke:none;"
+ >comm(1)</text
+ ><text x="115" xml:space="preserve" y="241" style="stroke:none;"
+ >sec:hsmSec_comm</text
+ ><circle r="8" style="stroke:none;" cx="94" cy="269"
+ /><circle r="10" style="fill:none;" cx="94" cy="269"
+ /><line y2="254" style="fill:none;" x1="94" x2="94" y1="259"
+ /><line x1="23" x2="157" y1="60" style="fill:none; stroke:rgb(196,166,122);" y2="60"
+ /><line x1="23" x2="157" y1="80" style="fill:none; stroke:rgb(196,166,122);" y2="80"
+ /><line x1="23" x2="23" y1="60" style="fill:none; stroke:rgb(196,166,122);" y2="80"
+ /><line x1="157" x2="167" y1="60" style="fill:none; stroke:rgb(196,166,122);" y2="70"
+ /><line x1="157" x2="167" y1="80" style="fill:none; stroke:rgb(196,166,122);" y2="70"
+ /><line y2="54" style="fill:none;" x1="94" x2="94" y1="59"
+ /><line y2="84" style="fill:none;" x1="94" x2="94" y1="79"
+ /><line y2="59" style="fill:none;" x1="22" x2="156" y1="59"
+ /><line y2="79" style="fill:none;" x1="22" x2="156" y1="79"
+ /><line y2="79" style="fill:none;" x1="22" x2="22" y1="59"
+ /><line y2="69" style="fill:none;" x1="156" x2="166" y1="59"
+ /><line y2="69" style="fill:none;" x1="156" x2="166" y1="79"
+ /><text x="37" xml:space="preserve" y="59" style="stroke:none;"
+ >req</text
+ ><text x="37" xml:space="preserve" y="74" style="stroke:none;"
+ >startHSM_CPU1(0)</text
+ ><line y2="104" style="fill:none;" x1="94" x2="94" y1="109"
+ /><line y2="134" style="fill:none;" x1="94" x2="94" y1="129"
+ /><line x1="25" x2="156" y1="110" style="fill:none; stroke:rgb(104,229,255);" y2="110"
+ /><line x1="25" x2="156" y1="130" style="fill:none; stroke:rgb(104,229,255);" y2="130"
+ /><line x1="25" x2="25" y1="110" style="fill:none; stroke:rgb(104,229,255);" y2="130"
+ /><line x1="156" x2="166" y1="110" style="fill:none; stroke:rgb(104,229,255);" y2="120"
+ /><line x1="156" x2="166" y1="130" style="fill:none; stroke:rgb(104,229,255);" y2="120"
+ /><line y2="109" style="fill:none;" x1="24" x2="155" y1="109"
+ /><line y2="129" style="fill:none;" x1="24" x2="155" y1="129"
+ /><line y2="129" style="fill:none;" x1="24" x2="24" y1="109"
+ /><line y2="119" style="fill:none;" x1="155" x2="165" y1="109"
+ /><line y2="119" style="fill:none;" x1="155" x2="165" y1="129"
+ /><text x="39" xml:space="preserve" y="109" style="stroke:none;"
+ >chl</text
+ ><text x="39" xml:space="preserve" y="124" style="stroke:none;"
+ >data_comm_T1(1)</text
+ ><line y2="104" style="fill:none;" x1="94" x2="94" y1="84"
+ /><polygon style="stroke:none;" points=" 94 104 89 95 98 95"
+ /><polygon style="fill:none;" points=" 94 104 89 95 98 95"
+ /><line y2="156" style="fill:none;" x1="94" x2="93" y1="134"
+ /><polygon style="stroke:none;" points=" 93 156 88 147 98 147"
+ /><polygon style="fill:none;" points=" 93 156 88 147 98 147"
+ /><line y2="156" style="fill:none;" x1="93" x2="93" y1="161"
+ /><line y2="186" style="fill:none;" x1="93" x2="93" y1="181"
+ /><line x1="12" x2="176" y1="162" style="fill:none; stroke:rgb(104,229,255);" y2="162"
+ /><line x1="176" x2="176" y1="162" style="fill:none; stroke:rgb(104,229,255);" y2="182"
+ /><line x1="12" x2="176" y1="182" style="fill:none; stroke:rgb(104,229,255);" y2="182"
+ /><line x1="12" x2="22" y1="162" style="fill:none; stroke:rgb(104,229,255);" y2="172"
+ /><line x1="12" x2="22" y1="182" style="fill:none; stroke:rgb(104,229,255);" y2="172"
+ /><line y2="161" style="fill:none;" x1="11" x2="175" y1="161"
+ /><line y2="181" style="fill:none;" x1="175" x2="175" y1="161"
+ /><line y2="181" style="fill:none;" x1="11" x2="175" y1="181"
+ /><line y2="171" style="fill:none;" x1="11" x2="21" y1="161"
+ /><line y2="171" style="fill:none;" x1="11" x2="21" y1="181"
+ /><text x="26" xml:space="preserve" y="161" style="stroke:none;"
+ >chl</text
+ ><text x="23" xml:space="preserve" y="176" style="stroke:none;"
+ >retData_comm_T1(1) </text
+ ><text x="134" xml:space="preserve" y="192" style="stroke:none;"
+ >sec:hsmSec_comm</text
+ ><line y2="205" style="fill:none;" x1="93" x2="94" y1="186"
+ /><polygon style="stroke:none;" points=" 94 205 88 196 98 196"
+ /><polygon style="fill:none;" points=" 94 205 88 196 98 196"
+ /></g
+ ></g
+></svg
+>
diff --git a/doc/SysMLSec/fig/hsm_fv.svg b/doc/SysMLSec/fig/hsm_fv.svg
new file mode 100644
index 0000000000000000000000000000000000000000..e14e45b566ac8c43e588cfaac2515dd00f9ff7d5
--- /dev/null
+++ b/doc/SysMLSec/fig/hsm_fv.svg
@@ -0,0 +1,397 @@
+<?xml version="1.0"?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN'
+ 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" style="fill-opacity:1; color-rendering:auto; color-interpolation:auto; text-rendering:auto; stroke:black; stroke-linecap:square; stroke-miterlimit:10; shape-rendering:auto; stroke-opacity:1; fill:black; stroke-dasharray:none; font-weight:normal; stroke-width:1; font-family:'Dialog'; font-style:normal; stroke-linejoin:miter; font-size:12px; stroke-dashoffset:0; image-rendering:auto;" width="1278" height="196" xmlns="http://www.w3.org/2000/svg"
+><!--Generated by the Batik Graphics2D SVG Generator--><defs id="genericDefs"
+ /><g
+ ><defs id="defs1"
+ ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath1"
+ ><path d="M0 0 L1278 0 L1278 196 L0 196 L0 0 Z"
+ /></clipPath
+ ></defs
+ ><g style="fill:white; font-family:sans-serif; stroke:white;"
+ ><rect x="0" y="0" width="1278" style="clip-path:url(#clipPath1); stroke:none;" height="196"
+ /></g
+ ><g style="font-family:sans-serif;"
+ ><rect x="403" y="29" width="200" style="fill:none; clip-path:url(#clipPath1);" height="150"
+ /></g
+ ><g style="fill:rgb(201,243,188); fill-opacity:0.7843; font-family:sans-serif; stroke-opacity:0.7843; stroke:rgb(201,243,188);"
+ ><rect x="404" y="30" width="198" style="clip-path:url(#clipPath1); stroke:none;" height="148"
+ /><rect x="403" y="29" width="1" style="clip-path:url(#clipPath1); fill:rgb(255,255,255); stroke:none;" height="150"
+ /><rect x="404" y="29" width="198" style="clip-path:url(#clipPath1); fill:rgb(255,255,255); stroke:none;" height="1"
+ /><rect x="404" y="178" width="199" style="clip-path:url(#clipPath1); fill:rgb(140,170,131); stroke:none;" height="1"
+ /><rect x="602" y="29" width="1" style="clip-path:url(#clipPath1); fill:rgb(140,170,131); stroke:none;" height="149"
+ /></g
+ ><g style="font-family:sans-serif; font-weight:bold;"
+ ><text x="495" xml:space="preserve" y="56" style="clip-path:url(#clipPath1); stroke:none;"
+ >T1</text
+ ><image x="573" y="44" width="15" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA8AAAAQCAYAAADJViUEAAAAYklEQVR4Xs2PWw5A
+EQxEu//F2cLdhx+SS4Xp1ONHTHIiZA4l8krSASYpfHGJ9ppEmGWU4ca2Evp+2SD9
+JWTcQZZFWUPPzctQ1nDZGWtPRrSEMJn+2cPINeYlDyb/E+yC7r1k/CUznLqz88wAAAAASUVORK5CYII=" style="clip-path:url(#clipPath1); font-weight:normal;" height="16" preserveAspectRatio="none"
+ /><rect x="390" y="120" width="26" style="clip-path:url(#clipPath1); fill:rgb(104,229,255); stroke:none;" height="26"
+ /><rect x="390" y="120" width="26" style="fill:none; clip-path:url(#clipPath1);" height="26"
+ /><polygon style="fill:none; clip-path:url(#clipPath1);" points=" 393 123 393 143 413 133"
+ /><polygon style="clip-path:url(#clipPath1); stroke:none;" points=" 393 123 393 143 413 133"
+ /><line x1="413" x2="413" y1="143" style="fill:none; clip-path:url(#clipPath1);" y2="123"
+ /><text x="390" y="119" style="clip-path:url(#clipPath1); font-weight:normal; stroke:none;" xml:space="preserve"
+ >retData_comm_T1</text
+ ><rect x="390" y="69" width="26" style="clip-path:url(#clipPath1); fill:rgb(104,229,255); stroke:none;" height="26"
+ /><rect x="390" y="69" width="26" style="fill:none; clip-path:url(#clipPath1);" height="26"
+ /><polygon style="fill:none; clip-path:url(#clipPath1);" points=" 413 72 413 92 393 82"
+ /><polygon style="clip-path:url(#clipPath1); stroke:none;" points=" 413 72 413 92 393 82"
+ /><line x1="393" x2="393" y1="92" style="fill:none; clip-path:url(#clipPath1);" y2="72"
+ /><text x="390" y="68" style="clip-path:url(#clipPath1); font-weight:normal; stroke:none;" xml:space="preserve"
+ >data_comm_T1</text
+ ><rect x="505" y="16" width="26" style="clip-path:url(#clipPath1); fill:rgb(196,166,122); stroke:none;" height="26"
+ /><rect x="505" y="16" width="26" style="fill:none; clip-path:url(#clipPath1);" height="26"
+ /><polygon style="fill:none; clip-path:url(#clipPath1);" points=" 508 39 528 39 518 19"
+ /><polygon style="clip-path:url(#clipPath1); stroke:none;" points=" 508 39 528 39 518 19"
+ /><line x1="528" x2="508" y1="19" style="fill:none; clip-path:url(#clipPath1);" y2="19"
+ /><text x="505" y="15" style="clip-path:url(#clipPath1); font-weight:normal; stroke:none;" xml:space="preserve"
+ >startHSM_CPU1</text
+ ><rect x="590" y="84" width="26" style="clip-path:url(#clipPath1); fill:rgb(104,229,255); stroke:none;" height="26"
+ /><rect x="590" y="84" width="26" style="fill:none; clip-path:url(#clipPath1);" height="26"
+ /><polygon style="fill:none; clip-path:url(#clipPath1);" points=" 593 87 593 107 613 97"
+ /><polygon style="clip-path:url(#clipPath1); stroke:none;" points=" 593 87 593 107 613 97"
+ /><line x1="613" x2="613" y1="107" style="fill:none; clip-path:url(#clipPath1);" y2="87"
+ /><text x="590" y="83" style="clip-path:url(#clipPath1); font-weight:normal; stroke:none;" xml:space="preserve"
+ >comm</text
+ ><text x="572" y="77" style="clip-path:url(#clipPath1); font-weight:normal; stroke:none;" xml:space="preserve"
+ >???</text
+ ><ellipse style="fill:none; clip-path:url(#clipPath1);" rx="3" cx="581" ry="4.5" cy="88.5"
+ /><rect x="577" y="87" width="9" style="clip-path:url(#clipPath1); fill:gray; stroke:none;" height="7"
+ /><rect x="577" y="87" width="9" style="fill:none; clip-path:url(#clipPath1);" height="7"
+ /><rect x="674" y="31" width="200" style="fill:none; clip-path:url(#clipPath1);" height="150"
+ /></g
+ ><g style="fill:rgb(201,243,188); fill-opacity:0.7843; font-family:sans-serif; stroke-opacity:0.7843; stroke:rgb(201,243,188);"
+ ><rect x="675" y="32" width="198" style="clip-path:url(#clipPath1); stroke:none;" height="148"
+ /><rect x="674" y="31" width="1" style="clip-path:url(#clipPath1); fill:rgb(255,255,255); stroke:none;" height="150"
+ /><rect x="675" y="31" width="198" style="clip-path:url(#clipPath1); fill:rgb(255,255,255); stroke:none;" height="1"
+ /><rect x="675" y="180" width="199" style="clip-path:url(#clipPath1); fill:rgb(140,170,131); stroke:none;" height="1"
+ /><rect x="873" y="31" width="1" style="clip-path:url(#clipPath1); fill:rgb(140,170,131); stroke:none;" height="149"
+ /></g
+ ><g style="font-family:sans-serif; font-weight:bold;"
+ ><text x="766" xml:space="preserve" y="58" style="clip-path:url(#clipPath1); stroke:none;"
+ >T2</text
+ ><image x="844" y="46" width="15" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA8AAAAQCAYAAADJViUEAAAAYklEQVR4Xs2PWw5A
+EQxEu//F2cLdhx+SS4Xp1ONHTHIiZA4l8krSASYpfHGJ9ppEmGWU4ca2Evp+2SD9
+JWTcQZZFWUPPzctQ1nDZGWtPRrSEMJn+2cPINeYlDyb/E+yC7r1k/CUznLqz88wAAAAASUVORK5CYII=" style="clip-path:url(#clipPath1); font-weight:normal;" height="16" preserveAspectRatio="none"
+ /><rect x="861" y="135" width="26" style="clip-path:url(#clipPath1); fill:rgb(104,229,255); stroke:none;" height="26"
+ /><rect x="861" y="135" width="26" style="fill:none; clip-path:url(#clipPath1);" height="26"
+ /><polygon style="fill:none; clip-path:url(#clipPath1);" points=" 884 138 884 158 864 148"
+ /><polygon style="clip-path:url(#clipPath1); stroke:none;" points=" 884 138 884 158 864 148"
+ /><line x1="864" x2="864" y1="158" style="fill:none; clip-path:url(#clipPath1);" y2="138"
+ /><text x="861" y="134" style="clip-path:url(#clipPath1); font-weight:normal; stroke:none;" xml:space="preserve"
+ >retData_comm_T2</text
+ ><rect x="861" y="79" width="26" style="clip-path:url(#clipPath1); fill:rgb(104,229,255); stroke:none;" height="26"
+ /><rect x="861" y="79" width="26" style="fill:none; clip-path:url(#clipPath1);" height="26"
+ /><polygon style="fill:none; clip-path:url(#clipPath1);" points=" 864 82 864 102 884 92"
+ /><polygon style="clip-path:url(#clipPath1); stroke:none;" points=" 864 82 864 102 884 92"
+ /><line x1="884" x2="884" y1="102" style="fill:none; clip-path:url(#clipPath1);" y2="82"
+ /><text x="861" y="78" style="clip-path:url(#clipPath1); font-weight:normal; stroke:none;" xml:space="preserve"
+ >data_comm_T2</text
+ ><rect x="798" y="18" width="26" style="clip-path:url(#clipPath1); fill:rgb(196,166,122); stroke:none;" height="26"
+ /><rect x="798" y="18" width="26" style="fill:none; clip-path:url(#clipPath1);" height="26"
+ /><polygon style="fill:none; clip-path:url(#clipPath1);" points=" 801 41 821 41 811 21"
+ /><polygon style="clip-path:url(#clipPath1); stroke:none;" points=" 801 41 821 41 811 21"
+ /><line x1="821" x2="801" y1="21" style="fill:none; clip-path:url(#clipPath1);" y2="21"
+ /><text x="798" y="17" style="clip-path:url(#clipPath1); font-weight:normal; stroke:none;" xml:space="preserve"
+ >startHSM_CPU2</text
+ ><rect x="661" y="84" width="26" style="clip-path:url(#clipPath1); fill:rgb(104,229,255); stroke:none;" height="26"
+ /><rect x="661" y="84" width="26" style="fill:none; clip-path:url(#clipPath1);" height="26"
+ /><polygon style="fill:none; clip-path:url(#clipPath1);" points=" 664 87 664 107 684 97"
+ /><polygon style="clip-path:url(#clipPath1); stroke:none;" points=" 664 87 664 107 684 97"
+ /><line x1="684" x2="684" y1="107" style="fill:none; clip-path:url(#clipPath1);" y2="87"
+ /><text x="661" y="83" style="clip-path:url(#clipPath1); font-weight:normal; stroke:none;" xml:space="preserve"
+ >comm</text
+ ><text x="620" y="97" style="clip-path:url(#clipPath1); font-style:italic; stroke:none; font-weight:normal;" xml:space="preserve"
+ >comm</text
+ ><line x1="616" x2="661" y1="97" style="fill:none; clip-path:url(#clipPath1);" y2="97"
+ /><rect x="1022" y="31" width="246" style="fill:none; clip-path:url(#clipPath1);" height="155"
+ /></g
+ ><g style="fill:rgb(201,243,188); fill-opacity:0.7843; font-family:sans-serif; stroke-opacity:0.7843; stroke:rgb(201,243,188);"
+ ><rect x="1023" y="32" width="244" style="clip-path:url(#clipPath1); stroke:none;" height="153"
+ /><rect x="1022" y="31" width="1" style="clip-path:url(#clipPath1); fill:rgb(255,255,255); stroke:none;" height="155"
+ /><rect x="1023" y="31" width="244" style="clip-path:url(#clipPath1); fill:rgb(255,255,255); stroke:none;" height="1"
+ /><rect x="1023" y="185" width="245" style="clip-path:url(#clipPath1); fill:rgb(140,170,131); stroke:none;" height="1"
+ /><rect x="1267" y="31" width="1" style="clip-path:url(#clipPath1); fill:rgb(140,170,131); stroke:none;" height="154"
+ /></g
+ ><g style="font-family:sans-serif; font-weight:bold;"
+ ><text x="1112" xml:space="preserve" y="58" style="clip-path:url(#clipPath1); stroke:none;"
+ >HSM_CPU2</text
+ ><image x="1238" y="46" width="15" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA8AAAAQCAYAAADJViUEAAAAYklEQVR4Xs2PWw5A
+EQxEu//F2cLdhx+SS4Xp1ONHTHIiZA4l8krSASYpfHGJ9ppEmGWU4ca2Evp+2SD9
+JWTcQZZFWUPPzctQ1nDZGWtPRrSEMJn+2cPINeYlDyb/E+yC7r1k/CUznLqz88wAAAAASUVORK5CYII=" style="clip-path:url(#clipPath1); font-weight:normal;" height="16" preserveAspectRatio="none"
+ /><text x="1037" y="85" style="clip-path:url(#clipPath1); font-weight:normal; stroke:none;" xml:space="preserve"
+ >+ channelIndex = 0 : Natural;</text
+ ><rect x="1009" y="135" width="26" style="clip-path:url(#clipPath1); fill:rgb(104,229,255); stroke:none;" height="26"
+ /><rect x="1009" y="135" width="26" style="fill:none; clip-path:url(#clipPath1);" height="26"
+ /><polygon style="fill:none; clip-path:url(#clipPath1);" points=" 1032 138 1032 158 1012 148"
+ /><polygon style="clip-path:url(#clipPath1); stroke:none;" points=" 1032 138 1032 158 1012 148"
+ /><line x1="1012" x2="1012" y1="158" style="fill:none; clip-path:url(#clipPath1);" y2="138"
+ /><text x="1009" y="134" style="clip-path:url(#clipPath1); font-weight:normal; stroke:none;" xml:space="preserve"
+ >retData_comm_T2</text
+ ><rect x="1009" y="77" width="26" style="clip-path:url(#clipPath1); fill:rgb(104,229,255); stroke:none;" height="26"
+ /><rect x="1009" y="77" width="26" style="fill:none; clip-path:url(#clipPath1);" height="26"
+ /><polygon style="fill:none; clip-path:url(#clipPath1);" points=" 1012 80 1012 100 1032 90"
+ /><polygon style="clip-path:url(#clipPath1); stroke:none;" points=" 1012 80 1012 100 1032 90"
+ /><line x1="1032" x2="1032" y1="100" style="fill:none; clip-path:url(#clipPath1);" y2="80"
+ /><text x="1009" y="76" style="clip-path:url(#clipPath1); font-weight:normal; stroke:none;" xml:space="preserve"
+ >data_comm_T2</text
+ ><rect x="1090" y="18" width="26" style="clip-path:url(#clipPath1); fill:rgb(196,166,122); stroke:none;" height="26"
+ /><rect x="1090" y="18" width="26" style="fill:none; clip-path:url(#clipPath1);" height="26"
+ /><polygon style="fill:none; clip-path:url(#clipPath1);" points=" 1093 21 1113 21 1103 41"
+ /><polygon style="clip-path:url(#clipPath1); stroke:none;" points=" 1093 21 1113 21 1103 41"
+ /><line x1="1113" x2="1093" y1="41" style="fill:none; clip-path:url(#clipPath1);" y2="41"
+ /><text x="1090" y="17" style="clip-path:url(#clipPath1); font-weight:normal; stroke:none;" xml:space="preserve"
+ >startHSM_CPU2</text
+ ><text x="909" y="18" style="clip-path:url(#clipPath1); font-style:italic; stroke:none; font-weight:normal;" xml:space="preserve"
+ >startHSM_CPU2</text
+ ><line x1="1103" x2="811" y1="18" style="fill:none; clip-path:url(#clipPath1);" y2="18"
+ /><text x="901" y="91" style="clip-path:url(#clipPath1); font-style:italic; stroke:none; font-weight:normal;" xml:space="preserve"
+ >data_comm_T2</text
+ ><line x1="1009" x2="887" y1="90" style="fill:none; clip-path:url(#clipPath1);" y2="92"
+ /><text x="892" y="148" style="clip-path:url(#clipPath1); font-style:italic; stroke:none; font-weight:normal;" xml:space="preserve"
+ >retData_comm_T2</text
+ ><line x1="1009" x2="887" y1="148" style="fill:none; clip-path:url(#clipPath1);" y2="148"
+ /><rect x="11" y="29" width="248" style="fill:none; clip-path:url(#clipPath1);" height="148"
+ /></g
+ ><g style="fill:rgb(201,243,188); fill-opacity:0.7843; font-family:sans-serif; stroke-opacity:0.7843; stroke:rgb(201,243,188);"
+ ><rect x="12" y="30" width="246" style="clip-path:url(#clipPath1); stroke:none;" height="146"
+ /><rect x="11" y="29" width="1" style="clip-path:url(#clipPath1); fill:rgb(255,255,255); stroke:none;" height="148"
+ /><rect x="12" y="29" width="246" style="clip-path:url(#clipPath1); fill:rgb(255,255,255); stroke:none;" height="1"
+ /><rect x="12" y="176" width="247" style="clip-path:url(#clipPath1); fill:rgb(140,170,131); stroke:none;" height="1"
+ /><rect x="258" y="29" width="1" style="clip-path:url(#clipPath1); fill:rgb(140,170,131); stroke:none;" height="147"
+ /></g
+ ><g style="font-family:sans-serif; font-weight:bold;"
+ ><text x="102" xml:space="preserve" y="56" style="clip-path:url(#clipPath1); stroke:none;"
+ >HSM_CPU1</text
+ ><image x="229" y="44" width="15" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA8AAAAQCAYAAADJViUEAAAAYklEQVR4Xs2PWw5A
+EQxEu//F2cLdhx+SS4Xp1ONHTHIiZA4l8krSASYpfHGJ9ppEmGWU4ca2Evp+2SD9
+JWTcQZZFWUPPzctQ1nDZGWtPRrSEMJn+2cPINeYlDyb/E+yC7r1k/CUznLqz88wAAAAASUVORK5CYII=" style="clip-path:url(#clipPath1); font-weight:normal;" height="16" preserveAspectRatio="none"
+ /><text x="26" y="83" style="clip-path:url(#clipPath1); font-weight:normal; stroke:none;" xml:space="preserve"
+ >+ channelIndex = 0 : Natural;</text
+ ><rect x="246" y="121" width="26" style="clip-path:url(#clipPath1); fill:rgb(104,229,255); stroke:none;" height="26"
+ /><rect x="246" y="121" width="26" style="fill:none; clip-path:url(#clipPath1);" height="26"
+ /><polygon style="fill:none; clip-path:url(#clipPath1);" points=" 249 124 249 144 269 134"
+ /><polygon style="clip-path:url(#clipPath1); stroke:none;" points=" 249 124 249 144 269 134"
+ /><line x1="269" x2="269" y1="144" style="fill:none; clip-path:url(#clipPath1);" y2="124"
+ /><text x="246" y="120" style="clip-path:url(#clipPath1); font-weight:normal; stroke:none;" xml:space="preserve"
+ >retData_comm_T1</text
+ ><rect x="246" y="69" width="26" style="clip-path:url(#clipPath1); fill:rgb(104,229,255); stroke:none;" height="26"
+ /><rect x="246" y="69" width="26" style="fill:none; clip-path:url(#clipPath1);" height="26"
+ /><polygon style="fill:none; clip-path:url(#clipPath1);" points=" 269 72 269 92 249 82"
+ /><polygon style="clip-path:url(#clipPath1); stroke:none;" points=" 269 72 269 92 249 82"
+ /><line x1="249" x2="249" y1="92" style="fill:none; clip-path:url(#clipPath1);" y2="72"
+ /><text x="246" y="68" style="clip-path:url(#clipPath1); font-weight:normal; stroke:none;" xml:space="preserve"
+ >data_comm_T1</text
+ ><rect x="73" y="16" width="26" style="clip-path:url(#clipPath1); fill:rgb(196,166,122); stroke:none;" height="26"
+ /><rect x="73" y="16" width="26" style="fill:none; clip-path:url(#clipPath1);" height="26"
+ /><polygon style="fill:none; clip-path:url(#clipPath1);" points=" 76 19 96 19 86 39"
+ /><polygon style="clip-path:url(#clipPath1); stroke:none;" points=" 76 19 96 19 86 39"
+ /><line x1="96" x2="76" y1="39" style="fill:none; clip-path:url(#clipPath1);" y2="39"
+ /><text x="73" y="15" style="clip-path:url(#clipPath1); font-weight:normal; stroke:none;" xml:space="preserve"
+ >startHSM_CPU1</text
+ ><text x="254" y="16" style="clip-path:url(#clipPath1); font-style:italic; stroke:none; font-weight:normal;" xml:space="preserve"
+ >startHSM_CPU1</text
+ ><line x1="86" x2="518" y1="16" style="fill:none; clip-path:url(#clipPath1);" y2="16"
+ /><text x="284" y="82" style="clip-path:url(#clipPath1); font-style:italic; stroke:none; font-weight:normal;" xml:space="preserve"
+ >data_comm_T1</text
+ ><line x1="272" x2="390" y1="82" style="fill:none; clip-path:url(#clipPath1);" y2="82"
+ /><text x="275" y="133" style="clip-path:url(#clipPath1); font-style:italic; stroke:none; font-weight:normal;" xml:space="preserve"
+ >retData_comm_T1</text
+ ><line x1="272" x2="390" y1="134" style="fill:none; clip-path:url(#clipPath1);" y2="133"
+ /></g
+ ><g style="font-family:sans-serif;"
+ ><rect x="403" width="200" height="150" y="29" style="fill:none;"
+ /></g
+ ><g style="fill:rgb(201,243,188); fill-opacity:0.7843; font-family:sans-serif; stroke-opacity:0.7843; stroke:rgb(201,243,188);"
+ ><rect x="404" width="198" height="148" y="30" style="stroke:none;"
+ /><rect x="403" y="29" width="1" style="fill:rgb(255,255,255); stroke:none;" height="150"
+ /><rect x="404" y="29" width="198" style="fill:rgb(255,255,255); stroke:none;" height="1"
+ /><rect x="404" y="178" width="199" style="fill:rgb(140,170,131); stroke:none;" height="1"
+ /><rect x="602" y="29" width="1" style="fill:rgb(140,170,131); stroke:none;" height="149"
+ /></g
+ ><g style="font-family:sans-serif; font-weight:bold;"
+ ><text x="495" xml:space="preserve" y="56" style="stroke:none;"
+ >T1</text
+ ><image x="573" y="44" width="15" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA8AAAAQCAYAAADJViUEAAAAYklEQVR4Xs2PWw5A
+EQxEu//F2cLdhx+SS4Xp1ONHTHIiZA4l8krSASYpfHGJ9ppEmGWU4ca2Evp+2SD9
+JWTcQZZFWUPPzctQ1nDZGWtPRrSEMJn+2cPINeYlDyb/E+yC7r1k/CUznLqz88wAAAAASUVORK5CYII=" style="font-weight:normal;" height="16" preserveAspectRatio="none"
+ /><rect x="390" y="120" width="26" style="fill:rgb(104,229,255); stroke:none;" height="26"
+ /><rect x="390" width="26" height="26" y="120" style="fill:none;"
+ /><polygon style="fill:none;" points=" 393 123 393 143 413 133"
+ /><polygon style="stroke:none;" points=" 393 123 393 143 413 133"
+ /><line y2="123" style="fill:none;" x1="413" x2="413" y1="143"
+ /><text x="390" xml:space="preserve" y="119" style="font-weight:normal; stroke:none;"
+ >retData_comm_T1</text
+ ><rect x="390" y="69" width="26" style="fill:rgb(104,229,255); stroke:none;" height="26"
+ /><rect x="390" width="26" height="26" y="69" style="fill:none;"
+ /><polygon style="fill:none;" points=" 413 72 413 92 393 82"
+ /><polygon style="stroke:none;" points=" 413 72 413 92 393 82"
+ /><line y2="72" style="fill:none;" x1="393" x2="393" y1="92"
+ /><text x="390" xml:space="preserve" y="68" style="font-weight:normal; stroke:none;"
+ >data_comm_T1</text
+ ><rect x="505" y="16" width="26" style="fill:rgb(196,166,122); stroke:none;" height="26"
+ /><rect x="505" width="26" height="26" y="16" style="fill:none;"
+ /><polygon style="fill:none;" points=" 508 39 528 39 518 19"
+ /><polygon style="stroke:none;" points=" 508 39 528 39 518 19"
+ /><line y2="19" style="fill:none;" x1="528" x2="508" y1="19"
+ /><text x="505" xml:space="preserve" y="15" style="font-weight:normal; stroke:none;"
+ >startHSM_CPU1</text
+ ><rect x="590" y="84" width="26" style="fill:rgb(104,229,255); stroke:none;" height="26"
+ /><rect x="590" width="26" height="26" y="84" style="fill:none;"
+ /><polygon style="fill:none;" points=" 593 87 593 107 613 97"
+ /><polygon style="stroke:none;" points=" 593 87 593 107 613 97"
+ /><line y2="87" style="fill:none;" x1="613" x2="613" y1="107"
+ /><text x="590" xml:space="preserve" y="83" style="font-weight:normal; stroke:none;"
+ >comm</text
+ ><text x="572" xml:space="preserve" y="77" style="font-weight:normal; stroke:none;"
+ >???</text
+ ><ellipse rx="3" ry="4.5" style="fill:none;" cx="581" cy="88.5"
+ /><rect x="577" y="87" width="9" style="fill:gray; stroke:none;" height="7"
+ /><rect x="577" width="9" height="7" y="87" style="fill:none;"
+ /><rect x="674" width="200" height="150" y="31" style="fill:none;"
+ /></g
+ ><g style="fill:rgb(201,243,188); fill-opacity:0.7843; font-family:sans-serif; stroke-opacity:0.7843; stroke:rgb(201,243,188);"
+ ><rect x="675" width="198" height="148" y="32" style="stroke:none;"
+ /><rect x="674" y="31" width="1" style="fill:rgb(255,255,255); stroke:none;" height="150"
+ /><rect x="675" y="31" width="198" style="fill:rgb(255,255,255); stroke:none;" height="1"
+ /><rect x="675" y="180" width="199" style="fill:rgb(140,170,131); stroke:none;" height="1"
+ /><rect x="873" y="31" width="1" style="fill:rgb(140,170,131); stroke:none;" height="149"
+ /></g
+ ><g style="font-family:sans-serif; font-weight:bold;"
+ ><text x="766" xml:space="preserve" y="58" style="stroke:none;"
+ >T2</text
+ ><image x="844" y="46" width="15" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA8AAAAQCAYAAADJViUEAAAAYklEQVR4Xs2PWw5A
+EQxEu//F2cLdhx+SS4Xp1ONHTHIiZA4l8krSASYpfHGJ9ppEmGWU4ca2Evp+2SD9
+JWTcQZZFWUPPzctQ1nDZGWtPRrSEMJn+2cPINeYlDyb/E+yC7r1k/CUznLqz88wAAAAASUVORK5CYII=" style="font-weight:normal;" height="16" preserveAspectRatio="none"
+ /><rect x="861" y="135" width="26" style="fill:rgb(104,229,255); stroke:none;" height="26"
+ /><rect x="861" width="26" height="26" y="135" style="fill:none;"
+ /><polygon style="fill:none;" points=" 884 138 884 158 864 148"
+ /><polygon style="stroke:none;" points=" 884 138 884 158 864 148"
+ /><line y2="138" style="fill:none;" x1="864" x2="864" y1="158"
+ /><text x="861" xml:space="preserve" y="134" style="font-weight:normal; stroke:none;"
+ >retData_comm_T2</text
+ ><rect x="861" y="79" width="26" style="fill:rgb(104,229,255); stroke:none;" height="26"
+ /><rect x="861" width="26" height="26" y="79" style="fill:none;"
+ /><polygon style="fill:none;" points=" 864 82 864 102 884 92"
+ /><polygon style="stroke:none;" points=" 864 82 864 102 884 92"
+ /><line y2="82" style="fill:none;" x1="884" x2="884" y1="102"
+ /><text x="861" xml:space="preserve" y="78" style="font-weight:normal; stroke:none;"
+ >data_comm_T2</text
+ ><rect x="798" y="18" width="26" style="fill:rgb(196,166,122); stroke:none;" height="26"
+ /><rect x="798" width="26" height="26" y="18" style="fill:none;"
+ /><polygon style="fill:none;" points=" 801 41 821 41 811 21"
+ /><polygon style="stroke:none;" points=" 801 41 821 41 811 21"
+ /><line y2="21" style="fill:none;" x1="821" x2="801" y1="21"
+ /><text x="798" xml:space="preserve" y="17" style="font-weight:normal; stroke:none;"
+ >startHSM_CPU2</text
+ ><rect x="661" y="84" width="26" style="fill:rgb(104,229,255); stroke:none;" height="26"
+ /><rect x="661" width="26" height="26" y="84" style="fill:none;"
+ /><polygon style="fill:none;" points=" 664 87 664 107 684 97"
+ /><polygon style="stroke:none;" points=" 664 87 664 107 684 97"
+ /><line y2="87" style="fill:none;" x1="684" x2="684" y1="107"
+ /><text x="661" xml:space="preserve" y="83" style="font-weight:normal; stroke:none;"
+ >comm</text
+ ><text x="620" y="97" style="font-style:italic; font-weight:normal; stroke:none;" xml:space="preserve"
+ >comm</text
+ ><line y2="97" style="fill:none;" x1="616" x2="661" y1="97"
+ /><rect x="1022" width="246" height="155" y="31" style="fill:none;"
+ /></g
+ ><g style="fill:rgb(201,243,188); fill-opacity:0.7843; font-family:sans-serif; stroke-opacity:0.7843; stroke:rgb(201,243,188);"
+ ><rect x="1023" width="244" height="153" y="32" style="stroke:none;"
+ /><rect x="1022" y="31" width="1" style="fill:rgb(255,255,255); stroke:none;" height="155"
+ /><rect x="1023" y="31" width="244" style="fill:rgb(255,255,255); stroke:none;" height="1"
+ /><rect x="1023" y="185" width="245" style="fill:rgb(140,170,131); stroke:none;" height="1"
+ /><rect x="1267" y="31" width="1" style="fill:rgb(140,170,131); stroke:none;" height="154"
+ /></g
+ ><g style="font-family:sans-serif; font-weight:bold;"
+ ><text x="1112" xml:space="preserve" y="58" style="stroke:none;"
+ >HSM_CPU2</text
+ ><image x="1238" y="46" width="15" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA8AAAAQCAYAAADJViUEAAAAYklEQVR4Xs2PWw5A
+EQxEu//F2cLdhx+SS4Xp1ONHTHIiZA4l8krSASYpfHGJ9ppEmGWU4ca2Evp+2SD9
+JWTcQZZFWUPPzctQ1nDZGWtPRrSEMJn+2cPINeYlDyb/E+yC7r1k/CUznLqz88wAAAAASUVORK5CYII=" style="font-weight:normal;" height="16" preserveAspectRatio="none"
+ /><text x="1037" xml:space="preserve" y="85" style="font-weight:normal; stroke:none;"
+ >+ channelIndex = 0 : Natural;</text
+ ><rect x="1009" y="135" width="26" style="fill:rgb(104,229,255); stroke:none;" height="26"
+ /><rect x="1009" width="26" height="26" y="135" style="fill:none;"
+ /><polygon style="fill:none;" points=" 1032 138 1032 158 1012 148"
+ /><polygon style="stroke:none;" points=" 1032 138 1032 158 1012 148"
+ /><line y2="138" style="fill:none;" x1="1012" x2="1012" y1="158"
+ /><text x="1009" xml:space="preserve" y="134" style="font-weight:normal; stroke:none;"
+ >retData_comm_T2</text
+ ><rect x="1009" y="77" width="26" style="fill:rgb(104,229,255); stroke:none;" height="26"
+ /><rect x="1009" width="26" height="26" y="77" style="fill:none;"
+ /><polygon style="fill:none;" points=" 1012 80 1012 100 1032 90"
+ /><polygon style="stroke:none;" points=" 1012 80 1012 100 1032 90"
+ /><line y2="80" style="fill:none;" x1="1032" x2="1032" y1="100"
+ /><text x="1009" xml:space="preserve" y="76" style="font-weight:normal; stroke:none;"
+ >data_comm_T2</text
+ ><rect x="1090" y="18" width="26" style="fill:rgb(196,166,122); stroke:none;" height="26"
+ /><rect x="1090" width="26" height="26" y="18" style="fill:none;"
+ /><polygon style="fill:none;" points=" 1093 21 1113 21 1103 41"
+ /><polygon style="stroke:none;" points=" 1093 21 1113 21 1103 41"
+ /><line y2="41" style="fill:none;" x1="1113" x2="1093" y1="41"
+ /><text x="1090" xml:space="preserve" y="17" style="font-weight:normal; stroke:none;"
+ >startHSM_CPU2</text
+ ><text x="909" y="18" style="font-style:italic; font-weight:normal; stroke:none;" xml:space="preserve"
+ >startHSM_CPU2</text
+ ><line y2="18" style="fill:none;" x1="1103" x2="811" y1="18"
+ /><text x="901" y="91" style="font-style:italic; font-weight:normal; stroke:none;" xml:space="preserve"
+ >data_comm_T2</text
+ ><line y2="92" style="fill:none;" x1="1009" x2="887" y1="90"
+ /><text x="892" y="148" style="font-style:italic; font-weight:normal; stroke:none;" xml:space="preserve"
+ >retData_comm_T2</text
+ ><line y2="148" style="fill:none;" x1="1009" x2="887" y1="148"
+ /><rect x="11" width="248" height="148" y="29" style="fill:none;"
+ /></g
+ ><g style="fill:rgb(201,243,188); fill-opacity:0.7843; font-family:sans-serif; stroke-opacity:0.7843; stroke:rgb(201,243,188);"
+ ><rect x="12" width="246" height="146" y="30" style="stroke:none;"
+ /><rect x="11" y="29" width="1" style="fill:rgb(255,255,255); stroke:none;" height="148"
+ /><rect x="12" y="29" width="246" style="fill:rgb(255,255,255); stroke:none;" height="1"
+ /><rect x="12" y="176" width="247" style="fill:rgb(140,170,131); stroke:none;" height="1"
+ /><rect x="258" y="29" width="1" style="fill:rgb(140,170,131); stroke:none;" height="147"
+ /></g
+ ><g style="font-family:sans-serif; font-weight:bold;"
+ ><text x="102" xml:space="preserve" y="56" style="stroke:none;"
+ >HSM_CPU1</text
+ ><image x="229" y="44" width="15" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA8AAAAQCAYAAADJViUEAAAAYklEQVR4Xs2PWw5A
+EQxEu//F2cLdhx+SS4Xp1ONHTHIiZA4l8krSASYpfHGJ9ppEmGWU4ca2Evp+2SD9
+JWTcQZZFWUPPzctQ1nDZGWtPRrSEMJn+2cPINeYlDyb/E+yC7r1k/CUznLqz88wAAAAASUVORK5CYII=" style="font-weight:normal;" height="16" preserveAspectRatio="none"
+ /><text x="26" xml:space="preserve" y="83" style="font-weight:normal; stroke:none;"
+ >+ channelIndex = 0 : Natural;</text
+ ><rect x="246" y="121" width="26" style="fill:rgb(104,229,255); stroke:none;" height="26"
+ /><rect x="246" width="26" height="26" y="121" style="fill:none;"
+ /><polygon style="fill:none;" points=" 249 124 249 144 269 134"
+ /><polygon style="stroke:none;" points=" 249 124 249 144 269 134"
+ /><line y2="124" style="fill:none;" x1="269" x2="269" y1="144"
+ /><text x="246" xml:space="preserve" y="120" style="font-weight:normal; stroke:none;"
+ >retData_comm_T1</text
+ ><rect x="246" y="69" width="26" style="fill:rgb(104,229,255); stroke:none;" height="26"
+ /><rect x="246" width="26" height="26" y="69" style="fill:none;"
+ /><polygon style="fill:none;" points=" 269 72 269 92 249 82"
+ /><polygon style="stroke:none;" points=" 269 72 269 92 249 82"
+ /><line y2="72" style="fill:none;" x1="249" x2="249" y1="92"
+ /><text x="246" xml:space="preserve" y="68" style="font-weight:normal; stroke:none;"
+ >data_comm_T1</text
+ ><rect x="73" y="16" width="26" style="fill:rgb(196,166,122); stroke:none;" height="26"
+ /><rect x="73" width="26" height="26" y="16" style="fill:none;"
+ /><polygon style="fill:none;" points=" 76 19 96 19 86 39"
+ /><polygon style="stroke:none;" points=" 76 19 96 19 86 39"
+ /><line y2="39" style="fill:none;" x1="96" x2="76" y1="39"
+ /><text x="73" xml:space="preserve" y="15" style="font-weight:normal; stroke:none;"
+ >startHSM_CPU1</text
+ ><text x="254" y="16" style="font-style:italic; font-weight:normal; stroke:none;" xml:space="preserve"
+ >startHSM_CPU1</text
+ ><line y2="16" style="fill:none;" x1="86" x2="518" y1="16"
+ /><text x="284" y="82" style="font-style:italic; font-weight:normal; stroke:none;" xml:space="preserve"
+ >data_comm_T1</text
+ ><line y2="82" style="fill:none;" x1="272" x2="390" y1="82"
+ /><text x="275" y="133" style="font-style:italic; font-weight:normal; stroke:none;" xml:space="preserve"
+ >retData_comm_T1</text
+ ><line y2="133" style="fill:none;" x1="272" x2="390" y1="134"
+ /></g
+ ></g
+></svg
+>
diff --git a/doc/SysMLSec/sysmlsec_documentation.tex b/doc/SysMLSec/sysmlsec_documentation.tex
index d96662dfe82351ed083818d30e1eb5b92af2f30a..4d8a2e5f5534b017b9dc1146ed7cf5b540ea0b05 100644
--- a/doc/SysMLSec/sysmlsec_documentation.tex
+++ b/doc/SysMLSec/sysmlsec_documentation.tex
@@ -334,7 +334,7 @@ Channels can be tagged with cryptographic configurations on the Security tab, wi
\begin{figure*}[htbp]
\centering
-\includegraphics[width=0.7\textwidth]{fig/channelsecurityoptions.png}
+\includegraphics[width=0.7\textwidth]{fig/channelsecurityTab.png}
\caption{Channel security options dialog window} \label{fig:channelsec}
\end{figure*}
@@ -380,6 +380,14 @@ When the option to add security operators is selected, there are multiple option
In addition, for the operators being added, estimated times to perform encryption, decryption, calculate a MAC, etc, and the overhead, can be manually set in lieu of using the default options.
+\begin{figure*}[htbp]
+\centering
+\includegraphics[width=0.1\textwidth]{build/fv1_t1-svg.pdf}
+\includegraphics[width=0.7\textwidth]{build/fv_auth_check-svg.pdf}
+\includegraphics[width=0.1\textwidth]{build/fv1_t2-svg.pdf}
+\caption{Functional View with authenticity check} \label{fig:fv1AuthCheck}
+\end{figure*}
+
\begin{figure*}[htbp]
\centering
\includegraphics[width=0.2\textwidth]{build/autogen_t1-svg.pdf}
@@ -388,10 +396,11 @@ When the option to add security operators is selected, there are multiple option
\caption{Functional view with automatically generated security operators to ensure weak authenticity} \label{fig:secfv1}
\end{figure*}
- For example, using the insecure architecture and functional model from Figure \ref{fig:fv1} and \ref{fig:mapping1}, if the communication channel is marked that it should be authentic, and if we choose to ensure weak authenticity only, then the toolkit generates the functional model shown in Figure \ref{fig:secfv1}. The Message Authentication Code concatenated onto the message can only be calculated with the given key and message, and if T2 detects that they do not match, then it discards the message as it was not an authentic message sent by T1.
+ For example, using the insecure architecture and functional model with authenticity check from Figure \ref{fig:fv1AuthCheck} and \ref{fig:mapping1}, if the communication channel is marked that it should be authentic, and if we choose to ensure weak authenticity only, then the toolkit generates the functional model shown in Figure \ref{fig:secfv1}. The Message Authentication Code concatenated onto the message can only be calculated with the given key and message, and if T2 detects that they do not match, then it discards the message as it was not an authentic message sent by T1.
If instead we chose to add weak and strong authenticity, then the tasks should exchange a nonce to avoid replay attacks, and the functional model in Figure \ref{fig:secfv2} is generated.
+
\begin{figure*}[htbp]
\centering
\includegraphics[width=0.2\textwidth]{build/autogen2_t1-svg.pdf}
@@ -416,7 +425,7 @@ For example, using the model in our example, chose to ensure confidentiality, an
\begin{figure*}[htbp]
\centering
-\includegraphics[width=0.99\textwidth]{build/hsmfunc-svg.pdf}
+\includegraphics[width=0.99\textwidth]{build/hsm_fv-svg.pdf}
\caption{Functional Model with added Hardware Security Module Tasks} \label{fig:hsmfunc}
\end{figure*}
@@ -430,8 +439,8 @@ For example, using the model in our example, chose to ensure confidentiality, an
\begin{figure*}[htbp]
\centering
-\includegraphics[width=0.4\textwidth]{build/hsmt1-svg.pdf}
-\includegraphics[width=0.4\textwidth]{build/hsmact-svg.pdf}
+\includegraphics[width=0.33\textwidth]{build/hsm_ad_t1-svg.pdf}
+\includegraphics[width=0.4\textwidth]{build/hsm_ad_hsm_cpu1-svg.pdf}
\caption{Modified Activity Diagram of T1 and HSM} \label{fig:hsmt1act}
\end{figure*}
@@ -440,7 +449,7 @@ For example, using the model in our example, chose to ensure confidentiality, an
\subsubsection{Mapping Keys}
-With multiple Cryptographic Configurations, it may become tedious to the map all of the keys to memory. Our toolkit therefore can find every Cryptographic Configuration used by a task, and then, depending on the type of the Cryptographic Configuration, map each applicable key to a memory that the task can securely access. For Cryptographic Configurations of type symmetric encryption or MAC, both the sending and receiving task will need to be able to access the key. For asymmetric encryption, however, all the sending tasks will need the public key while only the receiving task will need to access the private key.
+With multiple Cryptographic Configurations, it may become tedious to map all of the keys to memory. Our toolkit therefore can find every Cryptographic Configuration used by a task, and then, depending on the type of the Cryptographic Configuration, map each applicable key to a memory that the task can securely access. For Cryptographic Configurations of type symmetric encryption or MAC, both the sending and receiving task will need to be able to access the key. For asymmetric encryption, however, all the sending tasks will need the public key while only the receiving task will need to access the private key.
At every security generation, keys are automatically generated and mapped securely. There is also the option to add keys alone after completing a design by hand.
diff --git a/doc/diplodocus_tutorial/Tutorial.tex b/doc/diplodocus_tutorial/Tutorial.tex
index d29fa49e2a5e2ed13e00f049c045b6f925229b82..82d1c6fde1cf7fe61432db456635a818fac029ed 100644
--- a/doc/diplodocus_tutorial/Tutorial.tex
+++ b/doc/diplodocus_tutorial/Tutorial.tex
@@ -3561,14 +3561,17 @@ message before encryption.
Nonces can be concatenated to messages to ensure strong authenticity and prevent replay attacks. Nonces are first forged
as a Cryptographic Configuration. To state that a message will use a nonce, in the Cryptographic Configuration window,
-select the nonce name. As shown in Fig.~\ref{fig:nonce}, Bob sends Alice his
-nonce, then Alice concatenates it to her message and encrypts the new message. Bob then decrypts the message and verifies it contains his sent nonce. (Note that
+select the nonce name. As shown in Fig.~\ref{fig:nonce}, Bob sends to Alice his
+nonce, then Alice concatenates it to her message and encrypts the new message. Bob then decrypts the message and verifies if it contains his sent nonce. (Note that
we allow a nonce to be used for more than one message)
\begin{figure}[htbp]
\centering
- \includegraphics[width=0.85\textwidth]{figures/securityStuff/nonceComp.pdf}
+ %\includegraphics[width=0.85\textwidth]{figures/securityStuff/nonceComp.pdf}
+ \includegraphics[width=0.15\textwidth]{figures/securityStuff/alice_bob_nonce_ad_alice-svg.pdf}
+ \includegraphics[width=0.6\textwidth]{figures/securityStuff/fv_alice_bob_nonce-svg.pdf}
+ \includegraphics[width=0.15\textwidth]{figures/securityStuff/alice_bob_nonce_ad_bob-svg.pdf}
\caption{Message exchange with nonce}
\label{fig:nonce}
\end{figure}
diff --git a/doc/diplodocus_tutorial/figures/securityStuff/alice_bob_nonce_ad_alice.svg b/doc/diplodocus_tutorial/figures/securityStuff/alice_bob_nonce_ad_alice.svg
new file mode 100644
index 0000000000000000000000000000000000000000..fdf7470ffe44e452deef8ccc81658fcafd1bf2d2
--- /dev/null
+++ b/doc/diplodocus_tutorial/figures/securityStuff/alice_bob_nonce_ad_alice.svg
@@ -0,0 +1,181 @@
+<?xml version="1.0"?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN'
+ 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" style="fill-opacity:1; color-rendering:auto; color-interpolation:auto; text-rendering:auto; stroke:black; stroke-linecap:square; stroke-miterlimit:10; shape-rendering:auto; stroke-opacity:1; fill:black; stroke-dasharray:none; font-weight:normal; stroke-width:1; font-family:'Dialog'; font-style:normal; stroke-linejoin:miter; font-size:12px; stroke-dashoffset:0; image-rendering:auto;" width="142" height="264" xmlns="http://www.w3.org/2000/svg"
+><!--Generated by the Batik Graphics2D SVG Generator--><defs id="genericDefs"
+ /><g
+ ><defs id="defs1"
+ ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath1"
+ ><path d="M0 0 L142 0 L142 264 L0 264 L0 0 Z"
+ /></clipPath
+ ></defs
+ ><g style="fill:white; font-family:sans-serif; stroke:white;"
+ ><rect x="0" y="0" width="142" style="clip-path:url(#clipPath1); stroke:none;" height="264"
+ /></g
+ ><g style="font-family:sans-serif;"
+ ><line x1="67" x2="67" y1="210" style="fill:none; clip-path:url(#clipPath1);" y2="229"
+ /><polygon style="clip-path:url(#clipPath1); stroke:none;" points=" 67 229 62 220 71 220"
+ /><polygon style="fill:none; clip-path:url(#clipPath1);" points=" 67 229 62 220 71 220"
+ /><line x1="124" x2="67" y1="33" style="fill:none; clip-path:url(#clipPath1);" y2="49"
+ /><polygon style="clip-path:url(#clipPath1); stroke:none;" points=" 67 49 73 41 76 51"
+ /><polygon style="fill:none; clip-path:url(#clipPath1);" points=" 67 49 73 41 76 51"
+ /><line x1="67" x2="67" y1="79" style="fill:none; clip-path:url(#clipPath1);" y2="102"
+ /><polygon style="clip-path:url(#clipPath1); stroke:none;" points=" 67 102 62 93 71 93"
+ /><polygon style="fill:none; clip-path:url(#clipPath1);" points=" 67 102 62 93 71 93"
+ /><line x1="67" x2="67" y1="152" style="fill:none; clip-path:url(#clipPath1);" y2="180"
+ /><polygon style="clip-path:url(#clipPath1); stroke:none;" points=" 67 180 62 171 71 171"
+ /><polygon style="fill:none; clip-path:url(#clipPath1);" points=" 67 180 62 171 71 171"
+ /><circle r="7" style="clip-path:url(#clipPath1); stroke:none;" cx="124" cy="20"
+ /><line x1="124" x2="124" y1="28" style="fill:none; clip-path:url(#clipPath1);" y2="33"
+ /><polygon style="fill:rgb(104,229,255); clip-path:url(#clipPath1); stroke:none;" points=" 25 185 100 185 110 195 100 205 25 205"
+ /><line x1="67" x2="67" y1="185" style="fill:none; clip-path:url(#clipPath1);" y2="180"
+ /><line x1="67" x2="67" y1="205" style="fill:none; clip-path:url(#clipPath1);" y2="210"
+ /><line x1="26" x2="101" y1="186" style="clip-path:url(#clipPath1); fill:none; stroke:rgb(104,229,255);" y2="186"
+ /><line x1="26" x2="101" y1="206" style="clip-path:url(#clipPath1); fill:none; stroke:rgb(104,229,255);" y2="206"
+ /><line x1="26" x2="26" y1="186" style="clip-path:url(#clipPath1); fill:none; stroke:rgb(104,229,255);" y2="206"
+ /><line x1="101" x2="111" y1="186" style="clip-path:url(#clipPath1); fill:none; stroke:rgb(104,229,255);" y2="196"
+ /><line x1="101" x2="111" y1="206" style="clip-path:url(#clipPath1); fill:none; stroke:rgb(104,229,255);" y2="196"
+ /><line x1="25" x2="100" y1="185" style="fill:none; clip-path:url(#clipPath1);" y2="185"
+ /><line x1="25" x2="100" y1="205" style="fill:none; clip-path:url(#clipPath1);" y2="205"
+ /><line x1="25" x2="25" y1="185" style="fill:none; clip-path:url(#clipPath1);" y2="205"
+ /><line x1="100" x2="110" y1="185" style="fill:none; clip-path:url(#clipPath1);" y2="195"
+ /><line x1="100" x2="110" y1="205" style="fill:none; clip-path:url(#clipPath1);" y2="195"
+ /><text x="40" xml:space="preserve" y="185" style="clip-path:url(#clipPath1); stroke:none;"
+ >chl</text
+ ><text x="40" xml:space="preserve" y="200" style="clip-path:url(#clipPath1); stroke:none;"
+ >comm(1)</text
+ ><text x="88" xml:space="preserve" y="216" style="clip-path:url(#clipPath1); stroke:none;"
+ >sec:symN</text
+ ><circle r="8" style="clip-path:url(#clipPath1); stroke:none;" cx="67" cy="244"
+ /><circle r="10" style="fill:none; clip-path:url(#clipPath1);" cx="67" cy="244"
+ /><line x1="67" x2="67" y1="234" style="fill:none; clip-path:url(#clipPath1);" y2="229"
+ /><polygon style="fill:rgb(104,229,255); clip-path:url(#clipPath1); stroke:none;" points=" 11 54 123 54 123 74 11 74 21 64"
+ /><line x1="67" x2="67" y1="54" style="fill:none; clip-path:url(#clipPath1);" y2="49"
+ /><line x1="67" x2="67" y1="74" style="fill:none; clip-path:url(#clipPath1);" y2="79"
+ /><line x1="12" x2="124" y1="55" style="clip-path:url(#clipPath1); fill:none; stroke:rgb(104,229,255);" y2="55"
+ /><line x1="124" x2="124" y1="55" style="clip-path:url(#clipPath1); fill:none; stroke:rgb(104,229,255);" y2="75"
+ /><line x1="12" x2="124" y1="75" style="clip-path:url(#clipPath1); fill:none; stroke:rgb(104,229,255);" y2="75"
+ /><line x1="12" x2="22" y1="55" style="clip-path:url(#clipPath1); fill:none; stroke:rgb(104,229,255);" y2="65"
+ /><line x1="12" x2="22" y1="75" style="clip-path:url(#clipPath1); fill:none; stroke:rgb(104,229,255);" y2="65"
+ /><line x1="11" x2="123" y1="54" style="fill:none; clip-path:url(#clipPath1);" y2="54"
+ /><line x1="123" x2="123" y1="54" style="fill:none; clip-path:url(#clipPath1);" y2="74"
+ /><line x1="11" x2="123" y1="74" style="fill:none; clip-path:url(#clipPath1);" y2="74"
+ /><line x1="11" x2="21" y1="54" style="fill:none; clip-path:url(#clipPath1);" y2="64"
+ /><line x1="11" x2="21" y1="74" style="fill:none; clip-path:url(#clipPath1);" y2="64"
+ /><text x="26" xml:space="preserve" y="54" style="clip-path:url(#clipPath1); stroke:none;"
+ >chl</text
+ ><text x="23" xml:space="preserve" y="69" style="clip-path:url(#clipPath1); stroke:none;"
+ >nonce_ch(1) </text
+ ><text x="95" xml:space="preserve" y="85" style="clip-path:url(#clipPath1); stroke:none;"
+ >sec:n</text
+ ><rect x="60" y="107" width="15" style="clip-path:url(#clipPath1); fill:rgb(199,243,105); stroke:none;" height="35"
+ /><polygon style="fill:rgb(199,243,105); clip-path:url(#clipPath1); stroke:none;" points=" 60 142 75 142 67 147"
+ /><line x1="60" x2="75" y1="107" style="fill:none; clip-path:url(#clipPath1);" y2="107"
+ /><line x1="60" x2="60" y1="107" style="fill:none; clip-path:url(#clipPath1);" y2="142"
+ /><line x1="75" x2="75" y1="107" style="fill:none; clip-path:url(#clipPath1);" y2="142"
+ /><line x1="60" x2="67" y1="142" style="fill:none; clip-path:url(#clipPath1);" y2="147"
+ /><line x1="67" x2="75" y1="147" style="fill:none; clip-path:url(#clipPath1);" y2="142"
+ /><line x1="67" x2="67" y1="107" style="fill:none; clip-path:url(#clipPath1);" y2="102"
+ /><line x1="67" x2="67" y1="147" style="fill:none; clip-path:url(#clipPath1);" y2="152"
+ /><line x1="65" x2="70" y1="112" style="fill:none; clip-path:url(#clipPath1);" y2="112"
+ /><line x1="65" x2="70" y1="124" style="fill:none; clip-path:url(#clipPath1);" y2="124"
+ /><line x1="65" x2="70" y1="118" style="fill:none; clip-path:url(#clipPath1);" y2="118"
+ /><line x1="65" x2="65" y1="112" style="fill:none; clip-path:url(#clipPath1);" y2="118"
+ /><line x1="70" x2="70" y1="118" style="fill:none; clip-path:url(#clipPath1);" y2="124"
+ /><line x1="65" x2="70" y1="127" style="fill:none; clip-path:url(#clipPath1);" y2="127"
+ /><line x1="65" x2="70" y1="139" style="fill:none; clip-path:url(#clipPath1);" y2="139"
+ /><line x1="65" x2="70" y1="133" style="fill:none; clip-path:url(#clipPath1);" y2="133"
+ /><line x1="65" x2="65" y1="127" style="fill:none; clip-path:url(#clipPath1);" y2="139"
+ /><text x="82" xml:space="preserve" y="124" style="clip-path:url(#clipPath1); stroke:none;"
+ >sec:symN</text
+ ><text x="82" xml:space="preserve" y="132" style="clip-path:url(#clipPath1); stroke:none;"
+ >nonce:n</text
+ ><image x="38" y="124" width="20" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAQCAYAAAAWGF8bAAAAVklEQVR4XmNgGErg
+PxqmCKAbRpHB6AZQgsEAXZBsfO7+LxCNKUEuJspAkCJkjE2OZANBipAANjl0PqZB
+MAVYDAQBbHLofKINAwNschhiMEMIGTYKaAsAlkPEzZtFB24AAAAASUVORK5CYII=" style="clip-path:url(#clipPath1);" height="16" preserveAspectRatio="none"
+ /></g
+ ><g style="font-family:sans-serif;"
+ ><line y2="229" style="fill:none;" x1="67" x2="67" y1="210"
+ /><polygon style="stroke:none;" points=" 67 229 62 220 71 220"
+ /><polygon style="fill:none;" points=" 67 229 62 220 71 220"
+ /><line y2="49" style="fill:none;" x1="124" x2="67" y1="33"
+ /><polygon style="stroke:none;" points=" 67 49 73 41 76 51"
+ /><polygon style="fill:none;" points=" 67 49 73 41 76 51"
+ /><line y2="102" style="fill:none;" x1="67" x2="67" y1="79"
+ /><polygon style="stroke:none;" points=" 67 102 62 93 71 93"
+ /><polygon style="fill:none;" points=" 67 102 62 93 71 93"
+ /><line y2="180" style="fill:none;" x1="67" x2="67" y1="152"
+ /><polygon style="stroke:none;" points=" 67 180 62 171 71 171"
+ /><polygon style="fill:none;" points=" 67 180 62 171 71 171"
+ /><circle r="7" style="stroke:none;" cx="124" cy="20"
+ /><line y2="33" style="fill:none;" x1="124" x2="124" y1="28"
+ /><polygon style="fill:rgb(104,229,255); stroke:none;" points=" 25 185 100 185 110 195 100 205 25 205"
+ /><line y2="180" style="fill:none;" x1="67" x2="67" y1="185"
+ /><line y2="210" style="fill:none;" x1="67" x2="67" y1="205"
+ /><line x1="26" x2="101" y1="186" style="fill:none; stroke:rgb(104,229,255);" y2="186"
+ /><line x1="26" x2="101" y1="206" style="fill:none; stroke:rgb(104,229,255);" y2="206"
+ /><line x1="26" x2="26" y1="186" style="fill:none; stroke:rgb(104,229,255);" y2="206"
+ /><line x1="101" x2="111" y1="186" style="fill:none; stroke:rgb(104,229,255);" y2="196"
+ /><line x1="101" x2="111" y1="206" style="fill:none; stroke:rgb(104,229,255);" y2="196"
+ /><line y2="185" style="fill:none;" x1="25" x2="100" y1="185"
+ /><line y2="205" style="fill:none;" x1="25" x2="100" y1="205"
+ /><line y2="205" style="fill:none;" x1="25" x2="25" y1="185"
+ /><line y2="195" style="fill:none;" x1="100" x2="110" y1="185"
+ /><line y2="195" style="fill:none;" x1="100" x2="110" y1="205"
+ /><text x="40" xml:space="preserve" y="185" style="stroke:none;"
+ >chl</text
+ ><text x="40" xml:space="preserve" y="200" style="stroke:none;"
+ >comm(1)</text
+ ><text x="88" xml:space="preserve" y="216" style="stroke:none;"
+ >sec:symN</text
+ ><circle r="8" style="stroke:none;" cx="67" cy="244"
+ /><circle r="10" style="fill:none;" cx="67" cy="244"
+ /><line y2="229" style="fill:none;" x1="67" x2="67" y1="234"
+ /><polygon style="fill:rgb(104,229,255); stroke:none;" points=" 11 54 123 54 123 74 11 74 21 64"
+ /><line y2="49" style="fill:none;" x1="67" x2="67" y1="54"
+ /><line y2="79" style="fill:none;" x1="67" x2="67" y1="74"
+ /><line x1="12" x2="124" y1="55" style="fill:none; stroke:rgb(104,229,255);" y2="55"
+ /><line x1="124" x2="124" y1="55" style="fill:none; stroke:rgb(104,229,255);" y2="75"
+ /><line x1="12" x2="124" y1="75" style="fill:none; stroke:rgb(104,229,255);" y2="75"
+ /><line x1="12" x2="22" y1="55" style="fill:none; stroke:rgb(104,229,255);" y2="65"
+ /><line x1="12" x2="22" y1="75" style="fill:none; stroke:rgb(104,229,255);" y2="65"
+ /><line y2="54" style="fill:none;" x1="11" x2="123" y1="54"
+ /><line y2="74" style="fill:none;" x1="123" x2="123" y1="54"
+ /><line y2="74" style="fill:none;" x1="11" x2="123" y1="74"
+ /><line y2="64" style="fill:none;" x1="11" x2="21" y1="54"
+ /><line y2="64" style="fill:none;" x1="11" x2="21" y1="74"
+ /><text x="26" xml:space="preserve" y="54" style="stroke:none;"
+ >chl</text
+ ><text x="23" xml:space="preserve" y="69" style="stroke:none;"
+ >nonce_ch(1) </text
+ ><text x="95" xml:space="preserve" y="85" style="stroke:none;"
+ >sec:n</text
+ ><rect x="60" y="107" width="15" style="fill:rgb(199,243,105); stroke:none;" height="35"
+ /><polygon style="fill:rgb(199,243,105); stroke:none;" points=" 60 142 75 142 67 147"
+ /><line y2="107" style="fill:none;" x1="60" x2="75" y1="107"
+ /><line y2="142" style="fill:none;" x1="60" x2="60" y1="107"
+ /><line y2="142" style="fill:none;" x1="75" x2="75" y1="107"
+ /><line y2="147" style="fill:none;" x1="60" x2="67" y1="142"
+ /><line y2="142" style="fill:none;" x1="67" x2="75" y1="147"
+ /><line y2="102" style="fill:none;" x1="67" x2="67" y1="107"
+ /><line y2="152" style="fill:none;" x1="67" x2="67" y1="147"
+ /><line y2="112" style="fill:none;" x1="65" x2="70" y1="112"
+ /><line y2="124" style="fill:none;" x1="65" x2="70" y1="124"
+ /><line y2="118" style="fill:none;" x1="65" x2="70" y1="118"
+ /><line y2="118" style="fill:none;" x1="65" x2="65" y1="112"
+ /><line y2="124" style="fill:none;" x1="70" x2="70" y1="118"
+ /><line y2="127" style="fill:none;" x1="65" x2="70" y1="127"
+ /><line y2="139" style="fill:none;" x1="65" x2="70" y1="139"
+ /><line y2="133" style="fill:none;" x1="65" x2="70" y1="133"
+ /><line y2="139" style="fill:none;" x1="65" x2="65" y1="127"
+ /><text x="82" xml:space="preserve" y="124" style="stroke:none;"
+ >sec:symN</text
+ ><text x="82" xml:space="preserve" y="132" style="stroke:none;"
+ >nonce:n</text
+ ><image preserveAspectRatio="none" x="38" width="20" y="124" height="16" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAQCAYAAAAWGF8bAAAAVklEQVR4XmNgGErg
+PxqmCKAbRpHB6AZQgsEAXZBsfO7+LxCNKUEuJspAkCJkjE2OZANBipAANjl0PqZB
+MAVYDAQBbHLofKINAwNschhiMEMIGTYKaAsAlkPEzZtFB24AAAAASUVORK5CYII="
+ /></g
+ ></g
+></svg
+>
diff --git a/doc/diplodocus_tutorial/figures/securityStuff/alice_bob_nonce_ad_bob.svg b/doc/diplodocus_tutorial/figures/securityStuff/alice_bob_nonce_ad_bob.svg
new file mode 100644
index 0000000000000000000000000000000000000000..15368611a8c1425a8883f9cc032ae1ff3585766c
--- /dev/null
+++ b/doc/diplodocus_tutorial/figures/securityStuff/alice_bob_nonce_ad_bob.svg
@@ -0,0 +1,203 @@
+<?xml version="1.0"?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN'
+ 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" style="fill-opacity:1; color-rendering:auto; color-interpolation:auto; text-rendering:auto; stroke:black; stroke-linecap:square; stroke-miterlimit:10; shape-rendering:auto; stroke-opacity:1; fill:black; stroke-dasharray:none; font-weight:normal; stroke-width:1; font-family:'Dialog'; font-style:normal; stroke-linejoin:miter; font-size:12px; stroke-dashoffset:0; image-rendering:auto;" width="148" height="323" xmlns="http://www.w3.org/2000/svg"
+><!--Generated by the Batik Graphics2D SVG Generator--><defs id="genericDefs"
+ /><g
+ ><defs id="defs1"
+ ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath1"
+ ><path d="M0 0 L148 0 L148 323 L0 323 L0 0 Z"
+ /></clipPath
+ ></defs
+ ><g style="fill:white; font-family:sans-serif; stroke:white;"
+ ><rect x="0" y="0" width="148" style="clip-path:url(#clipPath1); stroke:none;" height="323"
+ /></g
+ ><g style="font-family:sans-serif;"
+ ><line x1="67" x2="68" y1="147" style="fill:none; clip-path:url(#clipPath1);" y2="165"
+ /><polygon style="clip-path:url(#clipPath1); stroke:none;" points=" 68 165 62 156 72 156"
+ /><polygon style="fill:none; clip-path:url(#clipPath1);" points=" 68 165 62 156 72 156"
+ /><line x1="130" x2="66" y1="40" style="fill:none; clip-path:url(#clipPath1);" y2="48"
+ /><polygon style="clip-path:url(#clipPath1); stroke:none;" points=" 66 48 73 41 75 51"
+ /><polygon style="fill:none; clip-path:url(#clipPath1);" points=" 66 48 73 41 75 51"
+ /><line x1="66" x2="67" y1="98" style="fill:none; clip-path:url(#clipPath1);" y2="117"
+ /><polygon style="clip-path:url(#clipPath1); stroke:none;" points=" 67 117 61 108 71 108"
+ /><polygon style="fill:none; clip-path:url(#clipPath1);" points=" 67 117 61 108 71 108"
+ /><line x1="68" x2="68" y1="195" style="fill:none; clip-path:url(#clipPath1);" y2="220"
+ /><polygon style="clip-path:url(#clipPath1); stroke:none;" points=" 68 220 63 211 72 211"
+ /><polygon style="fill:none; clip-path:url(#clipPath1);" points=" 68 220 63 211 72 211"
+ /><line x1="68" x2="69" y1="270" style="fill:none; clip-path:url(#clipPath1);" y2="288"
+ /><polygon style="clip-path:url(#clipPath1); stroke:none;" points=" 69 288 63 279 73 279"
+ /><polygon style="fill:none; clip-path:url(#clipPath1);" points=" 69 288 63 279 73 279"
+ /><circle r="7" style="clip-path:url(#clipPath1); stroke:none;" cx="130" cy="27"
+ /><line x1="130" x2="130" y1="35" style="fill:none; clip-path:url(#clipPath1);" y2="40"
+ /><polygon style="fill:rgb(104,229,255); clip-path:url(#clipPath1); stroke:none;" points=" 24 170 113 170 113 190 24 190 34 180"
+ /><line x1="68" x2="68" y1="170" style="fill:none; clip-path:url(#clipPath1);" y2="165"
+ /><line x1="68" x2="68" y1="190" style="fill:none; clip-path:url(#clipPath1);" y2="195"
+ /><line x1="25" x2="114" y1="171" style="clip-path:url(#clipPath1); fill:none; stroke:rgb(104,229,255);" y2="171"
+ /><line x1="114" x2="114" y1="171" style="clip-path:url(#clipPath1); fill:none; stroke:rgb(104,229,255);" y2="191"
+ /><line x1="25" x2="114" y1="191" style="clip-path:url(#clipPath1); fill:none; stroke:rgb(104,229,255);" y2="191"
+ /><line x1="25" x2="35" y1="171" style="clip-path:url(#clipPath1); fill:none; stroke:rgb(104,229,255);" y2="181"
+ /><line x1="25" x2="35" y1="191" style="clip-path:url(#clipPath1); fill:none; stroke:rgb(104,229,255);" y2="181"
+ /><line x1="24" x2="113" y1="170" style="fill:none; clip-path:url(#clipPath1);" y2="170"
+ /><line x1="113" x2="113" y1="170" style="fill:none; clip-path:url(#clipPath1);" y2="190"
+ /><line x1="24" x2="113" y1="190" style="fill:none; clip-path:url(#clipPath1);" y2="190"
+ /><line x1="24" x2="34" y1="170" style="fill:none; clip-path:url(#clipPath1);" y2="180"
+ /><line x1="24" x2="34" y1="190" style="fill:none; clip-path:url(#clipPath1);" y2="180"
+ /><text x="39" xml:space="preserve" y="170" style="clip-path:url(#clipPath1); stroke:none;"
+ >chl</text
+ ><text x="36" xml:space="preserve" y="185" style="clip-path:url(#clipPath1); stroke:none;"
+ >comm(1) </text
+ ><text x="90" xml:space="preserve" y="201" style="clip-path:url(#clipPath1); stroke:none;"
+ >sec:symN</text
+ ><circle r="8" style="clip-path:url(#clipPath1); stroke:none;" cx="69" cy="303"
+ /><circle r="10" style="fill:none; clip-path:url(#clipPath1);" cx="69" cy="303"
+ /><line x1="69" x2="69" y1="293" style="fill:none; clip-path:url(#clipPath1);" y2="288"
+ /><polygon style="fill:rgb(104,229,255); clip-path:url(#clipPath1); stroke:none;" points=" 13 122 111 122 121 132 111 142 13 142"
+ /><line x1="67" x2="67" y1="122" style="fill:none; clip-path:url(#clipPath1);" y2="117"
+ /><line x1="67" x2="67" y1="142" style="fill:none; clip-path:url(#clipPath1);" y2="147"
+ /><line x1="14" x2="112" y1="123" style="clip-path:url(#clipPath1); fill:none; stroke:rgb(104,229,255);" y2="123"
+ /><line x1="14" x2="112" y1="143" style="clip-path:url(#clipPath1); fill:none; stroke:rgb(104,229,255);" y2="143"
+ /><line x1="14" x2="14" y1="123" style="clip-path:url(#clipPath1); fill:none; stroke:rgb(104,229,255);" y2="143"
+ /><line x1="112" x2="122" y1="123" style="clip-path:url(#clipPath1); fill:none; stroke:rgb(104,229,255);" y2="133"
+ /><line x1="112" x2="122" y1="143" style="clip-path:url(#clipPath1); fill:none; stroke:rgb(104,229,255);" y2="133"
+ /><line x1="13" x2="111" y1="122" style="fill:none; clip-path:url(#clipPath1);" y2="122"
+ /><line x1="13" x2="111" y1="142" style="fill:none; clip-path:url(#clipPath1);" y2="142"
+ /><line x1="13" x2="13" y1="122" style="fill:none; clip-path:url(#clipPath1);" y2="142"
+ /><line x1="111" x2="121" y1="122" style="fill:none; clip-path:url(#clipPath1);" y2="132"
+ /><line x1="111" x2="121" y1="142" style="fill:none; clip-path:url(#clipPath1);" y2="132"
+ /><text x="28" xml:space="preserve" y="122" style="clip-path:url(#clipPath1); stroke:none;"
+ >chl</text
+ ><text x="28" xml:space="preserve" y="137" style="clip-path:url(#clipPath1); stroke:none;"
+ >nonce_ch(1)</text
+ ><text x="94" xml:space="preserve" y="153" style="clip-path:url(#clipPath1); stroke:none;"
+ >sec:n</text
+ ><rect x="59" y="53" width="15" style="clip-path:url(#clipPath1); fill:rgb(199,243,105); stroke:none;" height="35"
+ /><polygon style="fill:rgb(199,243,105); clip-path:url(#clipPath1); stroke:none;" points=" 59 88 74 88 66 93"
+ /><line x1="59" x2="74" y1="53" style="fill:none; clip-path:url(#clipPath1);" y2="53"
+ /><line x1="59" x2="59" y1="53" style="fill:none; clip-path:url(#clipPath1);" y2="88"
+ /><line x1="74" x2="74" y1="53" style="fill:none; clip-path:url(#clipPath1);" y2="88"
+ /><line x1="59" x2="66" y1="88" style="fill:none; clip-path:url(#clipPath1);" y2="93"
+ /><line x1="66" x2="74" y1="93" style="fill:none; clip-path:url(#clipPath1);" y2="88"
+ /><line x1="66" x2="66" y1="53" style="fill:none; clip-path:url(#clipPath1);" y2="48"
+ /><line x1="66" x2="66" y1="93" style="fill:none; clip-path:url(#clipPath1);" y2="98"
+ /><line x1="63" x2="63" y1="64" style="fill:none; clip-path:url(#clipPath1);" y2="76"
+ /><line x1="69" x2="69" y1="64" style="fill:none; clip-path:url(#clipPath1);" y2="76"
+ /><line x1="63" x2="69" y1="64" style="fill:none; clip-path:url(#clipPath1);" y2="76"
+ /><text x="81" xml:space="preserve" y="70" style="clip-path:url(#clipPath1); stroke:none;"
+ >sec:n</text
+ ><image x="37" y="70" width="20" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAQCAYAAAAWGF8bAAAAVklEQVR4XmNgGErg
+PxqmCKAbRpHB6AZQgsEAXZBsfO7+LxCNKUEuJspAkCJkjE2OZANBipAANjl0PqZB
+MAVYDAQBbHLofKINAwNschhiMEMIGTYKaAsAlkPEzZtFB24AAAAASUVORK5CYII=" style="clip-path:url(#clipPath1);" height="16" preserveAspectRatio="none"
+ /><rect x="61" y="225" width="15" style="clip-path:url(#clipPath1); fill:rgb(199,243,105); stroke:none;" height="35"
+ /><polygon style="fill:rgb(199,243,105); clip-path:url(#clipPath1); stroke:none;" points=" 61 260 76 260 68 265"
+ /><line x1="61" x2="76" y1="225" style="fill:none; clip-path:url(#clipPath1);" y2="225"
+ /><line x1="61" x2="61" y1="225" style="fill:none; clip-path:url(#clipPath1);" y2="260"
+ /><line x1="76" x2="76" y1="225" style="fill:none; clip-path:url(#clipPath1);" y2="260"
+ /><line x1="61" x2="68" y1="260" style="fill:none; clip-path:url(#clipPath1);" y2="265"
+ /><line x1="68" x2="76" y1="265" style="fill:none; clip-path:url(#clipPath1);" y2="260"
+ /><line x1="68" x2="68" y1="225" style="fill:none; clip-path:url(#clipPath1);" y2="220"
+ /><line x1="68" x2="68" y1="265" style="fill:none; clip-path:url(#clipPath1);" y2="270"
+ /><line x1="66" x2="66" y1="231" style="fill:none; clip-path:url(#clipPath1);" y2="254"
+ /><path d="M63.5 255 A7.5 12.5 0 0 0 63.5 230" style="fill:none; clip-path:url(#clipPath1);"
+ /><image x="39" y="242" width="20" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAQCAYAAAAWGF8bAAAAVklEQVR4XmNgGErg
+PxqmCKAbRpHB6AZQgsEAXZBsfO7+LxCNKUEuJspAkCJkjE2OZANBipAANjl0PqZB
+MAVYDAQBbHLofKINAwNschhiMEMIGTYKaAsAlkPEzZtFB24AAAAASUVORK5CYII=" style="clip-path:url(#clipPath1);" height="16" preserveAspectRatio="none"
+ /><text x="83" xml:space="preserve" y="242" style="clip-path:url(#clipPath1); stroke:none;"
+ >sec:symN</text
+ ></g
+ ><g style="font-family:sans-serif;"
+ ><line y2="165" style="fill:none;" x1="67" x2="68" y1="147"
+ /><polygon style="stroke:none;" points=" 68 165 62 156 72 156"
+ /><polygon style="fill:none;" points=" 68 165 62 156 72 156"
+ /><line y2="48" style="fill:none;" x1="130" x2="66" y1="40"
+ /><polygon style="stroke:none;" points=" 66 48 73 41 75 51"
+ /><polygon style="fill:none;" points=" 66 48 73 41 75 51"
+ /><line y2="117" style="fill:none;" x1="66" x2="67" y1="98"
+ /><polygon style="stroke:none;" points=" 67 117 61 108 71 108"
+ /><polygon style="fill:none;" points=" 67 117 61 108 71 108"
+ /><line y2="220" style="fill:none;" x1="68" x2="68" y1="195"
+ /><polygon style="stroke:none;" points=" 68 220 63 211 72 211"
+ /><polygon style="fill:none;" points=" 68 220 63 211 72 211"
+ /><line y2="288" style="fill:none;" x1="68" x2="69" y1="270"
+ /><polygon style="stroke:none;" points=" 69 288 63 279 73 279"
+ /><polygon style="fill:none;" points=" 69 288 63 279 73 279"
+ /><circle r="7" style="stroke:none;" cx="130" cy="27"
+ /><line y2="40" style="fill:none;" x1="130" x2="130" y1="35"
+ /><polygon style="fill:rgb(104,229,255); stroke:none;" points=" 24 170 113 170 113 190 24 190 34 180"
+ /><line y2="165" style="fill:none;" x1="68" x2="68" y1="170"
+ /><line y2="195" style="fill:none;" x1="68" x2="68" y1="190"
+ /><line x1="25" x2="114" y1="171" style="fill:none; stroke:rgb(104,229,255);" y2="171"
+ /><line x1="114" x2="114" y1="171" style="fill:none; stroke:rgb(104,229,255);" y2="191"
+ /><line x1="25" x2="114" y1="191" style="fill:none; stroke:rgb(104,229,255);" y2="191"
+ /><line x1="25" x2="35" y1="171" style="fill:none; stroke:rgb(104,229,255);" y2="181"
+ /><line x1="25" x2="35" y1="191" style="fill:none; stroke:rgb(104,229,255);" y2="181"
+ /><line y2="170" style="fill:none;" x1="24" x2="113" y1="170"
+ /><line y2="190" style="fill:none;" x1="113" x2="113" y1="170"
+ /><line y2="190" style="fill:none;" x1="24" x2="113" y1="190"
+ /><line y2="180" style="fill:none;" x1="24" x2="34" y1="170"
+ /><line y2="180" style="fill:none;" x1="24" x2="34" y1="190"
+ /><text x="39" xml:space="preserve" y="170" style="stroke:none;"
+ >chl</text
+ ><text x="36" xml:space="preserve" y="185" style="stroke:none;"
+ >comm(1) </text
+ ><text x="90" xml:space="preserve" y="201" style="stroke:none;"
+ >sec:symN</text
+ ><circle r="8" style="stroke:none;" cx="69" cy="303"
+ /><circle r="10" style="fill:none;" cx="69" cy="303"
+ /><line y2="288" style="fill:none;" x1="69" x2="69" y1="293"
+ /><polygon style="fill:rgb(104,229,255); stroke:none;" points=" 13 122 111 122 121 132 111 142 13 142"
+ /><line y2="117" style="fill:none;" x1="67" x2="67" y1="122"
+ /><line y2="147" style="fill:none;" x1="67" x2="67" y1="142"
+ /><line x1="14" x2="112" y1="123" style="fill:none; stroke:rgb(104,229,255);" y2="123"
+ /><line x1="14" x2="112" y1="143" style="fill:none; stroke:rgb(104,229,255);" y2="143"
+ /><line x1="14" x2="14" y1="123" style="fill:none; stroke:rgb(104,229,255);" y2="143"
+ /><line x1="112" x2="122" y1="123" style="fill:none; stroke:rgb(104,229,255);" y2="133"
+ /><line x1="112" x2="122" y1="143" style="fill:none; stroke:rgb(104,229,255);" y2="133"
+ /><line y2="122" style="fill:none;" x1="13" x2="111" y1="122"
+ /><line y2="142" style="fill:none;" x1="13" x2="111" y1="142"
+ /><line y2="142" style="fill:none;" x1="13" x2="13" y1="122"
+ /><line y2="132" style="fill:none;" x1="111" x2="121" y1="122"
+ /><line y2="132" style="fill:none;" x1="111" x2="121" y1="142"
+ /><text x="28" xml:space="preserve" y="122" style="stroke:none;"
+ >chl</text
+ ><text x="28" xml:space="preserve" y="137" style="stroke:none;"
+ >nonce_ch(1)</text
+ ><text x="94" xml:space="preserve" y="153" style="stroke:none;"
+ >sec:n</text
+ ><rect x="59" y="53" width="15" style="fill:rgb(199,243,105); stroke:none;" height="35"
+ /><polygon style="fill:rgb(199,243,105); stroke:none;" points=" 59 88 74 88 66 93"
+ /><line y2="53" style="fill:none;" x1="59" x2="74" y1="53"
+ /><line y2="88" style="fill:none;" x1="59" x2="59" y1="53"
+ /><line y2="88" style="fill:none;" x1="74" x2="74" y1="53"
+ /><line y2="93" style="fill:none;" x1="59" x2="66" y1="88"
+ /><line y2="88" style="fill:none;" x1="66" x2="74" y1="93"
+ /><line y2="48" style="fill:none;" x1="66" x2="66" y1="53"
+ /><line y2="98" style="fill:none;" x1="66" x2="66" y1="93"
+ /><line y2="76" style="fill:none;" x1="63" x2="63" y1="64"
+ /><line y2="76" style="fill:none;" x1="69" x2="69" y1="64"
+ /><line y2="76" style="fill:none;" x1="63" x2="69" y1="64"
+ /><text x="81" xml:space="preserve" y="70" style="stroke:none;"
+ >sec:n</text
+ ><image preserveAspectRatio="none" x="37" width="20" y="70" height="16" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAQCAYAAAAWGF8bAAAAVklEQVR4XmNgGErg
+PxqmCKAbRpHB6AZQgsEAXZBsfO7+LxCNKUEuJspAkCJkjE2OZANBipAANjl0PqZB
+MAVYDAQBbHLofKINAwNschhiMEMIGTYKaAsAlkPEzZtFB24AAAAASUVORK5CYII="
+ /><rect x="61" y="225" width="15" style="fill:rgb(199,243,105); stroke:none;" height="35"
+ /><polygon style="fill:rgb(199,243,105); stroke:none;" points=" 61 260 76 260 68 265"
+ /><line y2="225" style="fill:none;" x1="61" x2="76" y1="225"
+ /><line y2="260" style="fill:none;" x1="61" x2="61" y1="225"
+ /><line y2="260" style="fill:none;" x1="76" x2="76" y1="225"
+ /><line y2="265" style="fill:none;" x1="61" x2="68" y1="260"
+ /><line y2="260" style="fill:none;" x1="68" x2="76" y1="265"
+ /><line y2="220" style="fill:none;" x1="68" x2="68" y1="225"
+ /><line y2="270" style="fill:none;" x1="68" x2="68" y1="265"
+ /><line y2="254" style="fill:none;" x1="66" x2="66" y1="231"
+ /><path style="fill:none;" d="M63.5 255 A7.5 12.5 0 0 0 63.5 230"
+ /><image preserveAspectRatio="none" x="39" width="20" y="242" height="16" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAQCAYAAAAWGF8bAAAAVklEQVR4XmNgGErg
+PxqmCKAbRpHB6AZQgsEAXZBsfO7+LxCNKUEuJspAkCJkjE2OZANBipAANjl0PqZB
+MAVYDAQBbHLofKINAwNschhiMEMIGTYKaAsAlkPEzZtFB24AAAAASUVORK5CYII="
+ /><text x="83" xml:space="preserve" y="242" style="stroke:none;"
+ >sec:symN</text
+ ></g
+ ></g
+></svg
+>
diff --git a/doc/diplodocus_tutorial/figures/securityStuff/fv_alice_bob_nonce.svg b/doc/diplodocus_tutorial/figures/securityStuff/fv_alice_bob_nonce.svg
new file mode 100644
index 0000000000000000000000000000000000000000..20ee4b43d3a430f608ec9f0c777443f3ee626ae1
--- /dev/null
+++ b/doc/diplodocus_tutorial/figures/securityStuff/fv_alice_bob_nonce.svg
@@ -0,0 +1,173 @@
+<?xml version="1.0"?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN'
+ 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" style="fill-opacity:1; color-rendering:auto; color-interpolation:auto; text-rendering:auto; stroke:black; stroke-linecap:square; stroke-miterlimit:10; shape-rendering:auto; stroke-opacity:1; fill:black; stroke-dasharray:none; font-weight:normal; stroke-width:1; font-family:'Dialog'; font-style:normal; stroke-linejoin:miter; font-size:12px; stroke-dashoffset:0; image-rendering:auto;" width="528" height="184" xmlns="http://www.w3.org/2000/svg"
+><!--Generated by the Batik Graphics2D SVG Generator--><defs id="genericDefs"
+ /><g
+ ><defs id="defs1"
+ ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath1"
+ ><path d="M0 0 L528 0 L528 184 L0 184 L0 0 Z"
+ /></clipPath
+ ></defs
+ ><g style="fill:white; font-family:sans-serif; stroke:white;"
+ ><rect x="0" y="0" width="528" style="clip-path:url(#clipPath1); stroke:none;" height="184"
+ /></g
+ ><g style="font-family:sans-serif;"
+ ><rect x="21" y="24" width="200" style="fill:none; clip-path:url(#clipPath1);" height="150"
+ /></g
+ ><g style="fill:rgb(201,243,188); fill-opacity:0.7843; font-family:sans-serif; stroke-opacity:0.7843; stroke:rgb(201,243,188);"
+ ><rect x="22" y="25" width="198" style="clip-path:url(#clipPath1); stroke:none;" height="148"
+ /><rect x="21" y="24" width="1" style="clip-path:url(#clipPath1); fill:rgb(255,255,255); stroke:none;" height="150"
+ /><rect x="22" y="24" width="198" style="clip-path:url(#clipPath1); fill:rgb(255,255,255); stroke:none;" height="1"
+ /><rect x="22" y="173" width="199" style="clip-path:url(#clipPath1); fill:rgb(140,170,131); stroke:none;" height="1"
+ /><rect x="220" y="24" width="1" style="clip-path:url(#clipPath1); fill:rgb(140,170,131); stroke:none;" height="149"
+ /></g
+ ><g style="font-family:sans-serif; font-weight:bold;"
+ ><text x="106" xml:space="preserve" y="51" style="clip-path:url(#clipPath1); stroke:none;"
+ >Alice</text
+ ><image x="191" y="39" width="15" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA8AAAAQCAYAAADJViUEAAAAYklEQVR4Xs2PWw5A
+EQxEu//F2cLdhx+SS4Xp1ONHTHIiZA4l8krSASYpfHGJ9ppEmGWU4ca2Evp+2SD9
+JWTcQZZFWUPPzctQ1nDZGWtPRrSEMJn+2cPINeYlDyb/E+yC7r1k/CUznLqz88wAAAAASUVORK5CYII=" style="clip-path:url(#clipPath1); font-weight:normal;" height="16" preserveAspectRatio="none"
+ /><rect x="208" y="85" width="26" style="clip-path:url(#clipPath1); fill:rgb(104,229,255); stroke:none;" height="26"
+ /><rect x="208" y="85" width="26" style="fill:none; clip-path:url(#clipPath1);" height="26"
+ /><polygon style="fill:none; clip-path:url(#clipPath1);" points=" 211 88 211 108 231 98"
+ /><polygon style="clip-path:url(#clipPath1); stroke:none;" points=" 211 88 211 108 231 98"
+ /><text x="208" y="84" style="clip-path:url(#clipPath1); font-weight:normal; stroke:none;" xml:space="preserve"
+ >comm</text
+ ><text x="190" y="78" style="clip-path:url(#clipPath1); font-weight:normal; stroke:none;" xml:space="preserve"
+ >???</text
+ ><ellipse style="fill:none; clip-path:url(#clipPath1);" rx="3" cx="199" ry="4.5" cy="89.5"
+ /><rect x="195" y="88" width="9" style="clip-path:url(#clipPath1); fill:gray; stroke:none;" height="7"
+ /><rect x="195" y="88" width="9" style="fill:none; clip-path:url(#clipPath1);" height="7"
+ /><rect x="208" y="142" width="26" style="clip-path:url(#clipPath1); fill:rgb(104,229,255); stroke:none;" height="26"
+ /><rect x="208" y="142" width="26" style="fill:none; clip-path:url(#clipPath1);" height="26"
+ /><polygon style="fill:none; clip-path:url(#clipPath1);" points=" 231 145 231 165 211 155"
+ /><polygon style="clip-path:url(#clipPath1); stroke:none;" points=" 231 145 231 165 211 155"
+ /><text x="208" y="141" style="clip-path:url(#clipPath1); font-weight:normal; stroke:none;" xml:space="preserve"
+ >nonce_ch</text
+ ><rect x="318" y="23" width="200" style="fill:none; clip-path:url(#clipPath1);" height="150"
+ /></g
+ ><g style="fill:rgb(201,243,188); fill-opacity:0.7843; font-family:sans-serif; stroke-opacity:0.7843; stroke:rgb(201,243,188);"
+ ><rect x="319" y="24" width="198" style="clip-path:url(#clipPath1); stroke:none;" height="148"
+ /><rect x="318" y="23" width="1" style="clip-path:url(#clipPath1); fill:rgb(255,255,255); stroke:none;" height="150"
+ /><rect x="319" y="23" width="198" style="clip-path:url(#clipPath1); fill:rgb(255,255,255); stroke:none;" height="1"
+ /><rect x="319" y="172" width="199" style="clip-path:url(#clipPath1); fill:rgb(140,170,131); stroke:none;" height="1"
+ /><rect x="517" y="23" width="1" style="clip-path:url(#clipPath1); fill:rgb(140,170,131); stroke:none;" height="149"
+ /></g
+ ><g style="font-family:sans-serif; font-weight:bold;"
+ ><text x="406" xml:space="preserve" y="50" style="clip-path:url(#clipPath1); stroke:none;"
+ >Bob</text
+ ><image x="488" y="38" width="15" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA8AAAAQCAYAAADJViUEAAAAYklEQVR4Xs2PWw5A
+EQxEu//F2cLdhx+SS4Xp1ONHTHIiZA4l8krSASYpfHGJ9ppEmGWU4ca2Evp+2SD9
+JWTcQZZFWUPPzctQ1nDZGWtPRrSEMJn+2cPINeYlDyb/E+yC7r1k/CUznLqz88wAAAAASUVORK5CYII=" style="clip-path:url(#clipPath1); font-weight:normal;" height="16" preserveAspectRatio="none"
+ /><rect x="305" y="87" width="26" style="clip-path:url(#clipPath1); fill:rgb(104,229,255); stroke:none;" height="26"
+ /><rect x="305" y="87" width="26" style="fill:none; clip-path:url(#clipPath1);" height="26"
+ /><polygon style="fill:none; clip-path:url(#clipPath1);" points=" 308 90 308 110 328 100"
+ /><polygon style="clip-path:url(#clipPath1); stroke:none;" points=" 308 90 308 110 328 100"
+ /><text x="305" y="86" style="clip-path:url(#clipPath1); font-weight:normal; stroke:none;" xml:space="preserve"
+ >comm</text
+ ><text x="293" y="95" style="clip-path:url(#clipPath1); font-weight:normal; stroke:none;" xml:space="preserve"
+ ></text
+ ><ellipse style="fill:none; clip-path:url(#clipPath1);" rx="5" cx="292" ry="7.5" cy="106.5"
+ /><polygon style="fill:gray; clip-path:url(#clipPath1); stroke:none;" points=" 285 105 285 121 301 121"
+ /><polygon style="fill:gray; clip-path:url(#clipPath1); stroke:none;" points=" 301 121 301 105 285 105"
+ /><polygon style="fill:none; clip-path:url(#clipPath1);" points=" 285 105 285 121 301 121"
+ /><polygon style="fill:none; clip-path:url(#clipPath1);" points=" 301 121 301 105 285 105"
+ /><text x="286" y="117" style="clip-path:url(#clipPath1); font-weight:normal; stroke:none;" xml:space="preserve"
+ >S</text
+ ><text x="293" y="114" style="clip-path:url(#clipPath1); font-weight:normal; stroke:none;" xml:space="preserve"
+ >W</text
+ ><rect x="305" y="144" width="26" style="clip-path:url(#clipPath1); fill:rgb(104,229,255); stroke:none;" height="26"
+ /><rect x="305" y="144" width="26" style="fill:none; clip-path:url(#clipPath1);" height="26"
+ /><polygon style="fill:none; clip-path:url(#clipPath1);" points=" 328 147 328 167 308 157"
+ /><polygon style="clip-path:url(#clipPath1); stroke:none;" points=" 328 147 328 167 308 157"
+ /><text x="305" y="143" style="clip-path:url(#clipPath1); font-weight:normal; stroke:none;" xml:space="preserve"
+ >nonce_ch</text
+ ><text x="251" y="99" style="clip-path:url(#clipPath1); font-style:italic; stroke:none; font-weight:normal;" xml:space="preserve"
+ >comm</text
+ ><line x1="234" x2="305" y1="98" style="fill:none; clip-path:url(#clipPath1);" y2="100"
+ /><text x="239" y="156" style="clip-path:url(#clipPath1); font-style:italic; stroke:none; font-weight:normal;" xml:space="preserve"
+ >nonce_ch</text
+ ><line x1="234" x2="305" y1="155" style="fill:none; clip-path:url(#clipPath1);" y2="157"
+ /></g
+ ><g style="font-family:sans-serif;"
+ ><rect x="21" width="200" height="150" y="24" style="fill:none;"
+ /></g
+ ><g style="fill:rgb(201,243,188); fill-opacity:0.7843; font-family:sans-serif; stroke-opacity:0.7843; stroke:rgb(201,243,188);"
+ ><rect x="22" width="198" height="148" y="25" style="stroke:none;"
+ /><rect x="21" y="24" width="1" style="fill:rgb(255,255,255); stroke:none;" height="150"
+ /><rect x="22" y="24" width="198" style="fill:rgb(255,255,255); stroke:none;" height="1"
+ /><rect x="22" y="173" width="199" style="fill:rgb(140,170,131); stroke:none;" height="1"
+ /><rect x="220" y="24" width="1" style="fill:rgb(140,170,131); stroke:none;" height="149"
+ /></g
+ ><g style="font-family:sans-serif; font-weight:bold;"
+ ><text x="106" xml:space="preserve" y="51" style="stroke:none;"
+ >Alice</text
+ ><image x="191" y="39" width="15" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA8AAAAQCAYAAADJViUEAAAAYklEQVR4Xs2PWw5A
+EQxEu//F2cLdhx+SS4Xp1ONHTHIiZA4l8krSASYpfHGJ9ppEmGWU4ca2Evp+2SD9
+JWTcQZZFWUPPzctQ1nDZGWtPRrSEMJn+2cPINeYlDyb/E+yC7r1k/CUznLqz88wAAAAASUVORK5CYII=" style="font-weight:normal;" height="16" preserveAspectRatio="none"
+ /><rect x="208" y="85" width="26" style="fill:rgb(104,229,255); stroke:none;" height="26"
+ /><rect x="208" width="26" height="26" y="85" style="fill:none;"
+ /><polygon style="fill:none;" points=" 211 88 211 108 231 98"
+ /><polygon style="stroke:none;" points=" 211 88 211 108 231 98"
+ /><text x="208" xml:space="preserve" y="84" style="font-weight:normal; stroke:none;"
+ >comm</text
+ ><text x="190" xml:space="preserve" y="78" style="font-weight:normal; stroke:none;"
+ >???</text
+ ><ellipse rx="3" ry="4.5" style="fill:none;" cx="199" cy="89.5"
+ /><rect x="195" y="88" width="9" style="fill:gray; stroke:none;" height="7"
+ /><rect x="195" width="9" height="7" y="88" style="fill:none;"
+ /><rect x="208" y="142" width="26" style="fill:rgb(104,229,255); stroke:none;" height="26"
+ /><rect x="208" width="26" height="26" y="142" style="fill:none;"
+ /><polygon style="fill:none;" points=" 231 145 231 165 211 155"
+ /><polygon style="stroke:none;" points=" 231 145 231 165 211 155"
+ /><text x="208" xml:space="preserve" y="141" style="font-weight:normal; stroke:none;"
+ >nonce_ch</text
+ ><rect x="318" width="200" height="150" y="23" style="fill:none;"
+ /></g
+ ><g style="fill:rgb(201,243,188); fill-opacity:0.7843; font-family:sans-serif; stroke-opacity:0.7843; stroke:rgb(201,243,188);"
+ ><rect x="319" width="198" height="148" y="24" style="stroke:none;"
+ /><rect x="318" y="23" width="1" style="fill:rgb(255,255,255); stroke:none;" height="150"
+ /><rect x="319" y="23" width="198" style="fill:rgb(255,255,255); stroke:none;" height="1"
+ /><rect x="319" y="172" width="199" style="fill:rgb(140,170,131); stroke:none;" height="1"
+ /><rect x="517" y="23" width="1" style="fill:rgb(140,170,131); stroke:none;" height="149"
+ /></g
+ ><g style="font-family:sans-serif; font-weight:bold;"
+ ><text x="406" xml:space="preserve" y="50" style="stroke:none;"
+ >Bob</text
+ ><image x="488" y="38" width="15" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA8AAAAQCAYAAADJViUEAAAAYklEQVR4Xs2PWw5A
+EQxEu//F2cLdhx+SS4Xp1ONHTHIiZA4l8krSASYpfHGJ9ppEmGWU4ca2Evp+2SD9
+JWTcQZZFWUPPzctQ1nDZGWtPRrSEMJn+2cPINeYlDyb/E+yC7r1k/CUznLqz88wAAAAASUVORK5CYII=" style="font-weight:normal;" height="16" preserveAspectRatio="none"
+ /><rect x="305" y="87" width="26" style="fill:rgb(104,229,255); stroke:none;" height="26"
+ /><rect x="305" width="26" height="26" y="87" style="fill:none;"
+ /><polygon style="fill:none;" points=" 308 90 308 110 328 100"
+ /><polygon style="stroke:none;" points=" 308 90 308 110 328 100"
+ /><text x="305" xml:space="preserve" y="86" style="font-weight:normal; stroke:none;"
+ >comm</text
+ ><text x="293" xml:space="preserve" y="95" style="font-weight:normal; stroke:none;"
+ ></text
+ ><ellipse rx="5" ry="7.5" style="fill:none;" cx="292" cy="106.5"
+ /><polygon style="fill:gray; stroke:none;" points=" 285 105 285 121 301 121"
+ /><polygon style="fill:gray; stroke:none;" points=" 301 121 301 105 285 105"
+ /><polygon style="fill:none;" points=" 285 105 285 121 301 121"
+ /><polygon style="fill:none;" points=" 301 121 301 105 285 105"
+ /><text x="286" xml:space="preserve" y="117" style="font-weight:normal; stroke:none;"
+ >S</text
+ ><text x="293" xml:space="preserve" y="114" style="font-weight:normal; stroke:none;"
+ >W</text
+ ><rect x="305" y="144" width="26" style="fill:rgb(104,229,255); stroke:none;" height="26"
+ /><rect x="305" width="26" height="26" y="144" style="fill:none;"
+ /><polygon style="fill:none;" points=" 328 147 328 167 308 157"
+ /><polygon style="stroke:none;" points=" 328 147 328 167 308 157"
+ /><text x="305" xml:space="preserve" y="143" style="font-weight:normal; stroke:none;"
+ >nonce_ch</text
+ ><text x="251" y="99" style="font-style:italic; font-weight:normal; stroke:none;" xml:space="preserve"
+ >comm</text
+ ><line y2="100" style="fill:none;" x1="234" x2="305" y1="98"
+ /><text x="239" y="156" style="font-style:italic; font-weight:normal; stroke:none;" xml:space="preserve"
+ >nonce_ch</text
+ ><line y2="157" style="fill:none;" x1="234" x2="305" y1="155"
+ /></g
+ ></g
+></svg
+>
diff --git a/modeling/SysMLSec/AliceAndBobHW.xml b/modeling/SysMLSec/AliceAndBobHW.xml
index 29929df7533cc2dcf7d6b9c8bbca7ef3a05ee7c1..bc50d7f48f095b9a3dd124f36717a2cff9adc6d2 100644
--- a/modeling/SysMLSec/AliceAndBobHW.xml
+++ b/modeling/SysMLSec/AliceAndBobHW.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<TURTLEGMODELING version="1.0beta" ANIMATE_INTERACTIVE_SIMULATION="true" ACTIVATE_PENALTIES="true" 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">
+<TURTLEGMODELING version="1.0beta" ANIMATE_INTERACTIVE_SIMULATION="true" ACTIVATE_PENALTIES="true" UPDATE_INFORMATION_DIPLO_SIM="true" ANIMATE_WITH_INFO_DIPLO_SIM="true" OPEN_DIAG_DIPLO_SIM="false" LAST_SELECTED_MAIN_TAB="1" LAST_SELECTED_SUB_TAB="0">
<Modeling type="TML Component Design" nameTab="SymmetricExchange" tabs="TML Component Task Diagram$Bob$Alice" >
<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" >
@@ -119,8 +119,8 @@
</COMPONENT>
<COMPONENT type="1009" id="31" index="2" uid="e9525fef-818f-401c-9e9a-80415e0bd1be" >
-<cdparam x="373" y="99" />
-<sizeparam width="69" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="363" y="99" />
+<sizeparam width="89" 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" />
@@ -190,8 +190,8 @@
</COMPONENT>
<COMPONENT type="1006" id="42" index="1" uid="84baff4e-e859-450c-83bd-e25e4b96fc32" >
-<cdparam x="375" y="174" />
-<sizeparam width="65" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="365" y="174" />
+<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" />
@@ -261,351 +261,421 @@
<Modeling type="TML Architecture" nameTab="SymExchangeArch" >
<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="83" index="0" uid="9bbd6629-0d72-4c80-b855-eefbf21fe944" >
+<CONNECTOR type="125" id="50" index="0" uid="5f94b712-0f31-46c3-a981-e04b56d726c3" >
+<cdparam x="586" y="449" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="{info}" />
+<P1 x="573" y="393" id="61" />
+<P2 x="573" y="352" id="209" />
+<AutomaticDrawing data="true" />
+<new d="false" />
+<extraparam>
+<info priority="0" />
+<spy value="false" />
+</extraparam>
+</CONNECTOR>
+<COMPONENT type="1105" id="84" index="1" uid="9b8bfa81-c6b2-428f-95a0-8ec4a302d5ff" >
+<cdparam x="450" y="393" />
+<sizeparam width="246" height="107" 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="ExternalMemory" value="name" />
+<new d="false" />
+<TGConnectingPoint num="0" id="60" />
+<TGConnectingPoint num="1" id="61" />
+<TGConnectingPoint num="2" id="62" />
+<TGConnectingPoint num="3" id="63" />
+<TGConnectingPoint num="4" id="64" />
+<TGConnectingPoint num="5" id="65" />
+<TGConnectingPoint num="6" id="66" />
+<TGConnectingPoint num="7" id="67" />
+<TGConnectingPoint num="8" id="68" />
+<TGConnectingPoint num="9" id="69" />
+<TGConnectingPoint num="10" id="70" />
+<TGConnectingPoint num="11" id="71" />
+<TGConnectingPoint num="12" id="72" />
+<TGConnectingPoint num="13" id="73" />
+<TGConnectingPoint num="14" id="74" />
+<TGConnectingPoint num="15" id="75" />
+<TGConnectingPoint num="16" id="76" />
+<TGConnectingPoint num="17" id="77" />
+<TGConnectingPoint num="18" id="78" />
+<TGConnectingPoint num="19" id="79" />
+<TGConnectingPoint num="20" id="80" />
+<TGConnectingPoint num="21" id="81" />
+<TGConnectingPoint num="22" id="82" />
+<TGConnectingPoint num="23" id="83" />
+<extraparam>
+<info stereotype="MEMORY" nodeName="ExternalMemory" />
+<attributes byteDataSize="4" memorySize="1024" clockRatio="1" bufferType="0" />
+</extraparam>
+</COMPONENT>
+<SUBCOMPONENT type="1103" id="59" index="15" uid="451dc10b-9cf2-4d3c-a38a-ac3e8ad62b3d" >
+<father id="84" num="0" />
+<cdparam x="467" y="436" />
+<sizeparam width="205" height="40" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="0" maxX="41" minY="0" maxY="67" />
+<infoparam name="TGComponent" value="SymmetricExchange::comm" />
+<new d="false" />
+<TGConnectingPoint num="0" id="51" />
+<TGConnectingPoint num="1" id="52" />
+<TGConnectingPoint num="2" id="53" />
+<TGConnectingPoint num="3" id="54" />
+<TGConnectingPoint num="4" id="55" />
+<TGConnectingPoint num="5" id="56" />
+<TGConnectingPoint num="6" id="57" />
+<TGConnectingPoint num="7" id="58" />
+<extraparam>
+<info value="SymmetricExchange::comm" communicationName="comm" referenceCommunicationName="SymmetricExchange" mappedElements="ExternalBus" priority="0" typeName="channel" />
+</extraparam>
+</SUBCOMPONENT>
+
+<COMPONENT type="1105" id="118" index="2" uid="9bbd6629-0d72-4c80-b855-eefbf21fe944" >
<cdparam x="838" y="169" />
<sizeparam width="120" height="96" 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="Memory1" value="name" />
<new d="false" />
-<TGConnectingPoint num="0" id="59" />
-<TGConnectingPoint num="1" id="60" />
-<TGConnectingPoint num="2" id="61" />
-<TGConnectingPoint num="3" id="62" />
-<TGConnectingPoint num="4" id="63" />
-<TGConnectingPoint num="5" id="64" />
-<TGConnectingPoint num="6" id="65" />
-<TGConnectingPoint num="7" id="66" />
-<TGConnectingPoint num="8" id="67" />
-<TGConnectingPoint num="9" id="68" />
-<TGConnectingPoint num="10" id="69" />
-<TGConnectingPoint num="11" id="70" />
-<TGConnectingPoint num="12" id="71" />
-<TGConnectingPoint num="13" id="72" />
-<TGConnectingPoint num="14" id="73" />
-<TGConnectingPoint num="15" id="74" />
-<TGConnectingPoint num="16" id="75" />
-<TGConnectingPoint num="17" id="76" />
-<TGConnectingPoint num="18" id="77" />
-<TGConnectingPoint num="19" id="78" />
-<TGConnectingPoint num="20" id="79" />
-<TGConnectingPoint num="21" id="80" />
-<TGConnectingPoint num="22" id="81" />
-<TGConnectingPoint num="23" id="82" />
+<TGConnectingPoint num="0" id="94" />
+<TGConnectingPoint num="1" id="95" />
+<TGConnectingPoint num="2" id="96" />
+<TGConnectingPoint num="3" id="97" />
+<TGConnectingPoint num="4" id="98" />
+<TGConnectingPoint num="5" id="99" />
+<TGConnectingPoint num="6" id="100" />
+<TGConnectingPoint num="7" id="101" />
+<TGConnectingPoint num="8" id="102" />
+<TGConnectingPoint num="9" id="103" />
+<TGConnectingPoint num="10" id="104" />
+<TGConnectingPoint num="11" id="105" />
+<TGConnectingPoint num="12" id="106" />
+<TGConnectingPoint num="13" id="107" />
+<TGConnectingPoint num="14" id="108" />
+<TGConnectingPoint num="15" id="109" />
+<TGConnectingPoint num="16" id="110" />
+<TGConnectingPoint num="17" id="111" />
+<TGConnectingPoint num="18" id="112" />
+<TGConnectingPoint num="19" id="113" />
+<TGConnectingPoint num="20" id="114" />
+<TGConnectingPoint num="21" id="115" />
+<TGConnectingPoint num="22" id="116" />
+<TGConnectingPoint num="23" id="117" />
<extraparam>
<info stereotype="MEMORY" nodeName="Memory1" />
<attributes byteDataSize="4" memorySize="1024" clockRatio="1" bufferType="0" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1111" id="58" index="13" uid="422aa2c5-16ec-4d55-8e9b-7c7e4cfa7977" >
-<father id="83" num="0" />
+<SUBCOMPONENT type="1111" id="93" index="16" uid="422aa2c5-16ec-4d55-8e9b-7c7e4cfa7977" >
+<father id="118" num="0" />
<cdparam x="854" y="212" />
<sizeparam width="75" height="40" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="45" minY="0" maxY="56" />
<infoparam name="TGComponent" value="sym" />
<new d="false" />
-<TGConnectingPoint num="0" id="50" />
-<TGConnectingPoint num="1" id="51" />
-<TGConnectingPoint num="2" id="52" />
-<TGConnectingPoint num="3" id="53" />
-<TGConnectingPoint num="4" id="54" />
-<TGConnectingPoint num="5" id="55" />
-<TGConnectingPoint num="6" id="56" />
-<TGConnectingPoint num="7" id="57" />
+<TGConnectingPoint num="0" id="85" />
+<TGConnectingPoint num="1" id="86" />
+<TGConnectingPoint num="2" id="87" />
+<TGConnectingPoint num="3" id="88" />
+<TGConnectingPoint num="4" id="89" />
+<TGConnectingPoint num="5" id="90" />
+<TGConnectingPoint num="6" id="91" />
+<TGConnectingPoint num="7" id="92" />
<extraparam>
<info value="sym" referenceKeyName="sym" priority="0" typeName="key" />
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="1105" id="117" index="1" uid="7ee250ff-ec9a-4c2d-8a71-284270576d2e" >
+<COMPONENT type="1105" id="152" index="3" uid="7ee250ff-ec9a-4c2d-8a71-284270576d2e" >
<cdparam x="207" y="248" />
<sizeparam width="109" height="97" 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="Memory0" value="name" />
<new d="false" />
-<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" />
-<TGConnectingPoint num="16" id="109" />
-<TGConnectingPoint num="17" id="110" />
-<TGConnectingPoint num="18" id="111" />
-<TGConnectingPoint num="19" id="112" />
-<TGConnectingPoint num="20" id="113" />
-<TGConnectingPoint num="21" id="114" />
-<TGConnectingPoint num="22" id="115" />
-<TGConnectingPoint num="23" id="116" />
+<TGConnectingPoint num="0" id="128" />
+<TGConnectingPoint num="1" id="129" />
+<TGConnectingPoint num="2" id="130" />
+<TGConnectingPoint num="3" id="131" />
+<TGConnectingPoint num="4" id="132" />
+<TGConnectingPoint num="5" id="133" />
+<TGConnectingPoint num="6" id="134" />
+<TGConnectingPoint num="7" id="135" />
+<TGConnectingPoint num="8" id="136" />
+<TGConnectingPoint num="9" id="137" />
+<TGConnectingPoint num="10" id="138" />
+<TGConnectingPoint num="11" id="139" />
+<TGConnectingPoint num="12" id="140" />
+<TGConnectingPoint num="13" id="141" />
+<TGConnectingPoint num="14" id="142" />
+<TGConnectingPoint num="15" id="143" />
+<TGConnectingPoint num="16" id="144" />
+<TGConnectingPoint num="17" id="145" />
+<TGConnectingPoint num="18" id="146" />
+<TGConnectingPoint num="19" id="147" />
+<TGConnectingPoint num="20" id="148" />
+<TGConnectingPoint num="21" id="149" />
+<TGConnectingPoint num="22" id="150" />
+<TGConnectingPoint num="23" id="151" />
<extraparam>
<info stereotype="MEMORY" nodeName="Memory0" />
<attributes byteDataSize="4" memorySize="1024" clockRatio="1" bufferType="0" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1111" id="92" index="14" uid="97489a5a-d1e7-44cc-8ef1-f50e12d7e02d" >
-<father id="117" num="0" />
+<SUBCOMPONENT type="1111" id="127" index="17" uid="97489a5a-d1e7-44cc-8ef1-f50e12d7e02d" >
+<father id="152" num="0" />
<cdparam x="221" y="297" />
<sizeparam width="75" height="40" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="34" minY="0" maxY="57" />
<infoparam name="TGComponent" value="sym" />
<new d="false" />
-<TGConnectingPoint num="0" id="84" />
-<TGConnectingPoint num="1" id="85" />
-<TGConnectingPoint num="2" id="86" />
-<TGConnectingPoint num="3" id="87" />
-<TGConnectingPoint num="4" id="88" />
-<TGConnectingPoint num="5" id="89" />
-<TGConnectingPoint num="6" id="90" />
-<TGConnectingPoint num="7" id="91" />
+<TGConnectingPoint num="0" id="119" />
+<TGConnectingPoint num="1" id="120" />
+<TGConnectingPoint num="2" id="121" />
+<TGConnectingPoint num="3" id="122" />
+<TGConnectingPoint num="4" id="123" />
+<TGConnectingPoint num="5" id="124" />
+<TGConnectingPoint num="6" id="125" />
+<TGConnectingPoint num="7" id="126" />
<extraparam>
<info value="sym" referenceKeyName="sym" priority="5" typeName="key" />
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="1102" id="142" index="2" uid="e38115d9-ae34-4d4d-b4ba-87ecb8879363" >
+<COMPONENT type="1102" id="177" index="4" uid="e38115d9-ae34-4d4d-b4ba-87ecb8879363" >
<cdparam x="191" y="182" />
<sizeparam width="140" height="50" 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="Bus0" value="name" />
<new d="false" />
-<TGConnectingPoint num="0" id="118" />
-<TGConnectingPoint num="1" id="119" />
-<TGConnectingPoint num="2" id="120" />
-<TGConnectingPoint num="3" id="121" />
-<TGConnectingPoint num="4" id="122" />
-<TGConnectingPoint num="5" id="123" />
-<TGConnectingPoint num="6" id="124" />
-<TGConnectingPoint num="7" id="125" />
-<TGConnectingPoint num="8" id="126" />
-<TGConnectingPoint num="9" id="127" />
-<TGConnectingPoint num="10" id="128" />
-<TGConnectingPoint num="11" id="129" />
-<TGConnectingPoint num="12" id="130" />
-<TGConnectingPoint num="13" id="131" />
-<TGConnectingPoint num="14" id="132" />
-<TGConnectingPoint num="15" id="133" />
-<TGConnectingPoint num="16" id="134" />
-<TGConnectingPoint num="17" id="135" />
-<TGConnectingPoint num="18" id="136" />
-<TGConnectingPoint num="19" id="137" />
-<TGConnectingPoint num="20" id="138" />
-<TGConnectingPoint num="21" id="139" />
-<TGConnectingPoint num="22" id="140" />
-<TGConnectingPoint num="23" id="141" />
+<TGConnectingPoint num="0" id="153" />
+<TGConnectingPoint num="1" id="154" />
+<TGConnectingPoint num="2" id="155" />
+<TGConnectingPoint num="3" id="156" />
+<TGConnectingPoint num="4" id="157" />
+<TGConnectingPoint num="5" id="158" />
+<TGConnectingPoint num="6" id="159" />
+<TGConnectingPoint num="7" id="160" />
+<TGConnectingPoint num="8" id="161" />
+<TGConnectingPoint num="9" id="162" />
+<TGConnectingPoint num="10" id="163" />
+<TGConnectingPoint num="11" id="164" />
+<TGConnectingPoint num="12" id="165" />
+<TGConnectingPoint num="13" id="166" />
+<TGConnectingPoint num="14" id="167" />
+<TGConnectingPoint num="15" id="168" />
+<TGConnectingPoint num="16" id="169" />
+<TGConnectingPoint num="17" id="170" />
+<TGConnectingPoint num="18" id="171" />
+<TGConnectingPoint num="19" id="172" />
+<TGConnectingPoint num="20" id="173" />
+<TGConnectingPoint num="21" id="174" />
+<TGConnectingPoint num="22" id="175" />
+<TGConnectingPoint num="23" id="176" />
<extraparam>
<info stereotype="BUS-RR" nodeName="Bus0" />
<attributes byteDataSize="4" arbitrationPolicy="0" sliceTime="10000" pipelineSize="1" burstSize="100" clockRatio="1" privacy="1" referenceAttack="" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1102" id="167" index="3" uid="c857fc98-01a1-4a3e-a3eb-41736d1e1c9c" >
+<COMPONENT type="1102" id="202" index="5" uid="c857fc98-01a1-4a3e-a3eb-41736d1e1c9c" >
<cdparam x="760" y="287" />
<sizeparam width="165" height="50" 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="Bus1" value="name" />
<new d="false" />
-<TGConnectingPoint num="0" id="143" />
-<TGConnectingPoint num="1" id="144" />
-<TGConnectingPoint num="2" id="145" />
-<TGConnectingPoint num="3" id="146" />
-<TGConnectingPoint num="4" id="147" />
-<TGConnectingPoint num="5" id="148" />
-<TGConnectingPoint num="6" id="149" />
-<TGConnectingPoint num="7" id="150" />
-<TGConnectingPoint num="8" id="151" />
-<TGConnectingPoint num="9" id="152" />
-<TGConnectingPoint num="10" id="153" />
-<TGConnectingPoint num="11" id="154" />
-<TGConnectingPoint num="12" id="155" />
-<TGConnectingPoint num="13" id="156" />
-<TGConnectingPoint num="14" id="157" />
-<TGConnectingPoint num="15" id="158" />
-<TGConnectingPoint num="16" id="159" />
-<TGConnectingPoint num="17" id="160" />
-<TGConnectingPoint num="18" id="161" />
-<TGConnectingPoint num="19" id="162" />
-<TGConnectingPoint num="20" id="163" />
-<TGConnectingPoint num="21" id="164" />
-<TGConnectingPoint num="22" id="165" />
-<TGConnectingPoint num="23" id="166" />
+<TGConnectingPoint num="0" id="178" />
+<TGConnectingPoint num="1" id="179" />
+<TGConnectingPoint num="2" id="180" />
+<TGConnectingPoint num="3" id="181" />
+<TGConnectingPoint num="4" id="182" />
+<TGConnectingPoint num="5" id="183" />
+<TGConnectingPoint num="6" id="184" />
+<TGConnectingPoint num="7" id="185" />
+<TGConnectingPoint num="8" id="186" />
+<TGConnectingPoint num="9" id="187" />
+<TGConnectingPoint num="10" id="188" />
+<TGConnectingPoint num="11" id="189" />
+<TGConnectingPoint num="12" id="190" />
+<TGConnectingPoint num="13" id="191" />
+<TGConnectingPoint num="14" id="192" />
+<TGConnectingPoint num="15" id="193" />
+<TGConnectingPoint num="16" id="194" />
+<TGConnectingPoint num="17" id="195" />
+<TGConnectingPoint num="18" id="196" />
+<TGConnectingPoint num="19" id="197" />
+<TGConnectingPoint num="20" id="198" />
+<TGConnectingPoint num="21" id="199" />
+<TGConnectingPoint num="22" id="200" />
+<TGConnectingPoint num="23" id="201" />
<extraparam>
<info stereotype="BUS-RR" nodeName="Bus1" />
<attributes byteDataSize="4" arbitrationPolicy="0" sliceTime="10000" pipelineSize="1" burstSize="100" clockRatio="1" privacy="1" referenceAttack="" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1102" id="192" index="4" uid="5155c761-14dd-49d4-8cec-deeefe38ed48" >
+<COMPONENT type="1102" id="227" index="6" uid="5155c761-14dd-49d4-8cec-deeefe38ed48" >
<cdparam x="488" y="302" />
<sizeparam width="170" height="50" 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="ExternalBus" value="name" />
<new d="false" />
-<TGConnectingPoint num="0" id="168" />
-<TGConnectingPoint num="1" id="169" />
-<TGConnectingPoint num="2" id="170" />
-<TGConnectingPoint num="3" id="171" />
-<TGConnectingPoint num="4" id="172" />
-<TGConnectingPoint num="5" id="173" />
-<TGConnectingPoint num="6" id="174" />
-<TGConnectingPoint num="7" id="175" />
-<TGConnectingPoint num="8" id="176" />
-<TGConnectingPoint num="9" id="177" />
-<TGConnectingPoint num="10" id="178" />
-<TGConnectingPoint num="11" id="179" />
-<TGConnectingPoint num="12" id="180" />
-<TGConnectingPoint num="13" id="181" />
-<TGConnectingPoint num="14" id="182" />
-<TGConnectingPoint num="15" id="183" />
-<TGConnectingPoint num="16" id="184" />
-<TGConnectingPoint num="17" id="185" />
-<TGConnectingPoint num="18" id="186" />
-<TGConnectingPoint num="19" id="187" />
-<TGConnectingPoint num="20" id="188" />
-<TGConnectingPoint num="21" id="189" />
-<TGConnectingPoint num="22" id="190" />
-<TGConnectingPoint num="23" id="191" />
+<TGConnectingPoint num="0" id="203" />
+<TGConnectingPoint num="1" id="204" />
+<TGConnectingPoint num="2" id="205" />
+<TGConnectingPoint num="3" id="206" />
+<TGConnectingPoint num="4" id="207" />
+<TGConnectingPoint num="5" id="208" />
+<TGConnectingPoint num="6" id="209" />
+<TGConnectingPoint num="7" id="210" />
+<TGConnectingPoint num="8" id="211" />
+<TGConnectingPoint num="9" id="212" />
+<TGConnectingPoint num="10" id="213" />
+<TGConnectingPoint num="11" id="214" />
+<TGConnectingPoint num="12" id="215" />
+<TGConnectingPoint num="13" id="216" />
+<TGConnectingPoint num="14" id="217" />
+<TGConnectingPoint num="15" id="218" />
+<TGConnectingPoint num="16" id="219" />
+<TGConnectingPoint num="17" id="220" />
+<TGConnectingPoint num="18" id="221" />
+<TGConnectingPoint num="19" id="222" />
+<TGConnectingPoint num="20" id="223" />
+<TGConnectingPoint num="21" id="224" />
+<TGConnectingPoint num="22" id="225" />
+<TGConnectingPoint num="23" id="226" />
<extraparam>
<info stereotype="BUS-RR" nodeName="ExternalBus" />
<attributes byteDataSize="4" arbitrationPolicy="0" sliceTime="10000" pipelineSize="1" burstSize="100" clockRatio="1" privacy="0" referenceAttack="" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1100" id="226" index="5" uid="996ff496-ed4f-46de-9a37-59ed154fd762" >
+<COMPONENT type="1100" id="261" index="7" uid="996ff496-ed4f-46de-9a37-59ed154fd762" >
<cdparam x="612" y="169" />
<sizeparam width="208" height="101" 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="CPUAlice" value="name" />
<new d="false" />
-<TGConnectingPoint num="0" id="202" />
-<TGConnectingPoint num="1" id="203" />
-<TGConnectingPoint num="2" id="204" />
-<TGConnectingPoint num="3" id="205" />
-<TGConnectingPoint num="4" id="206" />
-<TGConnectingPoint num="5" id="207" />
-<TGConnectingPoint num="6" id="208" />
-<TGConnectingPoint num="7" id="209" />
-<TGConnectingPoint num="8" id="210" />
-<TGConnectingPoint num="9" id="211" />
-<TGConnectingPoint num="10" id="212" />
-<TGConnectingPoint num="11" id="213" />
-<TGConnectingPoint num="12" id="214" />
-<TGConnectingPoint num="13" id="215" />
-<TGConnectingPoint num="14" id="216" />
-<TGConnectingPoint num="15" id="217" />
-<TGConnectingPoint num="16" id="218" />
-<TGConnectingPoint num="17" id="219" />
-<TGConnectingPoint num="18" id="220" />
-<TGConnectingPoint num="19" id="221" />
-<TGConnectingPoint num="20" id="222" />
-<TGConnectingPoint num="21" id="223" />
-<TGConnectingPoint num="22" id="224" />
-<TGConnectingPoint num="23" id="225" />
+<TGConnectingPoint num="0" id="237" />
+<TGConnectingPoint num="1" id="238" />
+<TGConnectingPoint num="2" id="239" />
+<TGConnectingPoint num="3" id="240" />
+<TGConnectingPoint num="4" id="241" />
+<TGConnectingPoint num="5" id="242" />
+<TGConnectingPoint num="6" id="243" />
+<TGConnectingPoint num="7" id="244" />
+<TGConnectingPoint num="8" id="245" />
+<TGConnectingPoint num="9" id="246" />
+<TGConnectingPoint num="10" id="247" />
+<TGConnectingPoint num="11" id="248" />
+<TGConnectingPoint num="12" id="249" />
+<TGConnectingPoint num="13" id="250" />
+<TGConnectingPoint num="14" id="251" />
+<TGConnectingPoint num="15" id="252" />
+<TGConnectingPoint num="16" id="253" />
+<TGConnectingPoint num="17" id="254" />
+<TGConnectingPoint num="18" id="255" />
+<TGConnectingPoint num="19" id="256" />
+<TGConnectingPoint num="20" id="257" />
+<TGConnectingPoint num="21" id="258" />
+<TGConnectingPoint num="22" id="259" />
+<TGConnectingPoint num="23" id="260" />
<extraparam>
<info stereotype="CPURR" nodeName="CPUAlice" />
<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="201" index="15" uid="f674a140-5ccb-406b-9463-1604971b8eba" >
-<father id="226" num="0" />
+<SUBCOMPONENT type="1101" id="236" index="18" uid="f674a140-5ccb-406b-9463-1604971b8eba" >
+<father id="261" num="0" />
<cdparam x="618" y="211" />
-<sizeparam width="184" height="40" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="197" height="40" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="24" minY="0" maxY="61" />
+<cdrectangleparam minX="0" maxX="11" minY="0" maxY="61" />
<infoparam name="TGComponent" value="SymmetricExchange::Alice" />
<new d="false" />
-<TGConnectingPoint num="0" id="193" />
-<TGConnectingPoint num="1" id="194" />
-<TGConnectingPoint num="2" id="195" />
-<TGConnectingPoint num="3" id="196" />
-<TGConnectingPoint num="4" id="197" />
-<TGConnectingPoint num="5" id="198" />
-<TGConnectingPoint num="6" id="199" />
-<TGConnectingPoint num="7" id="200" />
+<TGConnectingPoint num="0" id="228" />
+<TGConnectingPoint num="1" id="229" />
+<TGConnectingPoint num="2" id="230" />
+<TGConnectingPoint num="3" id="231" />
+<TGConnectingPoint num="4" id="232" />
+<TGConnectingPoint num="5" id="233" />
+<TGConnectingPoint num="6" id="234" />
+<TGConnectingPoint num="7" id="235" />
<extraparam>
<info value="SymmetricExchange::Alice" taskName="Alice" referenceTaskName="SymmetricExchange" priority="0" operationMEC="A" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="1100" id="260" index="6" uid="607cd3f1-2843-4b55-822c-94d536bca415" >
+<COMPONENT type="1100" id="295" index="8" uid="607cd3f1-2843-4b55-822c-94d536bca415" >
<cdparam x="376" y="176" />
<sizeparam width="212" height="102" 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="CPUBob" value="name" />
<new d="false" />
-<TGConnectingPoint num="0" id="236" />
-<TGConnectingPoint num="1" id="237" />
-<TGConnectingPoint num="2" id="238" />
-<TGConnectingPoint num="3" id="239" />
-<TGConnectingPoint num="4" id="240" />
-<TGConnectingPoint num="5" id="241" />
-<TGConnectingPoint num="6" id="242" />
-<TGConnectingPoint num="7" id="243" />
-<TGConnectingPoint num="8" id="244" />
-<TGConnectingPoint num="9" id="245" />
-<TGConnectingPoint num="10" id="246" />
-<TGConnectingPoint num="11" id="247" />
-<TGConnectingPoint num="12" id="248" />
-<TGConnectingPoint num="13" id="249" />
-<TGConnectingPoint num="14" id="250" />
-<TGConnectingPoint num="15" id="251" />
-<TGConnectingPoint num="16" id="252" />
-<TGConnectingPoint num="17" id="253" />
-<TGConnectingPoint num="18" id="254" />
-<TGConnectingPoint num="19" id="255" />
-<TGConnectingPoint num="20" id="256" />
-<TGConnectingPoint num="21" id="257" />
-<TGConnectingPoint num="22" id="258" />
-<TGConnectingPoint num="23" id="259" />
+<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" />
+<TGConnectingPoint num="16" id="287" />
+<TGConnectingPoint num="17" id="288" />
+<TGConnectingPoint num="18" id="289" />
+<TGConnectingPoint num="19" id="290" />
+<TGConnectingPoint num="20" id="291" />
+<TGConnectingPoint num="21" id="292" />
+<TGConnectingPoint num="22" id="293" />
+<TGConnectingPoint num="23" id="294" />
<extraparam>
<info stereotype="CPURR" nodeName="CPUBob" />
<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="235" index="16" uid="e61b13ce-d6e7-46d3-b809-a9be0c91d340" >
-<father id="260" num="0" />
+<SUBCOMPONENT type="1101" id="270" index="19" uid="e61b13ce-d6e7-46d3-b809-a9be0c91d340" >
+<father id="295" num="0" />
<cdparam x="388" y="228" />
-<sizeparam width="179" height="40" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="192" height="40" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="33" minY="0" maxY="62" />
+<cdrectangleparam minX="0" maxX="20" minY="0" maxY="62" />
<infoparam name="TGComponent" value="SymmetricExchange::Bob" />
<new d="false" />
-<TGConnectingPoint num="0" id="227" />
-<TGConnectingPoint num="1" id="228" />
-<TGConnectingPoint num="2" id="229" />
-<TGConnectingPoint num="3" id="230" />
-<TGConnectingPoint num="4" id="231" />
-<TGConnectingPoint num="5" id="232" />
-<TGConnectingPoint num="6" id="233" />
-<TGConnectingPoint num="7" id="234" />
+<TGConnectingPoint num="0" id="262" />
+<TGConnectingPoint num="1" id="263" />
+<TGConnectingPoint num="2" id="264" />
+<TGConnectingPoint num="3" id="265" />
+<TGConnectingPoint num="4" id="266" />
+<TGConnectingPoint num="5" id="267" />
+<TGConnectingPoint num="6" id="268" />
+<TGConnectingPoint num="7" id="269" />
<extraparam>
<info value="SymmetricExchange::Bob" taskName="Bob" referenceTaskName="SymmetricExchange" priority="0" operationMEC="B" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="125" id="261" index="7" uid="ce3b5c88-f4a7-4945-94fb-df5e651f113c" >
+<CONNECTOR type="125" id="296" index="9" uid="ce3b5c88-f4a7-4945-94fb-df5e651f113c" >
<cdparam x="700" y="273" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="{info}" />
-<P1 x="664" y="270" id="216" />
-<P2 x="615" y="302" id="177" />
+<P1 x="664" y="270" id="251" />
+<P2 x="615" y="302" id="212" />
<AutomaticDrawing data="true" />
<new d="false" />
<extraparam>
@@ -613,12 +683,12 @@
<spy value="false" />
</extraparam>
</CONNECTOR>
-<CONNECTOR type="125" id="262" index="8" uid="62f5c9ab-a6b6-4484-b20b-5131cbf3d63a" >
+<CONNECTOR type="125" id="297" index="10" uid="62f5c9ab-a6b6-4484-b20b-5131cbf3d63a" >
<cdparam x="348" y="226" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="{info}" />
-<P1 x="376" y="227" id="239" />
-<P2 x="331" y="207" id="122" />
+<P1 x="376" y="227" id="274" />
+<P2 x="331" y="207" id="157" />
<AutomaticDrawing data="true" />
<new d="false" />
<extraparam>
@@ -626,12 +696,12 @@
<spy value="false" />
</extraparam>
</CONNECTOR>
-<CONNECTOR type="125" id="263" index="9" uid="b215b7c9-d691-46c8-808a-5296276d4ae2" >
+<CONNECTOR type="125" id="298" index="11" uid="b215b7c9-d691-46c8-808a-5296276d4ae2" >
<cdparam x="879" y="288" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="{info}" />
-<P1 x="768" y="270" id="217" />
-<P2 x="760" y="312" id="146" />
+<P1 x="768" y="270" id="252" />
+<P2 x="760" y="312" id="181" />
<AutomaticDrawing data="true" />
<new d="false" />
<extraparam>
@@ -639,12 +709,12 @@
<spy value="false" />
</extraparam>
</CONNECTOR>
-<CONNECTOR type="125" id="264" index="10" uid="b6dddd3d-c372-4b3d-b1e2-53d883130029" >
+<CONNECTOR type="125" id="299" index="12" uid="b6dddd3d-c372-4b3d-b1e2-53d883130029" >
<cdparam x="1218" y="258" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="{info}" />
-<P1 x="898" y="265" id="65" />
-<P2 x="883" y="287" id="152" />
+<P1 x="898" y="265" id="100" />
+<P2 x="883" y="287" id="187" />
<AutomaticDrawing data="true" />
<new d="false" />
<extraparam>
@@ -652,12 +722,12 @@
<spy value="false" />
</extraparam>
</CONNECTOR>
-<CONNECTOR type="125" id="265" index="11" uid="94f3095b-16f9-4d3d-85ee-83c9ed858657" >
+<CONNECTOR type="125" id="300" index="13" uid="94f3095b-16f9-4d3d-85ee-83c9ed858657" >
<cdparam x="17" y="248" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="{info}" />
-<P1 x="261" y="248" id="94" />
-<P2 x="261" y="232" id="124" />
+<P1 x="261" y="248" id="129" />
+<P2 x="261" y="232" id="159" />
<AutomaticDrawing data="true" />
<new d="false" />
<extraparam>
@@ -665,12 +735,12 @@
<spy value="false" />
</extraparam>
</CONNECTOR>
-<CONNECTOR type="125" id="266" index="12" uid="5fb5d921-32b7-40bd-9ea9-2daa0df0353a" >
+<CONNECTOR type="125" id="301" index="14" uid="5fb5d921-32b7-40bd-9ea9-2daa0df0353a" >
<cdparam x="525" y="278" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="{info}" />
-<P1 x="429" y="278" id="250" />
-<P2 x="530" y="302" id="176" />
+<P1 x="429" y="278" id="285" />
+<P2 x="530" y="302" id="211" />
<AutomaticDrawing data="true" />
<new d="false" />
<extraparam>
@@ -688,54 +758,54 @@
<Modeling type="TML Component Design" nameTab="nonce" tabs="TML Component Task Diagram$Bob$Alice" >
<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="267" index="0" uid="3656b69c-1b7f-413a-b969-cf7484a2f5af" >
-<cdparam x="405" y="223" />
+<CONNECTOR type="126" id="302" index="0" uid="3656b69c-1b7f-413a-b969-cf7484a2f5af" >
+<cdparam x="579" y="304" />
<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="392" y="210" id="282" />
-<P2 x="479" y="210" id="269" />
+<P1 x="578" y="305" id="317" />
+<P2 x="675" y="307" id="304" />
<AutomaticDrawing data="true" />
<new d="false" />
</CONNECTOR>
-<CONNECTOR type="126" id="268" index="1" uid="ce45e918-ce2a-4c73-b016-080f835a461e" >
-<cdparam x="405" y="166" />
+<CONNECTOR type="126" id="303" index="1" uid="ce45e918-ce2a-4c73-b016-080f835a461e" >
+<cdparam x="579" y="247" />
<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="392" y="153" id="284" />
-<P2 x="479" y="153" id="271" />
+<P1 x="578" y="248" id="319" />
+<P2 x="675" y="250" id="306" />
<AutomaticDrawing data="true" />
<new d="false" />
</CONNECTOR>
-<COMPONENT type="1202" id="281" index="2" uid="74da1506-735e-4423-84c6-1af067bf29bf" >
-<cdparam x="479" y="103" />
+<COMPONENT type="1202" id="316" index="2" uid="74da1506-735e-4423-84c6-1af067bf29bf" >
+<cdparam x="675" y="186" />
<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="Bob" />
<new d="false" />
-<TGConnectingPoint num="0" id="273" />
-<TGConnectingPoint num="1" id="274" />
-<TGConnectingPoint num="2" id="275" />
-<TGConnectingPoint num="3" id="276" />
-<TGConnectingPoint num="4" id="277" />
-<TGConnectingPoint num="5" id="278" />
-<TGConnectingPoint num="6" id="279" />
-<TGConnectingPoint num="7" id="280" />
+<TGConnectingPoint num="0" id="308" />
+<TGConnectingPoint num="1" id="309" />
+<TGConnectingPoint num="2" id="310" />
+<TGConnectingPoint num="3" id="311" />
+<TGConnectingPoint num="4" id="312" />
+<TGConnectingPoint num="5" id="313" />
+<TGConnectingPoint num="6" id="314" />
+<TGConnectingPoint num="7" id="315" />
<extraparam>
-<Data isAttacker="No" daemon="false" periodic="false" periodValue="" unit="" Operation="" />
+<Data isAttacker="No" daemon="false" periodic="false" periodValue="" unit="ns" Operation="" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1203" id="270" index="4" uid="51750582-e1e1-4312-b5cd-7df1a7d7406b" >
-<father id="281" num="0" />
-<cdparam x="466" y="210" />
+<SUBCOMPONENT type="1203" id="305" index="4" uid="51750582-e1e1-4312-b5cd-7df1a7d7406b" >
+<father id="316" num="0" />
+<cdparam x="662" y="307" />
<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 comm2" />
+<infoparam name="Primitive port" value="Channel nonce_ch" />
<new d="false" />
-<TGConnectingPoint num="0" id="269" />
+<TGConnectingPoint num="0" id="304" />
<extraparam>
-<Prop commName="comm2" commType="0" origin="false" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="uint_16" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="0" />
+<Prop commName="nonce_ch" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" 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="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -743,17 +813,17 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="272" index="5" uid="9d1ca055-9db7-4a6a-9383-f61effd98d5a" >
-<father id="281" num="1" />
-<cdparam x="466" y="153" />
+<SUBCOMPONENT type="1203" id="307" index="5" uid="9d1ca055-9db7-4a6a-9383-f61effd98d5a" >
+<father id="316" num="1" />
+<cdparam x="662" y="250" />
<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" />
<new d="false" />
-<TGConnectingPoint num="0" id="271" />
+<TGConnectingPoint num="0" id="306" />
<extraparam>
-<Prop commName="comm" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="uint_16" associatedEvent="" checkConf="true" checkConfStatus="1" checkAuth="true" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="0" />
+<Prop commName="comm" commType="0" origin="false" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="null" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="true" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -762,36 +832,36 @@
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="1202" id="294" index="3" uid="70cba194-5b2b-4f42-a95c-91195a7b1de4" >
-<cdparam x="192" y="92" />
+<COMPONENT type="1202" id="329" index="3" uid="70cba194-5b2b-4f42-a95c-91195a7b1de4" >
+<cdparam x="378" y="187" />
<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="Alice" />
<new d="false" />
-<TGConnectingPoint num="0" id="286" />
-<TGConnectingPoint num="1" id="287" />
-<TGConnectingPoint num="2" id="288" />
-<TGConnectingPoint num="3" id="289" />
-<TGConnectingPoint num="4" id="290" />
-<TGConnectingPoint num="5" id="291" />
-<TGConnectingPoint num="6" id="292" />
-<TGConnectingPoint num="7" id="293" />
+<TGConnectingPoint num="0" id="321" />
+<TGConnectingPoint num="1" id="322" />
+<TGConnectingPoint num="2" id="323" />
+<TGConnectingPoint num="3" id="324" />
+<TGConnectingPoint num="4" id="325" />
+<TGConnectingPoint num="5" id="326" />
+<TGConnectingPoint num="6" id="327" />
+<TGConnectingPoint num="7" id="328" />
<extraparam>
<Data isAttacker="No" daemon="false" periodic="false" periodValue="" unit="" Operation="" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1203" id="283" index="6" uid="e9063b2a-dce8-42e3-aa61-541f85c3e9ab" >
-<father id="294" num="0" />
-<cdparam x="379" y="210" />
+<SUBCOMPONENT type="1203" id="318" index="6" uid="e9063b2a-dce8-42e3-aa61-541f85c3e9ab" >
+<father id="329" num="0" />
+<cdparam x="565" y="305" />
<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 comm2" />
+<infoparam name="Primitive port" value="Channel nonce_ch" />
<new d="false" />
-<TGConnectingPoint num="0" id="282" />
+<TGConnectingPoint num="0" id="317" />
<extraparam>
-<Prop commName="comm2" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="uint_16" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="0" />
+<Prop commName="nonce_ch" commType="0" origin="false" finite="false" blocking="false" maxSamples="8" widthSamples="4" 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="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -799,17 +869,17 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="285" index="7" uid="9594c490-091c-43b7-8fe0-90dec6ff493f" >
-<father id="294" num="1" />
-<cdparam x="379" y="153" />
+<SUBCOMPONENT type="1203" id="320" index="7" uid="9594c490-091c-43b7-8fe0-90dec6ff493f" >
+<father id="329" num="1" />
+<cdparam x="565" y="248" />
<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" />
<new d="false" />
-<TGConnectingPoint num="0" id="284" />
+<TGConnectingPoint num="0" id="319" />
<extraparam>
-<Prop commName="comm" commType="0" origin="false" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="uint_16" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="true" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="0" />
+<Prop commName="comm" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" 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="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -822,104 +892,128 @@
</TMLComponentTaskDiagramPanel>
<TMLActivityDiagramPanel name="Bob" minX="10" maxX="2500" minY="10" maxY="1500" zoom="1.0" >
-<COMPONENT type="1035" id="297" index="0" uid="1ca64b00-aa42-437c-9a4c-c39f243c9ae8" >
-<cdparam x="399" y="313" />
+<COMPONENT type="1036" id="332" index="0" uid="ea111ff9-ac45-4065-87ca-b82a38ecaa71" >
+<cdparam x="496" y="297" />
+<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" />
+<new d="false" />
+<TGConnectingPoint num="0" id="330" />
+<TGConnectingPoint num="1" id="331" />
+<extraparam>
+<Data secPattern="symN" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="1035" id="335" index="1" uid="e6b8db9b-f1e1-443d-be26-b4990a5a2c36" >
+<cdparam x="494" y="125" />
<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" />
<new d="false" />
-<TGConnectingPoint num="0" id="295" />
-<TGConnectingPoint num="1" id="296" />
+<TGConnectingPoint num="0" id="333" />
+<TGConnectingPoint num="1" id="334" />
<extraparam>
-<Data secContext="sym" type="Symmetric Encryption" overhead="" size="" encTime="100" decTime="100" nonce="n" key="" algorithm="" />
+<Data secContext="n" type="Nonce" overhead="" size="11" encTime="100" decTime="100" nonce="" key="" algorithm="" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1009" id="300" index="1" uid="18cbeb36-b5de-40a9-85d8-b22b471c2a6c" >
-<cdparam x="368" y="251" />
-<sizeparam width="77" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1006" id="338" index="2" uid="2792d97d-894f-43ed-ac16-712cff88b99c" >
+<cdparam x="448" y="194" />
+<sizeparam width="108" 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="comm2(1) " />
+<infoparam name="write channel" value="nonce_ch(1)" />
<new d="false" />
-<TGConnectingPoint num="0" id="298" />
-<TGConnectingPoint num="1" id="299" />
+<TGConnectingPoint num="0" id="336" />
+<TGConnectingPoint num="1" id="337" />
<extraparam>
-<Data channelName="comm2" nbOfSamples="1" secPattern="n" isAttacker="No" isEncForm="Yes" />
+<Data channelName="nonce_ch" nbOfSamples="1" secPattern="n" isAttacker="No" isEncForm="Yes" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1001" id="302" index="2" uid="ecda9636-ed3d-49e1-97dd-95559723e1ab" >
-<cdparam x="396" y="456" />
+<COMPONENT type="1001" id="340" index="3" uid="74816b9f-56d1-4f6b-a0fb-a77ab2436331" >
+<cdparam x="494" y="365" />
<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" />
<new d="false" />
-<TGConnectingPoint num="0" id="301" />
+<TGConnectingPoint num="0" id="339" />
</COMPONENT>
-<COMPONENT type="1006" id="305" index="3" uid="6cfdbe7e-0941-4e76-8966-4cd0be87c671" >
-<cdparam x="374" y="391" />
-<sizeparam width="65" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1009" id="343" index="4" uid="f97426b7-1a3c-4d0b-9a95-a5225de221bc" >
+<cdparam x="459" y="242" />
+<sizeparam width="89" 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)" />
+<infoparam name="read channel" value="comm(1) " />
<new d="false" />
-<TGConnectingPoint num="0" id="303" />
-<TGConnectingPoint num="1" id="304" />
+<TGConnectingPoint num="0" id="341" />
+<TGConnectingPoint num="1" id="342" />
<extraparam>
-<Data channelName="comm" nbOfSamples="1" secPattern="sym" isAttacker="No" isEncForm="Yes" />
+<Data channelName="comm" nbOfSamples="1" secPattern="symN" isAttacker="No" isEncForm="Yes" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1000" id="307" index="4" uid="fa3989fe-4d56-4585-9ee3-98fdcea91943" >
-<cdparam x="399" y="169" />
+<COMPONENT type="1000" id="345" index="5" uid="6a31a92f-2418-4257-abb9-96333bbc838f" >
+<cdparam x="494" y="85" />
<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" />
<new d="false" />
-<TGConnectingPoint num="0" id="306" />
+<TGConnectingPoint num="0" id="344" />
</COMPONENT>
-<CONNECTOR type="115" id="308" index="5" uid="62811422-367f-4ee1-9343-4911f277c5b6" >
-<cdparam x="406" y="358" />
+<CONNECTOR type="115" id="346" index="6" uid="48d8f06e-307d-4a30-801c-7b5f5f54c4bc" >
+<cdparam x="501" y="367" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="null" />
+<P1 x="503" y="342" id="331" />
+<P2 x="504" y="360" id="339" />
+<AutomaticDrawing data="true" />
+<new d="false" />
+</CONNECTOR>
+<CONNECTOR type="115" id="347" index="7" uid="a63a7f79-5f75-4057-ab39-0aefed38fd37" >
+<cdparam x="501" y="293" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="406" y="358" id="296" />
-<P2 x="406" y="386" id="303" />
+<P1 x="503" y="267" id="342" />
+<P2 x="503" y="292" id="330" />
<AutomaticDrawing data="true" />
<new d="false" />
</CONNECTOR>
-<CONNECTOR type="115" id="309" index="6" uid="c8a8ac50-1f81-43c1-8b70-d34fb130b689" >
-<cdparam x="406" y="276" />
+<CONNECTOR type="115" id="348" index="8" uid="78b676ab-09a9-46a5-9d50-55df941d098d" >
+<cdparam x="501" y="170" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="406" y="276" id="299" />
-<P2 x="406" y="308" id="295" />
+<P1 x="501" y="170" id="334" />
+<P2 x="502" y="189" id="336" />
<AutomaticDrawing data="true" />
<new d="false" />
</CONNECTOR>
-<CONNECTOR type="115" id="310" index="7" uid="283fa9e6-83cf-458a-bd3d-d69fabad265e" >
-<cdparam x="406" y="70" />
+<CONNECTOR type="115" id="349" index="9" uid="30a66e39-d2e1-4c64-9970-68ee275c8e7a" >
+<cdparam x="501" y="85" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="406" y="189" id="306" />
-<P2 x="406" y="246" id="298" />
+<P1 x="501" y="105" id="344" />
+<P2 x="501" y="120" id="333" />
<AutomaticDrawing data="true" />
<new d="false" />
</CONNECTOR>
-<CONNECTOR type="115" id="311" index="8" uid="d24685ae-804a-49dd-ab81-802cfca90daf" >
-<cdparam x="406" y="416" />
+<CONNECTOR type="115" id="350" index="10" uid="81eef900-c143-46d8-8072-d1517ed99a21" >
+<cdparam x="505" y="219" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="406" y="416" id="304" />
-<P2 x="406" y="451" id="301" />
+<P1 x="502" y="219" id="337" />
+<P2 x="503" y="237" id="341" />
<AutomaticDrawing data="true" />
<new d="false" />
</CONNECTOR>
@@ -927,128 +1021,104 @@
</TMLActivityDiagramPanel>
<TMLActivityDiagramPanel name="Alice" minX="10" maxX="2500" minY="10" maxY="1500" zoom="1.0" >
-<COMPONENT type="1036" id="314" index="0" uid="def23271-656e-4dac-8705-5315f9b9d44a" >
-<cdparam x="396" y="441" />
-<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" />
-<new d="false" />
-<TGConnectingPoint num="0" id="312" />
-<TGConnectingPoint num="1" id="313" />
-<extraparam>
-<Data secPattern="sym" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1035" id="317" index="1" uid="fe685851-c1b5-4b6c-ad3c-1c7a753acc0d" >
-<cdparam x="396" y="244" />
+<COMPONENT type="1035" id="353" index="0" uid="35d18b58-b476-499f-9ee3-e810793de86a" >
+<cdparam x="456" y="217" />
<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" />
<new d="false" />
-<TGConnectingPoint num="0" id="315" />
-<TGConnectingPoint num="1" id="316" />
+<TGConnectingPoint num="0" id="351" />
+<TGConnectingPoint num="1" id="352" />
<extraparam>
-<Data secContext="n" type="Nonce" overhead="" size="11" encTime="100" decTime="100" nonce="" key="" algorithm="" />
+<Data secContext="symN" type="Symmetric Encryption" overhead="" size="" encTime="100" decTime="100" nonce="n" key="" algorithm="" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1006" id="320" index="2" uid="1624986c-a5e7-4a01-930a-e00f8fb3a1b5" >
-<cdparam x="367" y="313" />
-<sizeparam width="73" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1009" id="356" index="1" uid="d0ee6f7d-64e1-4148-a886-b95063f8d5d6" >
+<cdparam x="407" y="164" />
+<sizeparam width="112" 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="comm2(1)" />
+<infoparam name="read channel" value="nonce_ch(1) " />
<new d="false" />
-<TGConnectingPoint num="0" id="318" />
-<TGConnectingPoint num="1" id="319" />
+<TGConnectingPoint num="0" id="354" />
+<TGConnectingPoint num="1" id="355" />
<extraparam>
-<Data channelName="comm2" nbOfSamples="1" secPattern="n" isAttacker="No" isEncForm="Yes" />
+<Data channelName="nonce_ch" nbOfSamples="1" secPattern="n" isAttacker="No" isEncForm="Yes" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1001" id="322" index="3" uid="b13b0868-b207-4a5d-9669-e005313ff17f" >
-<cdparam x="393" y="509" />
+<COMPONENT type="1001" id="358" index="2" uid="d462364c-cc85-425c-b57f-49e84c8c628b" >
+<cdparam x="453" y="344" />
<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" />
<new d="false" />
-<TGConnectingPoint num="0" id="321" />
+<TGConnectingPoint num="0" id="357" />
</COMPONENT>
-<COMPONENT type="1009" id="325" index="4" uid="24769a23-debb-4544-94fc-6f49fffea6e3" >
-<cdparam x="369" y="387" />
-<sizeparam width="69" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1006" id="361" index="3" uid="9d4597bd-528d-4f6e-859f-b7b82c5f145a" >
+<cdparam x="421" y="295" />
+<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) " />
+<infoparam name="write channel" value="comm(1)" />
<new d="false" />
-<TGConnectingPoint num="0" id="323" />
-<TGConnectingPoint num="1" id="324" />
+<TGConnectingPoint num="0" id="359" />
+<TGConnectingPoint num="1" id="360" />
<extraparam>
-<Data channelName="comm" nbOfSamples="1" secPattern="sym" isAttacker="No" isEncForm="Yes" />
+<Data channelName="comm" nbOfSamples="1" secPattern="symN" isAttacker="No" isEncForm="Yes" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1000" id="327" index="5" uid="317044cd-be19-419b-8354-ef0116ad0c21" >
-<cdparam x="396" y="184" />
+<COMPONENT type="1000" id="363" index="4" uid="106bd407-adc5-4ca6-890d-273dcbb49cac" >
+<cdparam x="456" y="112" />
<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" />
<new d="false" />
-<TGConnectingPoint num="0" id="326" />
+<TGConnectingPoint num="0" id="362" />
</COMPONENT>
-<CONNECTOR type="115" id="328" index="6" uid="af194a48-4693-4f7d-aedc-eceebebee7b8" >
-<cdparam x="403" y="486" />
+<CONNECTOR type="115" id="364" index="5" uid="c6584bca-6841-4a02-b00c-701c31014488" >
+<cdparam x="463" y="262" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="403" y="486" id="313" />
-<P2 x="403" y="504" id="321" />
+<P1 x="463" y="262" id="352" />
+<P2 x="463" y="290" id="359" />
<AutomaticDrawing data="true" />
<new d="false" />
</CONNECTOR>
-<CONNECTOR type="115" id="329" index="7" uid="6c5317d0-7dbe-44a2-b211-f379970ac3b4" >
-<cdparam x="403" y="412" />
+<CONNECTOR type="115" id="365" index="6" uid="19bc2f82-7612-46b3-83ab-8ade93355ccc" >
+<cdparam x="463" y="180" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="403" y="412" id="324" />
-<P2 x="403" y="436" id="312" />
+<P1 x="463" y="189" id="355" />
+<P2 x="463" y="212" id="351" />
<AutomaticDrawing data="true" />
<new d="false" />
</CONNECTOR>
-<CONNECTOR type="115" id="330" index="8" uid="d2706fcd-9704-4d94-82fa-f60f0bb98a92" >
-<cdparam x="403" y="289" />
+<CONNECTOR type="115" id="366" index="7" uid="3ddf4987-2e44-41e8-aaa9-463ff5b6fa83" >
+<cdparam x="463" y="-26" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="403" y="289" id="316" />
-<P2 x="403" y="308" id="318" />
+<P1 x="463" y="132" id="362" />
+<P2 x="463" y="159" id="354" />
<AutomaticDrawing data="true" />
<new d="false" />
</CONNECTOR>
-<CONNECTOR type="115" id="331" index="9" uid="d2087c49-da7c-4d25-b7d2-cdd599e2475f" >
-<cdparam x="403" y="204" />
+<CONNECTOR type="115" id="367" index="8" uid="e67ff4df-08ed-418f-808c-0b4fd601ea4a" >
+<cdparam x="463" y="320" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="403" y="204" id="326" />
-<P2 x="403" y="239" id="315" />
-<AutomaticDrawing data="true" />
-<new d="false" />
-</CONNECTOR>
-<CONNECTOR type="115" id="332" index="10" uid="9c5fbc09-6de7-43fc-954e-bffccf1b0865" >
-<cdparam x="407" y="338" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="null" />
-<P1 x="403" y="338" id="319" />
-<P2 x="403" y="382" id="323" />
+<P1 x="463" y="320" id="360" />
+<P2 x="463" y="339" id="357" />
<AutomaticDrawing data="true" />
<new d="false" />
</CONNECTOR>
@@ -1062,351 +1132,441 @@
<Modeling type="TML Architecture" nameTab="NonceArch" >
<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="366" index="0" uid="692c000a-2c30-4395-9862-d159cfba0edf" >
-<cdparam x="583" y="388" />
-<sizeparam width="200" height="116" minWidth="100" minHeight="35" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<CONNECTOR type="125" id="368" index="0" uid="492cc794-81a9-447c-a6f8-4e541b0498fb" >
+<cdparam x="508" y="400" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="{info}" />
+<P1 x="514" y="382" id="388" />
+<P2 x="514" y="345" id="536" />
+<AutomaticDrawing data="true" />
+<new d="false" />
+<extraparam>
+<info priority="0" />
+<spy value="false" />
+</extraparam>
+</CONNECTOR>
+<COMPONENT type="1105" id="411" index="1" uid="d3c994e2-2f28-4bb3-9917-85c743baba6a" >
+<cdparam x="426" y="382" />
+<sizeparam width="177" height="167" 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="ExternalMemory" value="name" />
+<new d="false" />
+<TGConnectingPoint num="0" id="387" />
+<TGConnectingPoint num="1" id="388" />
+<TGConnectingPoint num="2" id="389" />
+<TGConnectingPoint num="3" id="390" />
+<TGConnectingPoint num="4" id="391" />
+<TGConnectingPoint num="5" id="392" />
+<TGConnectingPoint num="6" id="393" />
+<TGConnectingPoint num="7" id="394" />
+<TGConnectingPoint num="8" id="395" />
+<TGConnectingPoint num="9" id="396" />
+<TGConnectingPoint num="10" id="397" />
+<TGConnectingPoint num="11" id="398" />
+<TGConnectingPoint num="12" id="399" />
+<TGConnectingPoint num="13" id="400" />
+<TGConnectingPoint num="14" id="401" />
+<TGConnectingPoint num="15" id="402" />
+<TGConnectingPoint num="16" id="403" />
+<TGConnectingPoint num="17" id="404" />
+<TGConnectingPoint num="18" id="405" />
+<TGConnectingPoint num="19" id="406" />
+<TGConnectingPoint num="20" id="407" />
+<TGConnectingPoint num="21" id="408" />
+<TGConnectingPoint num="22" id="409" />
+<TGConnectingPoint num="23" id="410" />
+<extraparam>
+<info stereotype="MEMORY" nodeName="ExternalMemory" />
+<attributes byteDataSize="4" memorySize="1024" clockRatio="1" bufferType="0" />
+</extraparam>
+</COMPONENT>
+<SUBCOMPONENT type="1103" id="377" index="15" uid="f5b0f1b5-c930-4b56-8060-b57b180e7276" >
+<father id="411" num="0" />
+<cdparam x="464" y="429" />
+<sizeparam width="119" height="40" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="0" maxX="58" minY="0" maxY="127" />
+<infoparam name="TGComponent" value="nonce::comm" />
+<new d="false" />
+<TGConnectingPoint num="0" id="369" />
+<TGConnectingPoint num="1" id="370" />
+<TGConnectingPoint num="2" id="371" />
+<TGConnectingPoint num="3" id="372" />
+<TGConnectingPoint num="4" id="373" />
+<TGConnectingPoint num="5" id="374" />
+<TGConnectingPoint num="6" id="375" />
+<TGConnectingPoint num="7" id="376" />
+<extraparam>
+<info value="nonce::comm" communicationName="comm" referenceCommunicationName="nonce" mappedElements="ExternalBus" priority="0" typeName="channel" />
+</extraparam>
+</SUBCOMPONENT>
+<SUBCOMPONENT type="1103" id="386" index="16" uid="aca7008a-dce9-4019-85b2-e00513860604" >
+<father id="411" num="1" />
+<cdparam x="448" y="484" />
+<sizeparam width="142" height="40" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="0" maxX="35" minY="0" maxY="127" />
+<infoparam name="TGComponent" value="nonce::nonce_ch" />
+<new d="false" />
+<TGConnectingPoint num="0" id="378" />
+<TGConnectingPoint num="1" id="379" />
+<TGConnectingPoint num="2" id="380" />
+<TGConnectingPoint num="3" id="381" />
+<TGConnectingPoint num="4" id="382" />
+<TGConnectingPoint num="5" id="383" />
+<TGConnectingPoint num="6" id="384" />
+<TGConnectingPoint num="7" id="385" />
+<extraparam>
+<info value="nonce::nonce_ch" communicationName="nonce_ch" referenceCommunicationName="nonce" mappedElements="ExternalBus" priority="0" typeName="channel" />
+</extraparam>
+</SUBCOMPONENT>
+
+<COMPONENT type="1105" id="445" index="2" uid="692c000a-2c30-4395-9862-d159cfba0edf" >
+<cdparam x="629" y="359" />
+<sizeparam width="158" height="94" 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="Memory1" value="name" />
<new d="false" />
-<TGConnectingPoint num="0" id="342" />
-<TGConnectingPoint num="1" id="343" />
-<TGConnectingPoint num="2" id="344" />
-<TGConnectingPoint num="3" id="345" />
-<TGConnectingPoint num="4" id="346" />
-<TGConnectingPoint num="5" id="347" />
-<TGConnectingPoint num="6" id="348" />
-<TGConnectingPoint num="7" id="349" />
-<TGConnectingPoint num="8" id="350" />
-<TGConnectingPoint num="9" id="351" />
-<TGConnectingPoint num="10" id="352" />
-<TGConnectingPoint num="11" id="353" />
-<TGConnectingPoint num="12" id="354" />
-<TGConnectingPoint num="13" id="355" />
-<TGConnectingPoint num="14" id="356" />
-<TGConnectingPoint num="15" id="357" />
-<TGConnectingPoint num="16" id="358" />
-<TGConnectingPoint num="17" id="359" />
-<TGConnectingPoint num="18" id="360" />
-<TGConnectingPoint num="19" id="361" />
-<TGConnectingPoint num="20" id="362" />
-<TGConnectingPoint num="21" id="363" />
-<TGConnectingPoint num="22" id="364" />
-<TGConnectingPoint num="23" id="365" />
+<TGConnectingPoint num="0" id="421" />
+<TGConnectingPoint num="1" id="422" />
+<TGConnectingPoint num="2" id="423" />
+<TGConnectingPoint num="3" id="424" />
+<TGConnectingPoint num="4" id="425" />
+<TGConnectingPoint num="5" id="426" />
+<TGConnectingPoint num="6" id="427" />
+<TGConnectingPoint num="7" id="428" />
+<TGConnectingPoint num="8" id="429" />
+<TGConnectingPoint num="9" id="430" />
+<TGConnectingPoint num="10" id="431" />
+<TGConnectingPoint num="11" id="432" />
+<TGConnectingPoint num="12" id="433" />
+<TGConnectingPoint num="13" id="434" />
+<TGConnectingPoint num="14" id="435" />
+<TGConnectingPoint num="15" id="436" />
+<TGConnectingPoint num="16" id="437" />
+<TGConnectingPoint num="17" id="438" />
+<TGConnectingPoint num="18" id="439" />
+<TGConnectingPoint num="19" id="440" />
+<TGConnectingPoint num="20" id="441" />
+<TGConnectingPoint num="21" id="442" />
+<TGConnectingPoint num="22" id="443" />
+<TGConnectingPoint num="23" id="444" />
<extraparam>
<info stereotype="MEMORY" nodeName="Memory1" />
<attributes byteDataSize="4" memorySize="1024" clockRatio="1" bufferType="0" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1111" id="341" index="13" uid="dbcc65da-9c81-4bbb-aa93-643a930320bb" >
-<father id="366" num="0" />
-<cdparam x="644" y="432" />
+<SUBCOMPONENT type="1111" id="420" index="17" uid="dbcc65da-9c81-4bbb-aa93-643a930320bb" >
+<father id="445" num="0" />
+<cdparam x="665" y="399" />
<sizeparam width="75" height="40" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="125" minY="0" maxY="76" />
-<infoparam name="TGComponent" value="sym" />
+<cdrectangleparam minX="0" maxX="83" minY="0" maxY="54" />
+<infoparam name="TGComponent" value="symN" />
<new d="false" />
-<TGConnectingPoint num="0" id="333" />
-<TGConnectingPoint num="1" id="334" />
-<TGConnectingPoint num="2" id="335" />
-<TGConnectingPoint num="3" id="336" />
-<TGConnectingPoint num="4" id="337" />
-<TGConnectingPoint num="5" id="338" />
-<TGConnectingPoint num="6" id="339" />
-<TGConnectingPoint num="7" id="340" />
+<TGConnectingPoint num="0" id="412" />
+<TGConnectingPoint num="1" id="413" />
+<TGConnectingPoint num="2" id="414" />
+<TGConnectingPoint num="3" id="415" />
+<TGConnectingPoint num="4" id="416" />
+<TGConnectingPoint num="5" id="417" />
+<TGConnectingPoint num="6" id="418" />
+<TGConnectingPoint num="7" id="419" />
<extraparam>
-<info value="sym" referenceKeyName="sym" priority="0" typeName="key" />
+<info value="symN" referenceKeyName="symN" priority="0" typeName="key" />
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="1105" id="400" index="1" uid="0575425d-69f8-4778-b52e-091ec090bee4" >
-<cdparam x="235" y="361" />
-<sizeparam width="200" height="146" minWidth="100" minHeight="35" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1105" id="479" index="3" uid="0575425d-69f8-4778-b52e-091ec090bee4" >
+<cdparam x="243" y="363" />
+<sizeparam width="145" height="91" 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="Memory0" value="name" />
<new d="false" />
-<TGConnectingPoint num="0" id="376" />
-<TGConnectingPoint num="1" id="377" />
-<TGConnectingPoint num="2" id="378" />
-<TGConnectingPoint num="3" id="379" />
-<TGConnectingPoint num="4" id="380" />
-<TGConnectingPoint num="5" id="381" />
-<TGConnectingPoint num="6" id="382" />
-<TGConnectingPoint num="7" id="383" />
-<TGConnectingPoint num="8" id="384" />
-<TGConnectingPoint num="9" id="385" />
-<TGConnectingPoint num="10" id="386" />
-<TGConnectingPoint num="11" id="387" />
-<TGConnectingPoint num="12" id="388" />
-<TGConnectingPoint num="13" id="389" />
-<TGConnectingPoint num="14" id="390" />
-<TGConnectingPoint num="15" id="391" />
-<TGConnectingPoint num="16" id="392" />
-<TGConnectingPoint num="17" id="393" />
-<TGConnectingPoint num="18" id="394" />
-<TGConnectingPoint num="19" id="395" />
-<TGConnectingPoint num="20" id="396" />
-<TGConnectingPoint num="21" id="397" />
-<TGConnectingPoint num="22" id="398" />
-<TGConnectingPoint num="23" id="399" />
+<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 stereotype="MEMORY" nodeName="Memory0" />
<attributes byteDataSize="4" memorySize="1024" clockRatio="1" bufferType="0" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1111" id="375" index="14" uid="25039f0e-e3bc-4057-945b-a5cdd46cb334" >
-<father id="400" num="0" />
-<cdparam x="295" y="431" />
+<SUBCOMPONENT type="1111" id="454" index="18" uid="25039f0e-e3bc-4057-945b-a5cdd46cb334" >
+<father id="479" num="0" />
+<cdparam x="281" y="407" />
<sizeparam width="75" height="40" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="125" minY="0" maxY="106" />
-<infoparam name="TGComponent" value="sym" />
+<cdrectangleparam minX="0" maxX="70" minY="0" maxY="51" />
+<infoparam name="TGComponent" value="symN" />
<new d="false" />
-<TGConnectingPoint num="0" id="367" />
-<TGConnectingPoint num="1" id="368" />
-<TGConnectingPoint num="2" id="369" />
-<TGConnectingPoint num="3" id="370" />
-<TGConnectingPoint num="4" id="371" />
-<TGConnectingPoint num="5" id="372" />
-<TGConnectingPoint num="6" id="373" />
-<TGConnectingPoint num="7" id="374" />
+<TGConnectingPoint num="0" id="446" />
+<TGConnectingPoint num="1" id="447" />
+<TGConnectingPoint num="2" id="448" />
+<TGConnectingPoint num="3" id="449" />
+<TGConnectingPoint num="4" id="450" />
+<TGConnectingPoint num="5" id="451" />
+<TGConnectingPoint num="6" id="452" />
+<TGConnectingPoint num="7" id="453" />
<extraparam>
-<info value="sym" referenceKeyName="sym" priority="5" typeName="key" />
+<info value="symN" referenceKeyName="symN" priority="5" typeName="key" />
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="1102" id="425" index="2" uid="e55107b4-54f5-4458-b1aa-a37af96ecc05" >
+<COMPONENT type="1102" id="504" index="4" uid="e55107b4-54f5-4458-b1aa-a37af96ecc05" >
<cdparam x="234" y="296" />
<sizeparam width="163" height="50" 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="Bus0" value="name" />
<new d="false" />
-<TGConnectingPoint num="0" id="401" />
-<TGConnectingPoint num="1" id="402" />
-<TGConnectingPoint num="2" id="403" />
-<TGConnectingPoint num="3" id="404" />
-<TGConnectingPoint num="4" id="405" />
-<TGConnectingPoint num="5" id="406" />
-<TGConnectingPoint num="6" id="407" />
-<TGConnectingPoint num="7" id="408" />
-<TGConnectingPoint num="8" id="409" />
-<TGConnectingPoint num="9" id="410" />
-<TGConnectingPoint num="10" id="411" />
-<TGConnectingPoint num="11" id="412" />
-<TGConnectingPoint num="12" id="413" />
-<TGConnectingPoint num="13" id="414" />
-<TGConnectingPoint num="14" id="415" />
-<TGConnectingPoint num="15" id="416" />
-<TGConnectingPoint num="16" id="417" />
-<TGConnectingPoint num="17" id="418" />
-<TGConnectingPoint num="18" id="419" />
-<TGConnectingPoint num="19" id="420" />
-<TGConnectingPoint num="20" id="421" />
-<TGConnectingPoint num="21" id="422" />
-<TGConnectingPoint num="22" id="423" />
-<TGConnectingPoint num="23" id="424" />
+<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" />
+<TGConnectingPoint num="12" id="492" />
+<TGConnectingPoint num="13" id="493" />
+<TGConnectingPoint num="14" id="494" />
+<TGConnectingPoint num="15" id="495" />
+<TGConnectingPoint num="16" id="496" />
+<TGConnectingPoint num="17" id="497" />
+<TGConnectingPoint num="18" id="498" />
+<TGConnectingPoint num="19" id="499" />
+<TGConnectingPoint num="20" id="500" />
+<TGConnectingPoint num="21" id="501" />
+<TGConnectingPoint num="22" id="502" />
+<TGConnectingPoint num="23" id="503" />
<extraparam>
<info stereotype="BUS-RR" nodeName="Bus0" />
<attributes byteDataSize="4" arbitrationPolicy="0" sliceTime="10000" pipelineSize="1" burstSize="100" clockRatio="1" privacy="1" referenceAttack="" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1102" id="450" index="3" uid="189d8fc5-5d31-4164-9cc8-fee910af90be" >
+<COMPONENT type="1102" id="529" index="5" uid="189d8fc5-5d31-4164-9cc8-fee910af90be" >
<cdparam x="633" y="295" />
<sizeparam width="150" height="50" 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="Bus1" value="name" />
<new d="false" />
-<TGConnectingPoint num="0" id="426" />
-<TGConnectingPoint num="1" id="427" />
-<TGConnectingPoint num="2" id="428" />
-<TGConnectingPoint num="3" id="429" />
-<TGConnectingPoint num="4" id="430" />
-<TGConnectingPoint num="5" id="431" />
-<TGConnectingPoint num="6" id="432" />
-<TGConnectingPoint num="7" id="433" />
-<TGConnectingPoint num="8" id="434" />
-<TGConnectingPoint num="9" id="435" />
-<TGConnectingPoint num="10" id="436" />
-<TGConnectingPoint num="11" id="437" />
-<TGConnectingPoint num="12" id="438" />
-<TGConnectingPoint num="13" id="439" />
-<TGConnectingPoint num="14" id="440" />
-<TGConnectingPoint num="15" id="441" />
-<TGConnectingPoint num="16" id="442" />
-<TGConnectingPoint num="17" id="443" />
-<TGConnectingPoint num="18" id="444" />
-<TGConnectingPoint num="19" id="445" />
-<TGConnectingPoint num="20" id="446" />
-<TGConnectingPoint num="21" id="447" />
-<TGConnectingPoint num="22" id="448" />
-<TGConnectingPoint num="23" id="449" />
+<TGConnectingPoint num="0" id="505" />
+<TGConnectingPoint num="1" id="506" />
+<TGConnectingPoint num="2" id="507" />
+<TGConnectingPoint num="3" id="508" />
+<TGConnectingPoint num="4" id="509" />
+<TGConnectingPoint num="5" id="510" />
+<TGConnectingPoint num="6" id="511" />
+<TGConnectingPoint num="7" id="512" />
+<TGConnectingPoint num="8" id="513" />
+<TGConnectingPoint num="9" id="514" />
+<TGConnectingPoint num="10" id="515" />
+<TGConnectingPoint num="11" id="516" />
+<TGConnectingPoint num="12" id="517" />
+<TGConnectingPoint num="13" id="518" />
+<TGConnectingPoint num="14" id="519" />
+<TGConnectingPoint num="15" id="520" />
+<TGConnectingPoint num="16" id="521" />
+<TGConnectingPoint num="17" id="522" />
+<TGConnectingPoint num="18" id="523" />
+<TGConnectingPoint num="19" id="524" />
+<TGConnectingPoint num="20" id="525" />
+<TGConnectingPoint num="21" id="526" />
+<TGConnectingPoint num="22" id="527" />
+<TGConnectingPoint num="23" id="528" />
<extraparam>
<info stereotype="BUS-RR" nodeName="Bus1" />
<attributes byteDataSize="4" arbitrationPolicy="0" sliceTime="10000" pipelineSize="1" burstSize="100" clockRatio="1" privacy="1" referenceAttack="" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1102" id="475" index="4" uid="c155fd1b-5f93-45a6-b4df-98ee7e99f3e1" >
+<COMPONENT type="1102" id="554" index="6" uid="c155fd1b-5f93-45a6-b4df-98ee7e99f3e1" >
<cdparam x="407" y="295" />
<sizeparam width="214" height="50" 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="ExternalBus" value="name" />
<new d="false" />
-<TGConnectingPoint num="0" id="451" />
-<TGConnectingPoint num="1" id="452" />
-<TGConnectingPoint num="2" id="453" />
-<TGConnectingPoint num="3" id="454" />
-<TGConnectingPoint num="4" id="455" />
-<TGConnectingPoint num="5" id="456" />
-<TGConnectingPoint num="6" id="457" />
-<TGConnectingPoint num="7" id="458" />
-<TGConnectingPoint num="8" id="459" />
-<TGConnectingPoint num="9" id="460" />
-<TGConnectingPoint num="10" id="461" />
-<TGConnectingPoint num="11" id="462" />
-<TGConnectingPoint num="12" id="463" />
-<TGConnectingPoint num="13" id="464" />
-<TGConnectingPoint num="14" id="465" />
-<TGConnectingPoint num="15" id="466" />
-<TGConnectingPoint num="16" id="467" />
-<TGConnectingPoint num="17" id="468" />
-<TGConnectingPoint num="18" id="469" />
-<TGConnectingPoint num="19" id="470" />
-<TGConnectingPoint num="20" id="471" />
-<TGConnectingPoint num="21" id="472" />
-<TGConnectingPoint num="22" id="473" />
-<TGConnectingPoint num="23" id="474" />
+<TGConnectingPoint num="0" id="530" />
+<TGConnectingPoint num="1" id="531" />
+<TGConnectingPoint num="2" id="532" />
+<TGConnectingPoint num="3" id="533" />
+<TGConnectingPoint num="4" id="534" />
+<TGConnectingPoint num="5" id="535" />
+<TGConnectingPoint num="6" id="536" />
+<TGConnectingPoint num="7" id="537" />
+<TGConnectingPoint num="8" id="538" />
+<TGConnectingPoint num="9" id="539" />
+<TGConnectingPoint num="10" id="540" />
+<TGConnectingPoint num="11" id="541" />
+<TGConnectingPoint num="12" id="542" />
+<TGConnectingPoint num="13" id="543" />
+<TGConnectingPoint num="14" id="544" />
+<TGConnectingPoint num="15" id="545" />
+<TGConnectingPoint num="16" id="546" />
+<TGConnectingPoint num="17" id="547" />
+<TGConnectingPoint num="18" id="548" />
+<TGConnectingPoint num="19" id="549" />
+<TGConnectingPoint num="20" id="550" />
+<TGConnectingPoint num="21" id="551" />
+<TGConnectingPoint num="22" id="552" />
+<TGConnectingPoint num="23" id="553" />
<extraparam>
<info stereotype="BUS-RR" nodeName="ExternalBus" />
-<attributes byteDataSize="4" arbitrationPolicy="0" sliceTime="10000" pipelineSize="1" burstSize="100" clockRatio="1" privacy="0" referenceAttack="" />
+<attributes byteDataSize="4" arbitrationPolicy="0" sliceTime="10000" pipelineSize="1" burstSize="100" clockRatio="1" privacy="0" referenceAttack="null" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1100" id="509" index="5" uid="05aad9fb-1307-44c9-966f-476cca958af7" >
+<COMPONENT type="1100" id="588" index="7" uid="05aad9fb-1307-44c9-966f-476cca958af7" >
<cdparam x="527" y="179" />
<sizeparam width="150" height="100" 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="CPUAlice" value="name" />
<new d="false" />
-<TGConnectingPoint num="0" id="485" />
-<TGConnectingPoint num="1" id="486" />
-<TGConnectingPoint num="2" id="487" />
-<TGConnectingPoint num="3" id="488" />
-<TGConnectingPoint num="4" id="489" />
-<TGConnectingPoint num="5" id="490" />
-<TGConnectingPoint num="6" id="491" />
-<TGConnectingPoint num="7" id="492" />
-<TGConnectingPoint num="8" id="493" />
-<TGConnectingPoint num="9" id="494" />
-<TGConnectingPoint num="10" id="495" />
-<TGConnectingPoint num="11" id="496" />
-<TGConnectingPoint num="12" id="497" />
-<TGConnectingPoint num="13" id="498" />
-<TGConnectingPoint num="14" id="499" />
-<TGConnectingPoint num="15" id="500" />
-<TGConnectingPoint num="16" id="501" />
-<TGConnectingPoint num="17" id="502" />
-<TGConnectingPoint num="18" id="503" />
-<TGConnectingPoint num="19" id="504" />
-<TGConnectingPoint num="20" id="505" />
-<TGConnectingPoint num="21" id="506" />
-<TGConnectingPoint num="22" id="507" />
-<TGConnectingPoint num="23" id="508" />
+<TGConnectingPoint num="0" id="564" />
+<TGConnectingPoint num="1" id="565" />
+<TGConnectingPoint num="2" id="566" />
+<TGConnectingPoint num="3" id="567" />
+<TGConnectingPoint num="4" id="568" />
+<TGConnectingPoint num="5" id="569" />
+<TGConnectingPoint num="6" id="570" />
+<TGConnectingPoint num="7" id="571" />
+<TGConnectingPoint num="8" id="572" />
+<TGConnectingPoint num="9" id="573" />
+<TGConnectingPoint num="10" id="574" />
+<TGConnectingPoint num="11" id="575" />
+<TGConnectingPoint num="12" id="576" />
+<TGConnectingPoint num="13" id="577" />
+<TGConnectingPoint num="14" id="578" />
+<TGConnectingPoint num="15" id="579" />
+<TGConnectingPoint num="16" id="580" />
+<TGConnectingPoint num="17" id="581" />
+<TGConnectingPoint num="18" id="582" />
+<TGConnectingPoint num="19" id="583" />
+<TGConnectingPoint num="20" id="584" />
+<TGConnectingPoint num="21" id="585" />
+<TGConnectingPoint num="22" id="586" />
+<TGConnectingPoint num="23" id="587" />
<extraparam>
<info stereotype="CPURR" nodeName="CPUAlice" />
<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="484" index="15" uid="e38defed-eaa1-47b1-a568-8c1d10e05572" >
-<father id="509" num="0" />
+<SUBCOMPONENT type="1101" id="563" index="19" uid="e38defed-eaa1-47b1-a568-8c1d10e05572" >
+<father id="588" num="0" />
<cdparam x="555" y="222" />
<sizeparam width="106" height="40" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="44" minY="0" maxY="60" />
<infoparam name="TGComponent" value="nonce::Bob" />
<new d="false" />
-<TGConnectingPoint num="0" id="476" />
-<TGConnectingPoint num="1" id="477" />
-<TGConnectingPoint num="2" id="478" />
-<TGConnectingPoint num="3" id="479" />
-<TGConnectingPoint num="4" id="480" />
-<TGConnectingPoint num="5" id="481" />
-<TGConnectingPoint num="6" id="482" />
-<TGConnectingPoint num="7" id="483" />
+<TGConnectingPoint num="0" id="555" />
+<TGConnectingPoint num="1" id="556" />
+<TGConnectingPoint num="2" id="557" />
+<TGConnectingPoint num="3" id="558" />
+<TGConnectingPoint num="4" id="559" />
+<TGConnectingPoint num="5" id="560" />
+<TGConnectingPoint num="6" id="561" />
+<TGConnectingPoint num="7" id="562" />
<extraparam>
<info value="nonce::Bob" taskName="Bob" referenceTaskName="nonce" priority="0" operationMEC="comp3" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="1100" id="543" index="6" uid="195ffea3-2203-4c11-a72c-a6f76dcecc61" >
+<COMPONENT type="1100" id="622" index="8" uid="195ffea3-2203-4c11-a72c-a6f76dcecc61" >
<cdparam x="326" y="177" />
<sizeparam width="173" height="100" 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="CPUBob" value="name" />
<new d="false" />
-<TGConnectingPoint num="0" id="519" />
-<TGConnectingPoint num="1" id="520" />
-<TGConnectingPoint num="2" id="521" />
-<TGConnectingPoint num="3" id="522" />
-<TGConnectingPoint num="4" id="523" />
-<TGConnectingPoint num="5" id="524" />
-<TGConnectingPoint num="6" id="525" />
-<TGConnectingPoint num="7" id="526" />
-<TGConnectingPoint num="8" id="527" />
-<TGConnectingPoint num="9" id="528" />
-<TGConnectingPoint num="10" id="529" />
-<TGConnectingPoint num="11" id="530" />
-<TGConnectingPoint num="12" id="531" />
-<TGConnectingPoint num="13" id="532" />
-<TGConnectingPoint num="14" id="533" />
-<TGConnectingPoint num="15" id="534" />
-<TGConnectingPoint num="16" id="535" />
-<TGConnectingPoint num="17" id="536" />
-<TGConnectingPoint num="18" id="537" />
-<TGConnectingPoint num="19" id="538" />
-<TGConnectingPoint num="20" id="539" />
-<TGConnectingPoint num="21" id="540" />
-<TGConnectingPoint num="22" id="541" />
-<TGConnectingPoint num="23" id="542" />
+<TGConnectingPoint num="0" id="598" />
+<TGConnectingPoint num="1" id="599" />
+<TGConnectingPoint num="2" id="600" />
+<TGConnectingPoint num="3" id="601" />
+<TGConnectingPoint num="4" id="602" />
+<TGConnectingPoint num="5" id="603" />
+<TGConnectingPoint num="6" id="604" />
+<TGConnectingPoint num="7" id="605" />
+<TGConnectingPoint num="8" id="606" />
+<TGConnectingPoint num="9" id="607" />
+<TGConnectingPoint num="10" id="608" />
+<TGConnectingPoint num="11" id="609" />
+<TGConnectingPoint num="12" id="610" />
+<TGConnectingPoint num="13" id="611" />
+<TGConnectingPoint num="14" id="612" />
+<TGConnectingPoint num="15" id="613" />
+<TGConnectingPoint num="16" id="614" />
+<TGConnectingPoint num="17" id="615" />
+<TGConnectingPoint num="18" id="616" />
+<TGConnectingPoint num="19" id="617" />
+<TGConnectingPoint num="20" id="618" />
+<TGConnectingPoint num="21" id="619" />
+<TGConnectingPoint num="22" id="620" />
+<TGConnectingPoint num="23" id="621" />
<extraparam>
<info stereotype="CPURR" nodeName="CPUBob" />
<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="518" index="16" uid="b52dd866-7961-4ef6-97e3-7cf2dc395c79" >
-<father id="543" num="0" />
+<SUBCOMPONENT type="1101" id="597" index="20" uid="b52dd866-7961-4ef6-97e3-7cf2dc395c79" >
+<father id="622" num="0" />
<cdparam x="372" y="225" />
<sizeparam width="111" height="40" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="62" minY="0" maxY="60" />
<infoparam name="TGComponent" value="nonce::Alice" />
<new d="false" />
-<TGConnectingPoint num="0" id="510" />
-<TGConnectingPoint num="1" id="511" />
-<TGConnectingPoint num="2" id="512" />
-<TGConnectingPoint num="3" id="513" />
-<TGConnectingPoint num="4" id="514" />
-<TGConnectingPoint num="5" id="515" />
-<TGConnectingPoint num="6" id="516" />
-<TGConnectingPoint num="7" id="517" />
+<TGConnectingPoint num="0" id="589" />
+<TGConnectingPoint num="1" id="590" />
+<TGConnectingPoint num="2" id="591" />
+<TGConnectingPoint num="3" id="592" />
+<TGConnectingPoint num="4" id="593" />
+<TGConnectingPoint num="5" id="594" />
+<TGConnectingPoint num="6" id="595" />
+<TGConnectingPoint num="7" id="596" />
<extraparam>
<info value="nonce::Alice" taskName="Alice" referenceTaskName="nonce" priority="0" operationMEC="comp3" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="125" id="544" index="7" uid="dba4896a-e255-4b4f-b71d-63c0992cda35" >
+<CONNECTOR type="125" id="623" index="9" uid="dba4896a-e255-4b4f-b71d-63c0992cda35" >
<cdparam x="714" y="279" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="{info}" />
-<P1 x="639" y="279" id="500" />
-<P2 x="670" y="295" id="434" />
+<P1 x="639" y="279" id="579" />
+<P2 x="670" y="295" id="513" />
<AutomaticDrawing data="true" />
<new d="false" />
<extraparam>
@@ -1414,12 +1574,12 @@
<spy value="false" />
</extraparam>
</CONNECTOR>
-<CONNECTOR type="125" id="545" index="8" uid="f8f5ed68-ae23-4dbd-95a3-237fb1cee7f8" >
+<CONNECTOR type="125" id="624" index="10" uid="f8f5ed68-ae23-4dbd-95a3-237fb1cee7f8" >
<cdparam x="871" y="425" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="{info}" />
-<P1 x="683" y="388" id="343" />
-<P2 x="708" y="345" id="432" />
+<P1 x="708" y="359" id="422" />
+<P2 x="708" y="345" id="511" />
<AutomaticDrawing data="true" />
<new d="false" />
<extraparam>
@@ -1427,12 +1587,12 @@
<spy value="false" />
</extraparam>
</CONNECTOR>
-<CONNECTOR type="125" id="546" index="9" uid="14b358d9-9f69-445a-a369-d1b8bc35ad1b" >
+<CONNECTOR type="125" id="625" index="11" uid="14b358d9-9f69-445a-a369-d1b8bc35ad1b" >
<cdparam x="254" y="418" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="{info}" />
-<P1 x="335" y="361" id="377" />
-<P2 x="315" y="346" id="407" />
+<P1 x="315" y="363" id="456" />
+<P2 x="315" y="346" id="486" />
<AutomaticDrawing data="true" />
<new d="false" />
<extraparam>
@@ -1440,12 +1600,12 @@
<spy value="false" />
</extraparam>
</CONNECTOR>
-<CONNECTOR type="125" id="547" index="10" uid="fa0156c2-b3f4-441b-9009-6f39b69a7011" >
+<CONNECTOR type="125" id="626" index="12" uid="fa0156c2-b3f4-441b-9009-6f39b69a7011" >
<cdparam x="388" y="277" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="{info}" />
-<P1 x="369" y="277" id="533" />
-<P2 x="356" y="296" id="410" />
+<P1 x="369" y="277" id="612" />
+<P2 x="356" y="296" id="489" />
<AutomaticDrawing data="true" />
<new d="false" />
<extraparam>
@@ -1453,12 +1613,12 @@
<spy value="false" />
</extraparam>
</CONNECTOR>
-<CONNECTOR type="125" id="548" index="11" uid="9c07e080-447b-4128-90ac-a809ab75a931" >
+<CONNECTOR type="125" id="627" index="13" uid="9c07e080-447b-4128-90ac-a809ab75a931" >
<cdparam x="576" y="274" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="{info}" />
-<P1 x="564" y="279" id="499" />
-<P2 x="567" y="295" id="460" />
+<P1 x="564" y="279" id="578" />
+<P2 x="567" y="295" id="539" />
<AutomaticDrawing data="true" />
<new d="false" />
<extraparam>
@@ -1466,12 +1626,12 @@
<spy value="false" />
</extraparam>
</CONNECTOR>
-<CONNECTOR type="125" id="549" index="12" uid="cdd04577-103a-4f08-bf33-a97a0816c985" >
+<CONNECTOR type="125" id="628" index="14" uid="cdd04577-103a-4f08-bf33-a97a0816c985" >
<cdparam x="513" y="277" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="{info}" />
-<P1 x="455" y="277" id="534" />
-<P2 x="460" y="295" id="459" />
+<P1 x="455" y="277" id="613" />
+<P2 x="460" y="295" id="538" />
<AutomaticDrawing data="true" />
<new d="false" />
<extraparam>
@@ -1489,43 +1649,43 @@
<Modeling type="TML Component Design" nameTab="KeyExchange" tabs="TML Component Task Diagram$Bob$Alice" >
<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="550" index="0" uid="b5dba457-6346-4c6a-ae5d-56b01f078ffe" >
+<CONNECTOR type="126" id="629" index="0" uid="b5dba457-6346-4c6a-ae5d-56b01f078ffe" >
<cdparam x="404" y="206" />
<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="391" y="193" id="562" />
-<P2 x="493" y="193" id="551" />
+<P1 x="391" y="193" id="641" />
+<P2 x="493" y="193" id="630" />
<AutomaticDrawing data="true" />
<new d="false" />
</CONNECTOR>
-<COMPONENT type="1202" id="561" index="1" uid="d5ed6d41-23db-48b2-9b0e-6b64c74e2127" >
+<COMPONENT type="1202" id="640" index="1" uid="d5ed6d41-23db-48b2-9b0e-6b64c74e2127" >
<cdparam x="493" y="137" />
<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="Bob" />
<new d="false" />
-<TGConnectingPoint num="0" id="553" />
-<TGConnectingPoint num="1" id="554" />
-<TGConnectingPoint num="2" id="555" />
-<TGConnectingPoint num="3" id="556" />
-<TGConnectingPoint num="4" id="557" />
-<TGConnectingPoint num="5" id="558" />
-<TGConnectingPoint num="6" id="559" />
-<TGConnectingPoint num="7" id="560" />
+<TGConnectingPoint num="0" id="632" />
+<TGConnectingPoint num="1" id="633" />
+<TGConnectingPoint num="2" id="634" />
+<TGConnectingPoint num="3" id="635" />
+<TGConnectingPoint num="4" id="636" />
+<TGConnectingPoint num="5" id="637" />
+<TGConnectingPoint num="6" id="638" />
+<TGConnectingPoint num="7" id="639" />
<extraparam>
<Data isAttacker="No" daemon="false" periodic="false" periodValue="" unit="" Operation="" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1203" id="552" index="3" uid="58d431dc-38ea-49be-a25d-5df3d154c419" >
-<father id="561" num="0" />
+<SUBCOMPONENT type="1203" id="631" index="3" uid="58d431dc-38ea-49be-a25d-5df3d154c419" >
+<father id="640" num="0" />
<cdparam x="480" y="193" />
<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" />
<new d="false" />
-<TGConnectingPoint num="0" id="551" />
+<TGConnectingPoint num="0" id="630" />
<extraparam>
<Prop commName="comm" commType="0" origin="false" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="uint_16" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="true" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="0" />
<Type type="0" typeOther="" />
@@ -1536,34 +1696,34 @@
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="1202" id="572" index="2" uid="b83c23e0-fa52-44df-9d21-a5244af69343" >
+<COMPONENT type="1202" id="651" index="2" uid="b83c23e0-fa52-44df-9d21-a5244af69343" >
<cdparam x="191" y="134" />
<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="Alice" />
<new d="false" />
-<TGConnectingPoint num="0" id="564" />
-<TGConnectingPoint num="1" id="565" />
-<TGConnectingPoint num="2" id="566" />
-<TGConnectingPoint num="3" id="567" />
-<TGConnectingPoint num="4" id="568" />
-<TGConnectingPoint num="5" id="569" />
-<TGConnectingPoint num="6" id="570" />
-<TGConnectingPoint num="7" id="571" />
+<TGConnectingPoint num="0" id="643" />
+<TGConnectingPoint num="1" id="644" />
+<TGConnectingPoint num="2" id="645" />
+<TGConnectingPoint num="3" id="646" />
+<TGConnectingPoint num="4" id="647" />
+<TGConnectingPoint num="5" id="648" />
+<TGConnectingPoint num="6" id="649" />
+<TGConnectingPoint num="7" id="650" />
<extraparam>
<Data isAttacker="No" daemon="false" periodic="false" periodValue="" unit="" Operation="" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1203" id="563" index="4" uid="4c7dee62-6562-4c36-b450-e45cecc471ff" >
-<father id="572" num="0" />
+<SUBCOMPONENT type="1203" id="642" index="4" uid="4c7dee62-6562-4c36-b450-e45cecc471ff" >
+<father id="651" num="0" />
<cdparam x="378" y="193" />
<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" />
<new d="false" />
-<TGConnectingPoint num="0" id="562" />
+<TGConnectingPoint num="0" id="641" />
<extraparam>
<Prop commName="comm" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="uint_16" associatedEvent="" checkConf="true" checkConfStatus="1" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="0" />
<Type type="0" typeOther="" />
@@ -1578,7 +1738,7 @@
</TMLComponentTaskDiagramPanel>
<TMLActivityDiagramPanel name="Bob" minX="10" maxX="2500" minY="10" maxY="1500" zoom="1.0" >
-<COMPONENT type="1036" id="575" index="0" uid="0c128671-ed0a-4281-8a5a-a4820bddea3c" >
+<COMPONENT type="1036" id="654" index="0" uid="0c128671-ed0a-4281-8a5a-a4820bddea3c" >
<cdparam x="400" y="333" />
<sizeparam width="15" height="35" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -1586,14 +1746,14 @@
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="decrypt" value="null" />
<new d="false" />
-<TGConnectingPoint num="0" id="573" />
-<TGConnectingPoint num="1" id="574" />
+<TGConnectingPoint num="0" id="652" />
+<TGConnectingPoint num="1" id="653" />
<extraparam>
-<Data secPattern="sym" />
+<Data secPattern="symKey" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1036" id="578" index="1" uid="8982aad3-3cf0-44c0-927a-b235de49164d" >
+<COMPONENT type="1036" id="657" index="1" uid="8982aad3-3cf0-44c0-927a-b235de49164d" >
<cdparam x="400" y="187" />
<sizeparam width="15" height="35" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -1601,129 +1761,129 @@
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="decrypt" value="null" />
<new d="false" />
-<TGConnectingPoint num="0" id="576" />
-<TGConnectingPoint num="1" id="577" />
+<TGConnectingPoint num="0" id="655" />
+<TGConnectingPoint num="1" id="656" />
<extraparam>
<Data secPattern="aenc" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1009" id="581" index="2" uid="df718e24-ce17-45a9-a1d7-a0ed05682114" >
-<cdparam x="365" y="402" />
-<sizeparam width="85" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1009" id="660" index="2" uid="df718e24-ce17-45a9-a1d7-a0ed05682114" >
+<cdparam x="363" y="402" />
+<sizeparam width="89" 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) " />
<new d="false" />
-<TGConnectingPoint num="0" id="579" />
-<TGConnectingPoint num="1" id="580" />
+<TGConnectingPoint num="0" id="658" />
+<TGConnectingPoint num="1" id="659" />
<extraparam>
<Data channelName="comm" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1009" id="584" index="3" uid="dd7d49a8-ab26-4929-a3dc-1ad9bd42a31f" >
-<cdparam x="365" y="267" />
-<sizeparam width="85" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1009" id="663" index="3" uid="dd7d49a8-ab26-4929-a3dc-1ad9bd42a31f" >
+<cdparam x="363" y="267" />
+<sizeparam width="89" 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) " />
<new d="false" />
-<TGConnectingPoint num="0" id="582" />
-<TGConnectingPoint num="1" id="583" />
+<TGConnectingPoint num="0" id="661" />
+<TGConnectingPoint num="1" id="662" />
<extraparam>
-<Data channelName="comm" nbOfSamples="1" secPattern="sym" isAttacker="No" isEncForm="Yes" />
+<Data channelName="comm" nbOfSamples="1" secPattern="symKey" isAttacker="No" isEncForm="Yes" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1001" id="586" index="4" uid="a630c521-416d-4e95-9465-0f0ca0e4d875" >
+<COMPONENT type="1001" id="665" index="4" uid="a630c521-416d-4e95-9465-0f0ca0e4d875" >
<cdparam x="396" y="459" />
<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" />
<new d="false" />
-<TGConnectingPoint num="0" id="585" />
+<TGConnectingPoint num="0" id="664" />
</COMPONENT>
-<COMPONENT type="1009" id="589" index="5" uid="b17c479e-b9ba-4cbb-af4c-86a1d90719c3" >
-<cdparam x="365" y="133" />
-<sizeparam width="85" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1009" id="668" index="5" uid="b17c479e-b9ba-4cbb-af4c-86a1d90719c3" >
+<cdparam x="363" y="133" />
+<sizeparam width="89" 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) " />
<new d="false" />
-<TGConnectingPoint num="0" id="587" />
-<TGConnectingPoint num="1" id="588" />
+<TGConnectingPoint num="0" id="666" />
+<TGConnectingPoint num="1" id="667" />
<extraparam>
<Data channelName="comm" nbOfSamples="1" secPattern="aenc" isAttacker="No" isEncForm="Yes" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1000" id="591" index="6" uid="dbf58fb9-081d-43cd-94e9-3368e3ad33d8" >
+<COMPONENT type="1000" id="670" index="6" uid="dbf58fb9-081d-43cd-94e9-3368e3ad33d8" >
<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="2500" minY="10" maxY="1500" />
<infoparam name="start state" value="null" />
<new d="false" />
-<TGConnectingPoint num="0" id="590" />
+<TGConnectingPoint num="0" id="669" />
</COMPONENT>
-<CONNECTOR type="115" id="592" index="7" uid="b16528a8-ded6-42a7-93dd-49ad2f6ebaf0" >
+<CONNECTOR type="115" id="671" index="7" uid="b16528a8-ded6-42a7-93dd-49ad2f6ebaf0" >
<cdparam x="407" y="378" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="407" y="378" id="574" />
-<P2 x="407" y="397" id="579" />
+<P1 x="407" y="378" id="653" />
+<P2 x="407" y="397" id="658" />
<AutomaticDrawing data="true" />
<new d="false" />
</CONNECTOR>
-<CONNECTOR type="115" id="593" index="8" uid="927691cc-bb1e-4ca8-9d72-f7e0ca34d8e0" >
+<CONNECTOR type="115" id="672" index="8" uid="927691cc-bb1e-4ca8-9d72-f7e0ca34d8e0" >
<cdparam x="407" y="292" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="407" y="292" id="583" />
-<P2 x="407" y="328" id="573" />
+<P1 x="407" y="292" id="662" />
+<P2 x="407" y="328" id="652" />
<AutomaticDrawing data="true" />
<new d="false" />
</CONNECTOR>
-<CONNECTOR type="115" id="594" index="9" uid="1960b105-8db7-4aa2-b3fd-266543f87d30" >
+<CONNECTOR type="115" id="673" index="9" uid="1960b105-8db7-4aa2-b3fd-266543f87d30" >
<cdparam x="407" y="232" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="407" y="232" id="577" />
-<P2 x="407" y="262" id="582" />
+<P1 x="407" y="232" id="656" />
+<P2 x="407" y="262" id="661" />
<AutomaticDrawing data="true" />
<new d="false" />
</CONNECTOR>
-<CONNECTOR type="115" id="595" index="10" uid="b4422150-389a-45a0-8335-578d5f27a12f" >
+<CONNECTOR type="115" id="674" index="10" uid="b4422150-389a-45a0-8335-578d5f27a12f" >
<cdparam x="407" y="158" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="407" y="158" id="588" />
-<P2 x="407" y="182" id="576" />
+<P1 x="407" y="158" id="667" />
+<P2 x="407" y="182" id="655" />
<AutomaticDrawing data="true" />
<new d="false" />
</CONNECTOR>
-<CONNECTOR type="115" id="596" index="11" uid="dd8d932a-a144-4b8c-ab82-770d8868ea6b" >
+<CONNECTOR type="115" id="675" index="11" uid="dd8d932a-a144-4b8c-ab82-770d8868ea6b" >
<cdparam x="407" y="427" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="407" y="427" id="580" />
-<P2 x="406" y="454" id="585" />
+<P1 x="407" y="427" id="659" />
+<P2 x="406" y="454" id="664" />
<AutomaticDrawing data="true" />
<new d="false" />
</CONNECTOR>
-<CONNECTOR type="115" id="597" index="12" uid="b96c9542-900c-4dc1-a6dd-cb2a752c6202" >
+<CONNECTOR type="115" id="676" index="12" uid="b96c9542-900c-4dc1-a6dd-cb2a752c6202" >
<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="407" y="70" id="590" />
-<P2 x="407" y="128" id="587" />
+<P1 x="407" y="70" id="669" />
+<P2 x="407" y="128" id="666" />
<AutomaticDrawing data="true" />
<new d="false" />
</CONNECTOR>
@@ -1731,7 +1891,7 @@
</TMLActivityDiagramPanel>
<TMLActivityDiagramPanel name="Alice" minX="10" maxX="2500" minY="10" maxY="1500" zoom="1.0" >
-<COMPONENT type="1035" id="600" index="0" uid="cf030143-06e6-40bb-a1da-5e6b7f6f6e55" >
+<COMPONENT type="1035" id="679" index="0" uid="cf030143-06e6-40bb-a1da-5e6b7f6f6e55" >
<cdparam x="400" y="248" />
<sizeparam width="15" height="35" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -1739,14 +1899,14 @@
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="encrypt" value="null" />
<new d="false" />
-<TGConnectingPoint num="0" id="598" />
-<TGConnectingPoint num="1" id="599" />
+<TGConnectingPoint num="0" id="677" />
+<TGConnectingPoint num="1" id="678" />
<extraparam>
-<Data secContext="sym" type="Symmetric Encryption" overhead="" size="" encTime="100" decTime="100" nonce="" key="" algorithm="" />
+<Data secContext="symKey" type="Symmetric Encryption" overhead="" size="" encTime="100" decTime="100" nonce="" key="" algorithm="" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1035" id="603" index="1" uid="60b6e48e-b014-48ca-bfa7-54138a3e1a5e" >
+<COMPONENT type="1035" id="682" index="1" uid="60b6e48e-b014-48ca-bfa7-54138a3e1a5e" >
<cdparam x="399" y="96" />
<sizeparam width="15" height="35" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -1754,129 +1914,129 @@
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="encrypt" value="null" />
<new d="false" />
-<TGConnectingPoint num="0" id="601" />
-<TGConnectingPoint num="1" id="602" />
+<TGConnectingPoint num="0" id="680" />
+<TGConnectingPoint num="1" id="681" />
<extraparam>
-<Data secContext="aenc" type="Asymmetric Encryption" overhead="" size="" encTime="100" decTime="100" nonce="" key="sym" algorithm="" />
+<Data secContext="aenc" type="Asymmetric Encryption" overhead="" size="" encTime="100" decTime="100" nonce="" key="symKey" algorithm="" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1006" id="606" index="2" uid="cd16f2ae-cdc5-4663-a2ae-cade0cf54ff0" >
-<cdparam x="367" y="383" />
-<sizeparam width="81" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1006" id="685" index="2" uid="cd16f2ae-cdc5-4663-a2ae-cade0cf54ff0" >
+<cdparam x="365" y="383" />
+<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="write channel" value="comm(1)" />
<new d="false" />
-<TGConnectingPoint num="0" id="604" />
-<TGConnectingPoint num="1" id="605" />
+<TGConnectingPoint num="0" id="683" />
+<TGConnectingPoint num="1" id="684" />
<extraparam>
<Data channelName="comm" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1006" id="609" index="3" uid="c8a7b488-47ee-48eb-9476-bbbbbea82a83" >
-<cdparam x="367" y="323" />
-<sizeparam width="81" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1006" id="688" index="3" uid="c8a7b488-47ee-48eb-9476-bbbbbea82a83" >
+<cdparam x="365" y="323" />
+<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="write channel" value="comm(1)" />
<new d="false" />
-<TGConnectingPoint num="0" id="607" />
-<TGConnectingPoint num="1" id="608" />
+<TGConnectingPoint num="0" id="686" />
+<TGConnectingPoint num="1" id="687" />
<extraparam>
-<Data channelName="comm" nbOfSamples="1" secPattern="sym" isAttacker="No" isEncForm="Yes" />
+<Data channelName="comm" nbOfSamples="1" secPattern="symKey" isAttacker="No" isEncForm="Yes" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1001" id="611" index="4" uid="c5934e0b-6c14-493e-bc6b-a61c3d4ecc5d" >
+<COMPONENT type="1001" id="690" index="4" uid="c5934e0b-6c14-493e-bc6b-a61c3d4ecc5d" >
<cdparam x="396" y="431" />
<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" />
<new d="false" />
-<TGConnectingPoint num="0" id="610" />
+<TGConnectingPoint num="0" id="689" />
</COMPONENT>
-<COMPONENT type="1006" id="614" index="5" uid="17499beb-5dbf-459f-9bcf-23e2e8bbf257" >
-<cdparam x="367" y="190" />
-<sizeparam width="81" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1006" id="693" index="5" uid="17499beb-5dbf-459f-9bcf-23e2e8bbf257" >
+<cdparam x="365" y="190" />
+<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="write channel" value="comm(1)" />
<new d="false" />
-<TGConnectingPoint num="0" id="612" />
-<TGConnectingPoint num="1" id="613" />
+<TGConnectingPoint num="0" id="691" />
+<TGConnectingPoint num="1" id="692" />
<extraparam>
<Data channelName="comm" nbOfSamples="1" secPattern="aenc" isAttacker="No" isEncForm="Yes" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1000" id="616" index="6" uid="1fe7a191-616d-4909-a7e2-9d8a0960b6ca" >
+<COMPONENT type="1000" id="695" index="6" uid="1fe7a191-616d-4909-a7e2-9d8a0960b6ca" >
<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="2500" minY="10" maxY="1500" />
<infoparam name="start state" value="null" />
<new d="false" />
-<TGConnectingPoint num="0" id="615" />
+<TGConnectingPoint num="0" id="694" />
</COMPONENT>
-<CONNECTOR type="115" id="617" index="7" uid="b9df3458-a3bd-4ef5-8c8c-b20b4f839ecf" >
+<CONNECTOR type="115" id="696" index="7" uid="b9df3458-a3bd-4ef5-8c8c-b20b4f839ecf" >
<cdparam x="407" y="293" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="407" y="293" id="599" />
-<P2 x="407" y="318" id="607" />
+<P1 x="407" y="293" id="678" />
+<P2 x="407" y="318" id="686" />
<AutomaticDrawing data="true" />
<new d="false" />
</CONNECTOR>
-<CONNECTOR type="115" id="618" index="8" uid="28770a85-0115-4060-bf43-7659b1ee6833" >
+<CONNECTOR type="115" id="697" index="8" uid="28770a85-0115-4060-bf43-7659b1ee6833" >
<cdparam x="407" y="215" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="407" y="215" id="613" />
-<P2 x="407" y="243" id="598" />
+<P1 x="407" y="215" id="692" />
+<P2 x="407" y="243" id="677" />
<AutomaticDrawing data="true" />
<new d="false" />
</CONNECTOR>
-<CONNECTOR type="115" id="619" index="9" uid="dfc77229-84e6-476e-97a1-338d496ff9de" >
+<CONNECTOR type="115" id="698" index="9" uid="dfc77229-84e6-476e-97a1-338d496ff9de" >
<cdparam x="406" y="141" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="406" y="141" id="602" />
-<P2 x="407" y="185" id="612" />
+<P1 x="406" y="141" id="681" />
+<P2 x="407" y="185" id="691" />
<AutomaticDrawing data="true" />
<new d="false" />
</CONNECTOR>
-<CONNECTOR type="115" id="620" index="10" uid="1ffb0159-7472-41e1-bdc2-2eecd44bbedb" >
+<CONNECTOR type="115" id="699" index="10" uid="1ffb0159-7472-41e1-bdc2-2eecd44bbedb" >
<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="407" y="70" id="615" />
-<P2 x="406" y="91" id="601" />
+<P1 x="407" y="70" id="694" />
+<P2 x="406" y="91" id="680" />
<AutomaticDrawing data="true" />
<new d="false" />
</CONNECTOR>
-<CONNECTOR type="115" id="621" index="11" uid="b81cdd94-130f-44a1-ad32-f539267c79e9" >
+<CONNECTOR type="115" id="700" index="11" uid="b81cdd94-130f-44a1-ad32-f539267c79e9" >
<cdparam x="407" y="408" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="407" y="408" id="605" />
-<P2 x="406" y="426" id="610" />
+<P1 x="407" y="408" id="684" />
+<P2 x="406" y="426" id="689" />
<AutomaticDrawing data="true" />
<new d="false" />
</CONNECTOR>
-<CONNECTOR type="115" id="622" index="12" uid="a9e4c2af-1a67-4a05-80db-3d30a7cc2a8a" >
+<CONNECTOR type="115" id="701" index="12" uid="a9e4c2af-1a67-4a05-80db-3d30a7cc2a8a" >
<cdparam x="402" y="331" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="407" y="348" id="608" />
-<P2 x="407" y="378" id="604" />
+<P1 x="407" y="348" id="687" />
+<P2 x="407" y="378" id="683" />
<AutomaticDrawing data="true" />
<new d="false" />
</CONNECTOR>
@@ -1890,351 +2050,421 @@
<Modeling type="TML Architecture" nameTab="KeyExchangeArch" >
<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="656" index="0" uid="cf5197ad-cba8-4bc4-b2f5-d22d0d8f20dd" >
+<CONNECTOR type="125" id="702" index="0" uid="1a20056c-a07d-4c78-b66b-df341073e4c8" >
+<cdparam x="584" y="397" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="{info}" />
+<P1 x="585" y="389" id="713" />
+<P2 x="585" y="336" id="861" />
+<AutomaticDrawing data="true" />
+<new d="false" />
+<extraparam>
+<info priority="0" />
+<spy value="false" />
+</extraparam>
+</CONNECTOR>
+<COMPONENT type="1105" id="736" index="1" uid="d1eb9425-a81e-4b08-9ad5-98fd3008a2c1" >
+<cdparam x="485" y="389" />
+<sizeparam width="200" height="126" 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="ExternalMemory" value="name" />
+<new d="false" />
+<TGConnectingPoint num="0" id="712" />
+<TGConnectingPoint num="1" id="713" />
+<TGConnectingPoint num="2" id="714" />
+<TGConnectingPoint num="3" id="715" />
+<TGConnectingPoint num="4" id="716" />
+<TGConnectingPoint num="5" id="717" />
+<TGConnectingPoint num="6" id="718" />
+<TGConnectingPoint num="7" id="719" />
+<TGConnectingPoint num="8" id="720" />
+<TGConnectingPoint num="9" id="721" />
+<TGConnectingPoint num="10" id="722" />
+<TGConnectingPoint num="11" id="723" />
+<TGConnectingPoint num="12" id="724" />
+<TGConnectingPoint num="13" id="725" />
+<TGConnectingPoint num="14" id="726" />
+<TGConnectingPoint num="15" id="727" />
+<TGConnectingPoint num="16" id="728" />
+<TGConnectingPoint num="17" id="729" />
+<TGConnectingPoint num="18" id="730" />
+<TGConnectingPoint num="19" id="731" />
+<TGConnectingPoint num="20" id="732" />
+<TGConnectingPoint num="21" id="733" />
+<TGConnectingPoint num="22" id="734" />
+<TGConnectingPoint num="23" id="735" />
+<extraparam>
+<info stereotype="MEMORY" nodeName="ExternalMemory" />
+<attributes byteDataSize="4" memorySize="1024" clockRatio="1" bufferType="0" />
+</extraparam>
+</COMPONENT>
+<SUBCOMPONENT type="1103" id="711" index="15" uid="361732ca-2c4c-4693-b4cf-a836bb95c32c" >
+<father id="736" num="0" />
+<cdparam x="499" y="446" />
+<sizeparam width="162" height="40" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="0" maxX="38" minY="0" maxY="86" />
+<infoparam name="TGComponent" value="KeyExchange::comm" />
+<new d="false" />
+<TGConnectingPoint num="0" id="703" />
+<TGConnectingPoint num="1" id="704" />
+<TGConnectingPoint num="2" id="705" />
+<TGConnectingPoint num="3" id="706" />
+<TGConnectingPoint num="4" id="707" />
+<TGConnectingPoint num="5" id="708" />
+<TGConnectingPoint num="6" id="709" />
+<TGConnectingPoint num="7" id="710" />
+<extraparam>
+<info value="KeyExchange::comm" communicationName="comm" referenceCommunicationName="KeyExchange" mappedElements="ExternalBus" priority="0" typeName="channel" />
+</extraparam>
+</SUBCOMPONENT>
+
+<COMPONENT type="1105" id="770" index="2" uid="cf5197ad-cba8-4bc4-b2f5-d22d0d8f20dd" >
<cdparam x="764" y="238" />
<sizeparam width="152" height="87" 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="Memory1" value="name" />
<new d="false" />
-<TGConnectingPoint num="0" id="632" />
-<TGConnectingPoint num="1" id="633" />
-<TGConnectingPoint num="2" id="634" />
-<TGConnectingPoint num="3" id="635" />
-<TGConnectingPoint num="4" id="636" />
-<TGConnectingPoint num="5" id="637" />
-<TGConnectingPoint num="6" id="638" />
-<TGConnectingPoint num="7" id="639" />
-<TGConnectingPoint num="8" id="640" />
-<TGConnectingPoint num="9" id="641" />
-<TGConnectingPoint num="10" id="642" />
-<TGConnectingPoint num="11" id="643" />
-<TGConnectingPoint num="12" id="644" />
-<TGConnectingPoint num="13" id="645" />
-<TGConnectingPoint num="14" id="646" />
-<TGConnectingPoint num="15" id="647" />
-<TGConnectingPoint num="16" id="648" />
-<TGConnectingPoint num="17" id="649" />
-<TGConnectingPoint num="18" id="650" />
-<TGConnectingPoint num="19" id="651" />
-<TGConnectingPoint num="20" id="652" />
-<TGConnectingPoint num="21" id="653" />
-<TGConnectingPoint num="22" id="654" />
-<TGConnectingPoint num="23" id="655" />
+<TGConnectingPoint num="0" id="746" />
+<TGConnectingPoint num="1" id="747" />
+<TGConnectingPoint num="2" id="748" />
+<TGConnectingPoint num="3" id="749" />
+<TGConnectingPoint num="4" id="750" />
+<TGConnectingPoint num="5" id="751" />
+<TGConnectingPoint num="6" id="752" />
+<TGConnectingPoint num="7" id="753" />
+<TGConnectingPoint num="8" id="754" />
+<TGConnectingPoint num="9" id="755" />
+<TGConnectingPoint num="10" id="756" />
+<TGConnectingPoint num="11" id="757" />
+<TGConnectingPoint num="12" id="758" />
+<TGConnectingPoint num="13" id="759" />
+<TGConnectingPoint num="14" id="760" />
+<TGConnectingPoint num="15" id="761" />
+<TGConnectingPoint num="16" id="762" />
+<TGConnectingPoint num="17" id="763" />
+<TGConnectingPoint num="18" id="764" />
+<TGConnectingPoint num="19" id="765" />
+<TGConnectingPoint num="20" id="766" />
+<TGConnectingPoint num="21" id="767" />
+<TGConnectingPoint num="22" id="768" />
+<TGConnectingPoint num="23" id="769" />
<extraparam>
<info stereotype="MEMORY" nodeName="Memory1" />
<attributes byteDataSize="4" memorySize="1024" clockRatio="1" bufferType="0" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1111" id="631" index="13" uid="b4fc6487-043a-42fd-8d8e-86dcc82ce888" >
-<father id="656" num="0" />
+<SUBCOMPONENT type="1111" id="745" index="16" uid="b4fc6487-043a-42fd-8d8e-86dcc82ce888" >
+<father id="770" num="0" />
<cdparam x="801" y="277" />
<sizeparam width="75" height="40" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="77" minY="0" maxY="47" />
-<infoparam name="TGComponent" value="sym" />
+<infoparam name="TGComponent" value="symKey" />
<new d="false" />
-<TGConnectingPoint num="0" id="623" />
-<TGConnectingPoint num="1" id="624" />
-<TGConnectingPoint num="2" id="625" />
-<TGConnectingPoint num="3" id="626" />
-<TGConnectingPoint num="4" id="627" />
-<TGConnectingPoint num="5" id="628" />
-<TGConnectingPoint num="6" id="629" />
-<TGConnectingPoint num="7" id="630" />
+<TGConnectingPoint num="0" id="737" />
+<TGConnectingPoint num="1" id="738" />
+<TGConnectingPoint num="2" id="739" />
+<TGConnectingPoint num="3" id="740" />
+<TGConnectingPoint num="4" id="741" />
+<TGConnectingPoint num="5" id="742" />
+<TGConnectingPoint num="6" id="743" />
+<TGConnectingPoint num="7" id="744" />
<extraparam>
-<info value="sym" referenceKeyName="sym" priority="0" typeName="key" />
+<info value="symKey" referenceKeyName="symKey" priority="0" typeName="key" />
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="1105" id="690" index="1" uid="f93263fd-4819-40db-a1cc-31b777b7e8e3" >
+<COMPONENT type="1105" id="804" index="3" uid="f93263fd-4819-40db-a1cc-31b777b7e8e3" >
<cdparam x="265" y="235" />
<sizeparam width="143" height="93" 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="Memory0" value="name" />
<new d="false" />
-<TGConnectingPoint num="0" id="666" />
-<TGConnectingPoint num="1" id="667" />
-<TGConnectingPoint num="2" id="668" />
-<TGConnectingPoint num="3" id="669" />
-<TGConnectingPoint num="4" id="670" />
-<TGConnectingPoint num="5" id="671" />
-<TGConnectingPoint num="6" id="672" />
-<TGConnectingPoint num="7" id="673" />
-<TGConnectingPoint num="8" id="674" />
-<TGConnectingPoint num="9" id="675" />
-<TGConnectingPoint num="10" id="676" />
-<TGConnectingPoint num="11" id="677" />
-<TGConnectingPoint num="12" id="678" />
-<TGConnectingPoint num="13" id="679" />
-<TGConnectingPoint num="14" id="680" />
-<TGConnectingPoint num="15" id="681" />
-<TGConnectingPoint num="16" id="682" />
-<TGConnectingPoint num="17" id="683" />
-<TGConnectingPoint num="18" id="684" />
-<TGConnectingPoint num="19" id="685" />
-<TGConnectingPoint num="20" id="686" />
-<TGConnectingPoint num="21" id="687" />
-<TGConnectingPoint num="22" id="688" />
-<TGConnectingPoint num="23" id="689" />
+<TGConnectingPoint num="0" id="780" />
+<TGConnectingPoint num="1" id="781" />
+<TGConnectingPoint num="2" id="782" />
+<TGConnectingPoint num="3" id="783" />
+<TGConnectingPoint num="4" id="784" />
+<TGConnectingPoint num="5" id="785" />
+<TGConnectingPoint num="6" id="786" />
+<TGConnectingPoint num="7" id="787" />
+<TGConnectingPoint num="8" id="788" />
+<TGConnectingPoint num="9" id="789" />
+<TGConnectingPoint num="10" id="790" />
+<TGConnectingPoint num="11" id="791" />
+<TGConnectingPoint num="12" id="792" />
+<TGConnectingPoint num="13" id="793" />
+<TGConnectingPoint num="14" id="794" />
+<TGConnectingPoint num="15" id="795" />
+<TGConnectingPoint num="16" id="796" />
+<TGConnectingPoint num="17" id="797" />
+<TGConnectingPoint num="18" id="798" />
+<TGConnectingPoint num="19" id="799" />
+<TGConnectingPoint num="20" id="800" />
+<TGConnectingPoint num="21" id="801" />
+<TGConnectingPoint num="22" id="802" />
+<TGConnectingPoint num="23" id="803" />
<extraparam>
<info stereotype="MEMORY" nodeName="Memory0" />
<attributes byteDataSize="4" memorySize="1024" clockRatio="1" bufferType="0" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1111" id="665" index="14" uid="64dea0d8-c302-4868-9dc6-872e55518cb9" >
-<father id="690" num="0" />
+<SUBCOMPONENT type="1111" id="779" index="17" uid="64dea0d8-c302-4868-9dc6-872e55518cb9" >
+<father id="804" num="0" />
<cdparam x="294" y="276" />
<sizeparam width="75" height="40" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="68" minY="0" maxY="53" />
<infoparam name="TGComponent" value="aenc" />
<new d="false" />
-<TGConnectingPoint num="0" id="657" />
-<TGConnectingPoint num="1" id="658" />
-<TGConnectingPoint num="2" id="659" />
-<TGConnectingPoint num="3" id="660" />
-<TGConnectingPoint num="4" id="661" />
-<TGConnectingPoint num="5" id="662" />
-<TGConnectingPoint num="6" id="663" />
-<TGConnectingPoint num="7" id="664" />
+<TGConnectingPoint num="0" id="771" />
+<TGConnectingPoint num="1" id="772" />
+<TGConnectingPoint num="2" id="773" />
+<TGConnectingPoint num="3" id="774" />
+<TGConnectingPoint num="4" id="775" />
+<TGConnectingPoint num="5" id="776" />
+<TGConnectingPoint num="6" id="777" />
+<TGConnectingPoint num="7" id="778" />
<extraparam>
<info value="aenc" referenceKeyName="aenc" priority="5" typeName="key" />
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="1102" id="715" index="2" uid="a942abc7-331c-4401-9bbd-56f4feeb6b9f" >
+<COMPONENT type="1102" id="829" index="4" uid="a942abc7-331c-4401-9bbd-56f4feeb6b9f" >
<cdparam x="262" y="168" />
<sizeparam width="148" height="50" 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="Bus0" value="name" />
<new d="false" />
-<TGConnectingPoint num="0" id="691" />
-<TGConnectingPoint num="1" id="692" />
-<TGConnectingPoint num="2" id="693" />
-<TGConnectingPoint num="3" id="694" />
-<TGConnectingPoint num="4" id="695" />
-<TGConnectingPoint num="5" id="696" />
-<TGConnectingPoint num="6" id="697" />
-<TGConnectingPoint num="7" id="698" />
-<TGConnectingPoint num="8" id="699" />
-<TGConnectingPoint num="9" id="700" />
-<TGConnectingPoint num="10" id="701" />
-<TGConnectingPoint num="11" id="702" />
-<TGConnectingPoint num="12" id="703" />
-<TGConnectingPoint num="13" id="704" />
-<TGConnectingPoint num="14" id="705" />
-<TGConnectingPoint num="15" id="706" />
-<TGConnectingPoint num="16" id="707" />
-<TGConnectingPoint num="17" id="708" />
-<TGConnectingPoint num="18" id="709" />
-<TGConnectingPoint num="19" id="710" />
-<TGConnectingPoint num="20" id="711" />
-<TGConnectingPoint num="21" id="712" />
-<TGConnectingPoint num="22" id="713" />
-<TGConnectingPoint num="23" id="714" />
+<TGConnectingPoint num="0" id="805" />
+<TGConnectingPoint num="1" id="806" />
+<TGConnectingPoint num="2" id="807" />
+<TGConnectingPoint num="3" id="808" />
+<TGConnectingPoint num="4" id="809" />
+<TGConnectingPoint num="5" id="810" />
+<TGConnectingPoint num="6" id="811" />
+<TGConnectingPoint num="7" id="812" />
+<TGConnectingPoint num="8" id="813" />
+<TGConnectingPoint num="9" id="814" />
+<TGConnectingPoint num="10" id="815" />
+<TGConnectingPoint num="11" id="816" />
+<TGConnectingPoint num="12" id="817" />
+<TGConnectingPoint num="13" id="818" />
+<TGConnectingPoint num="14" id="819" />
+<TGConnectingPoint num="15" id="820" />
+<TGConnectingPoint num="16" id="821" />
+<TGConnectingPoint num="17" id="822" />
+<TGConnectingPoint num="18" id="823" />
+<TGConnectingPoint num="19" id="824" />
+<TGConnectingPoint num="20" id="825" />
+<TGConnectingPoint num="21" id="826" />
+<TGConnectingPoint num="22" id="827" />
+<TGConnectingPoint num="23" id="828" />
<extraparam>
<info stereotype="BUS-RR" nodeName="Bus0" />
<attributes byteDataSize="4" arbitrationPolicy="0" sliceTime="10000" pipelineSize="1" burstSize="100" clockRatio="1" privacy="1" referenceAttack="" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1102" id="740" index="3" uid="978dc2ea-d53c-439f-9416-98d22aef1dca" >
+<COMPONENT type="1102" id="854" index="5" uid="978dc2ea-d53c-439f-9416-98d22aef1dca" >
<cdparam x="764" y="170" />
<sizeparam width="153" height="50" 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="Bus1" value="name" />
<new d="false" />
-<TGConnectingPoint num="0" id="716" />
-<TGConnectingPoint num="1" id="717" />
-<TGConnectingPoint num="2" id="718" />
-<TGConnectingPoint num="3" id="719" />
-<TGConnectingPoint num="4" id="720" />
-<TGConnectingPoint num="5" id="721" />
-<TGConnectingPoint num="6" id="722" />
-<TGConnectingPoint num="7" id="723" />
-<TGConnectingPoint num="8" id="724" />
-<TGConnectingPoint num="9" id="725" />
-<TGConnectingPoint num="10" id="726" />
-<TGConnectingPoint num="11" id="727" />
-<TGConnectingPoint num="12" id="728" />
-<TGConnectingPoint num="13" id="729" />
-<TGConnectingPoint num="14" id="730" />
-<TGConnectingPoint num="15" id="731" />
-<TGConnectingPoint num="16" id="732" />
-<TGConnectingPoint num="17" id="733" />
-<TGConnectingPoint num="18" id="734" />
-<TGConnectingPoint num="19" id="735" />
-<TGConnectingPoint num="20" id="736" />
-<TGConnectingPoint num="21" id="737" />
-<TGConnectingPoint num="22" id="738" />
-<TGConnectingPoint num="23" id="739" />
+<TGConnectingPoint num="0" id="830" />
+<TGConnectingPoint num="1" id="831" />
+<TGConnectingPoint num="2" id="832" />
+<TGConnectingPoint num="3" id="833" />
+<TGConnectingPoint num="4" id="834" />
+<TGConnectingPoint num="5" id="835" />
+<TGConnectingPoint num="6" id="836" />
+<TGConnectingPoint num="7" id="837" />
+<TGConnectingPoint num="8" id="838" />
+<TGConnectingPoint num="9" id="839" />
+<TGConnectingPoint num="10" id="840" />
+<TGConnectingPoint num="11" id="841" />
+<TGConnectingPoint num="12" id="842" />
+<TGConnectingPoint num="13" id="843" />
+<TGConnectingPoint num="14" id="844" />
+<TGConnectingPoint num="15" id="845" />
+<TGConnectingPoint num="16" id="846" />
+<TGConnectingPoint num="17" id="847" />
+<TGConnectingPoint num="18" id="848" />
+<TGConnectingPoint num="19" id="849" />
+<TGConnectingPoint num="20" id="850" />
+<TGConnectingPoint num="21" id="851" />
+<TGConnectingPoint num="22" id="852" />
+<TGConnectingPoint num="23" id="853" />
<extraparam>
<info stereotype="BUS-RR" nodeName="Bus1" />
<attributes byteDataSize="4" arbitrationPolicy="0" sliceTime="10000" pipelineSize="1" burstSize="100" clockRatio="1" privacy="1" referenceAttack="" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1102" id="765" index="4" uid="67471afc-891b-483a-96d0-3b019f030db5" >
+<COMPONENT type="1102" id="879" index="6" uid="67471afc-891b-483a-96d0-3b019f030db5" >
<cdparam x="485" y="286" />
<sizeparam width="200" height="50" 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="ExternalBus" value="name" />
<new d="false" />
-<TGConnectingPoint num="0" id="741" />
-<TGConnectingPoint num="1" id="742" />
-<TGConnectingPoint num="2" id="743" />
-<TGConnectingPoint num="3" id="744" />
-<TGConnectingPoint num="4" id="745" />
-<TGConnectingPoint num="5" id="746" />
-<TGConnectingPoint num="6" id="747" />
-<TGConnectingPoint num="7" id="748" />
-<TGConnectingPoint num="8" id="749" />
-<TGConnectingPoint num="9" id="750" />
-<TGConnectingPoint num="10" id="751" />
-<TGConnectingPoint num="11" id="752" />
-<TGConnectingPoint num="12" id="753" />
-<TGConnectingPoint num="13" id="754" />
-<TGConnectingPoint num="14" id="755" />
-<TGConnectingPoint num="15" id="756" />
-<TGConnectingPoint num="16" id="757" />
-<TGConnectingPoint num="17" id="758" />
-<TGConnectingPoint num="18" id="759" />
-<TGConnectingPoint num="19" id="760" />
-<TGConnectingPoint num="20" id="761" />
-<TGConnectingPoint num="21" id="762" />
-<TGConnectingPoint num="22" id="763" />
-<TGConnectingPoint num="23" id="764" />
+<TGConnectingPoint num="0" id="855" />
+<TGConnectingPoint num="1" id="856" />
+<TGConnectingPoint num="2" id="857" />
+<TGConnectingPoint num="3" id="858" />
+<TGConnectingPoint num="4" id="859" />
+<TGConnectingPoint num="5" id="860" />
+<TGConnectingPoint num="6" id="861" />
+<TGConnectingPoint num="7" id="862" />
+<TGConnectingPoint num="8" id="863" />
+<TGConnectingPoint num="9" id="864" />
+<TGConnectingPoint num="10" id="865" />
+<TGConnectingPoint num="11" id="866" />
+<TGConnectingPoint num="12" id="867" />
+<TGConnectingPoint num="13" id="868" />
+<TGConnectingPoint num="14" id="869" />
+<TGConnectingPoint num="15" id="870" />
+<TGConnectingPoint num="16" id="871" />
+<TGConnectingPoint num="17" id="872" />
+<TGConnectingPoint num="18" id="873" />
+<TGConnectingPoint num="19" id="874" />
+<TGConnectingPoint num="20" id="875" />
+<TGConnectingPoint num="21" id="876" />
+<TGConnectingPoint num="22" id="877" />
+<TGConnectingPoint num="23" id="878" />
<extraparam>
<info stereotype="BUS-RR" nodeName="ExternalBus" />
<attributes byteDataSize="4" arbitrationPolicy="0" sliceTime="10000" pipelineSize="1" burstSize="100" clockRatio="1" privacy="0" referenceAttack="" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1100" id="799" index="5" uid="99940017-7c78-48b4-83ad-3cf96c45f7b4" >
+<COMPONENT type="1100" id="913" index="7" uid="99940017-7c78-48b4-83ad-3cf96c45f7b4" >
<cdparam x="597" y="170" />
<sizeparam width="154" height="100" 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="CPUAlice" value="name" />
<new d="false" />
-<TGConnectingPoint num="0" id="775" />
-<TGConnectingPoint num="1" id="776" />
-<TGConnectingPoint num="2" id="777" />
-<TGConnectingPoint num="3" id="778" />
-<TGConnectingPoint num="4" id="779" />
-<TGConnectingPoint num="5" id="780" />
-<TGConnectingPoint num="6" id="781" />
-<TGConnectingPoint num="7" id="782" />
-<TGConnectingPoint num="8" id="783" />
-<TGConnectingPoint num="9" id="784" />
-<TGConnectingPoint num="10" id="785" />
-<TGConnectingPoint num="11" id="786" />
-<TGConnectingPoint num="12" id="787" />
-<TGConnectingPoint num="13" id="788" />
-<TGConnectingPoint num="14" id="789" />
-<TGConnectingPoint num="15" id="790" />
-<TGConnectingPoint num="16" id="791" />
-<TGConnectingPoint num="17" id="792" />
-<TGConnectingPoint num="18" id="793" />
-<TGConnectingPoint num="19" id="794" />
-<TGConnectingPoint num="20" id="795" />
-<TGConnectingPoint num="21" id="796" />
-<TGConnectingPoint num="22" id="797" />
-<TGConnectingPoint num="23" id="798" />
+<TGConnectingPoint num="0" id="889" />
+<TGConnectingPoint num="1" id="890" />
+<TGConnectingPoint num="2" id="891" />
+<TGConnectingPoint num="3" id="892" />
+<TGConnectingPoint num="4" id="893" />
+<TGConnectingPoint num="5" id="894" />
+<TGConnectingPoint num="6" id="895" />
+<TGConnectingPoint num="7" id="896" />
+<TGConnectingPoint num="8" id="897" />
+<TGConnectingPoint num="9" id="898" />
+<TGConnectingPoint num="10" id="899" />
+<TGConnectingPoint num="11" id="900" />
+<TGConnectingPoint num="12" id="901" />
+<TGConnectingPoint num="13" id="902" />
+<TGConnectingPoint num="14" id="903" />
+<TGConnectingPoint num="15" id="904" />
+<TGConnectingPoint num="16" id="905" />
+<TGConnectingPoint num="17" id="906" />
+<TGConnectingPoint num="18" id="907" />
+<TGConnectingPoint num="19" id="908" />
+<TGConnectingPoint num="20" id="909" />
+<TGConnectingPoint num="21" id="910" />
+<TGConnectingPoint num="22" id="911" />
+<TGConnectingPoint num="23" id="912" />
<extraparam>
<info stereotype="CPURR" nodeName="CPUAlice" />
<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="774" index="15" uid="d5e4ff43-b02e-4df5-822a-8af08ae8df42" >
-<father id="799" num="0" />
+<SUBCOMPONENT type="1101" id="888" index="18" uid="d5e4ff43-b02e-4df5-822a-8af08ae8df42" >
+<father id="913" num="0" />
<cdparam x="597" y="216" />
-<sizeparam width="146" height="40" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="154" height="40" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="8" minY="0" maxY="60" />
+<cdrectangleparam minX="0" maxX="0" minY="0" maxY="60" />
<infoparam name="TGComponent" value="KeyExchange::Alice" />
<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="0" id="880" />
+<TGConnectingPoint num="1" id="881" />
+<TGConnectingPoint num="2" id="882" />
+<TGConnectingPoint num="3" id="883" />
+<TGConnectingPoint num="4" id="884" />
+<TGConnectingPoint num="5" id="885" />
+<TGConnectingPoint num="6" id="886" />
+<TGConnectingPoint num="7" id="887" />
<extraparam>
<info value="KeyExchange::Alice" taskName="Alice" referenceTaskName="KeyExchange" priority="0" operationMEC="B" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="1100" id="833" index="6" uid="310fea23-6330-4195-bff6-34d2912d8a5a" >
+<COMPONENT type="1100" id="947" index="8" uid="310fea23-6330-4195-bff6-34d2912d8a5a" >
<cdparam x="423" y="168" />
<sizeparam width="150" height="100" 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="CPUBob" value="name" />
<new d="false" />
-<TGConnectingPoint num="0" id="809" />
-<TGConnectingPoint num="1" id="810" />
-<TGConnectingPoint num="2" id="811" />
-<TGConnectingPoint num="3" id="812" />
-<TGConnectingPoint num="4" id="813" />
-<TGConnectingPoint num="5" id="814" />
-<TGConnectingPoint num="6" id="815" />
-<TGConnectingPoint num="7" id="816" />
-<TGConnectingPoint num="8" id="817" />
-<TGConnectingPoint num="9" id="818" />
-<TGConnectingPoint num="10" id="819" />
-<TGConnectingPoint num="11" id="820" />
-<TGConnectingPoint num="12" id="821" />
-<TGConnectingPoint num="13" id="822" />
-<TGConnectingPoint num="14" id="823" />
-<TGConnectingPoint num="15" id="824" />
-<TGConnectingPoint num="16" id="825" />
-<TGConnectingPoint num="17" id="826" />
-<TGConnectingPoint num="18" id="827" />
-<TGConnectingPoint num="19" id="828" />
-<TGConnectingPoint num="20" id="829" />
-<TGConnectingPoint num="21" id="830" />
-<TGConnectingPoint num="22" id="831" />
-<TGConnectingPoint num="23" id="832" />
+<TGConnectingPoint num="0" id="923" />
+<TGConnectingPoint num="1" id="924" />
+<TGConnectingPoint num="2" id="925" />
+<TGConnectingPoint num="3" id="926" />
+<TGConnectingPoint num="4" id="927" />
+<TGConnectingPoint num="5" id="928" />
+<TGConnectingPoint num="6" id="929" />
+<TGConnectingPoint num="7" id="930" />
+<TGConnectingPoint num="8" id="931" />
+<TGConnectingPoint num="9" id="932" />
+<TGConnectingPoint num="10" id="933" />
+<TGConnectingPoint num="11" id="934" />
+<TGConnectingPoint num="12" id="935" />
+<TGConnectingPoint num="13" id="936" />
+<TGConnectingPoint num="14" id="937" />
+<TGConnectingPoint num="15" id="938" />
+<TGConnectingPoint num="16" id="939" />
+<TGConnectingPoint num="17" id="940" />
+<TGConnectingPoint num="18" id="941" />
+<TGConnectingPoint num="19" id="942" />
+<TGConnectingPoint num="20" id="943" />
+<TGConnectingPoint num="21" id="944" />
+<TGConnectingPoint num="22" id="945" />
+<TGConnectingPoint num="23" id="946" />
<extraparam>
<info stereotype="CPURR" nodeName="CPUBob" />
<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="808" index="16" uid="ede7aed1-6b32-4af7-9b32-eb75f8a23648" >
-<father id="833" num="0" />
+<SUBCOMPONENT type="1101" id="922" index="19" uid="ede7aed1-6b32-4af7-9b32-eb75f8a23648" >
+<father id="947" num="0" />
<cdparam x="424" y="212" />
-<sizeparam width="141" height="40" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="149" height="40" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="9" minY="0" maxY="60" />
+<cdrectangleparam minX="0" maxX="1" minY="0" maxY="60" />
<infoparam name="TGComponent" value="KeyExchange::Bob" />
<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="0" id="914" />
+<TGConnectingPoint num="1" id="915" />
+<TGConnectingPoint num="2" id="916" />
+<TGConnectingPoint num="3" id="917" />
+<TGConnectingPoint num="4" id="918" />
+<TGConnectingPoint num="5" id="919" />
+<TGConnectingPoint num="6" id="920" />
+<TGConnectingPoint num="7" id="921" />
<extraparam>
<info value="KeyExchange::Bob" taskName="Bob" referenceTaskName="KeyExchange" priority="0" operationMEC="A" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="125" id="834" index="7" uid="b5864c60-f718-4567-b567-681a46111fb1" >
+<CONNECTOR type="125" id="948" index="9" uid="b5864c60-f718-4567-b567-681a46111fb1" >
<cdparam x="751" y="195" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="{info}" />
-<P1 x="751" y="195" id="786" />
-<P2 x="764" y="195" id="719" />
+<P1 x="751" y="195" id="900" />
+<P2 x="764" y="195" id="833" />
<AutomaticDrawing data="true" />
<new d="false" />
<extraparam>
@@ -2242,12 +2472,12 @@
<spy value="false" />
</extraparam>
</CONNECTOR>
-<CONNECTOR type="125" id="835" index="8" uid="a54afd8d-a5ea-4ba6-9211-9f2b07bb5ab5" >
+<CONNECTOR type="125" id="949" index="10" uid="a54afd8d-a5ea-4ba6-9211-9f2b07bb5ab5" >
<cdparam x="423" y="193" />
<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="193" id="819" />
-<P2 x="410" y="193" id="695" />
+<P1 x="423" y="193" id="933" />
+<P2 x="410" y="193" id="809" />
<AutomaticDrawing data="true" />
<new d="false" />
<extraparam>
@@ -2255,12 +2485,12 @@
<spy value="false" />
</extraparam>
</CONNECTOR>
-<CONNECTOR type="125" id="836" index="9" uid="aef71511-d91a-4699-a495-ec62943837a6" >
+<CONNECTOR type="125" id="950" index="11" uid="aef71511-d91a-4699-a495-ec62943837a6" >
<cdparam x="1104" y="240" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="{info}" />
-<P1 x="840" y="238" id="633" />
-<P2 x="840" y="220" id="722" />
+<P1 x="840" y="238" id="747" />
+<P2 x="840" y="220" id="836" />
<AutomaticDrawing data="true" />
<new d="false" />
<extraparam>
@@ -2268,12 +2498,12 @@
<spy value="false" />
</extraparam>
</CONNECTOR>
-<CONNECTOR type="125" id="837" index="10" uid="ac3e7955-2d17-4750-a7e2-ae512cfd5b06" >
+<CONNECTOR type="125" id="951" index="12" uid="ac3e7955-2d17-4750-a7e2-ae512cfd5b06" >
<cdparam x="167" y="233" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="{info}" />
-<P1 x="336" y="235" id="667" />
-<P2 x="336" y="218" id="697" />
+<P1 x="336" y="235" id="781" />
+<P2 x="336" y="218" id="811" />
<AutomaticDrawing data="true" />
<new d="false" />
<extraparam>
@@ -2281,12 +2511,12 @@
<spy value="false" />
</extraparam>
</CONNECTOR>
-<CONNECTOR type="125" id="838" index="11" uid="c057009f-03b1-453f-a9fb-fdfbfd8938b8" >
+<CONNECTOR type="125" id="952" index="13" uid="c057009f-03b1-453f-a9fb-fdfbfd8938b8" >
<cdparam x="719" y="276" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="{info}" />
-<P1 x="635" y="270" id="789" />
-<P2 x="635" y="286" id="750" />
+<P1 x="635" y="270" id="903" />
+<P2 x="635" y="286" id="864" />
<AutomaticDrawing data="true" />
<new d="false" />
<extraparam>
@@ -2294,12 +2524,12 @@
<spy value="false" />
</extraparam>
</CONNECTOR>
-<CONNECTOR type="125" id="839" index="12" uid="2470dbb4-4cc1-478e-9fd8-d9d44e8a6002" >
+<CONNECTOR type="125" id="953" index="14" uid="2470dbb4-4cc1-478e-9fd8-d9d44e8a6002" >
<cdparam x="513" y="277" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="{info}" />
-<P1 x="535" y="268" id="824" />
-<P2 x="535" y="286" id="749" />
+<P1 x="535" y="268" id="938" />
+<P2 x="535" y="286" id="863" />
<AutomaticDrawing data="true" />
<new d="false" />
<extraparam>
@@ -2317,43 +2547,43 @@
<Modeling type="TML Component Design" nameTab="MAC" tabs="TML Component Task Diagram$Bob$Alice" >
<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="840" index="0" uid="e8f4240b-cc71-4178-b6f0-27e859e93e2a" >
+<CONNECTOR type="126" id="954" index="0" uid="e8f4240b-cc71-4178-b6f0-27e859e93e2a" >
<cdparam x="260" y="145" />
<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="280" y="160" id="852" />
-<P2 x="334" y="160" id="841" />
+<P1 x="267" y="147" id="966" />
+<P2 x="347" y="147" id="955" />
<AutomaticDrawing data="true" />
<new d="false" />
</CONNECTOR>
-<COMPONENT type="1202" id="851" index="1" uid="37012e36-c152-4067-ac40-161408bd27cc" >
+<COMPONENT type="1202" id="965" index="1" uid="37012e36-c152-4067-ac40-161408bd27cc" >
<cdparam x="347" y="91" />
<sizeparam width="133" height="134" 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="Bob" />
<new d="false" />
-<TGConnectingPoint num="0" id="843" />
-<TGConnectingPoint num="1" id="844" />
-<TGConnectingPoint num="2" id="845" />
-<TGConnectingPoint num="3" id="846" />
-<TGConnectingPoint num="4" id="847" />
-<TGConnectingPoint num="5" id="848" />
-<TGConnectingPoint num="6" id="849" />
-<TGConnectingPoint num="7" id="850" />
+<TGConnectingPoint num="0" id="957" />
+<TGConnectingPoint num="1" id="958" />
+<TGConnectingPoint num="2" id="959" />
+<TGConnectingPoint num="3" id="960" />
+<TGConnectingPoint num="4" id="961" />
+<TGConnectingPoint num="5" id="962" />
+<TGConnectingPoint num="6" id="963" />
+<TGConnectingPoint num="7" id="964" />
<extraparam>
<Data isAttacker="No" daemon="false" periodic="false" periodValue="" unit="" Operation="" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1203" id="842" index="3" uid="dcdf0736-f94e-4d14-bf15-daee68a8347e" >
-<father id="851" num="0" />
+<SUBCOMPONENT type="1203" id="956" index="3" uid="dcdf0736-f94e-4d14-bf15-daee68a8347e" >
+<father id="965" num="0" />
<cdparam x="334" y="147" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="120" minY="-13" maxY="121" />
<infoparam name="Primitive port" value="Channel comm" />
<new d="false" />
-<TGConnectingPoint num="0" id="841" />
+<TGConnectingPoint num="0" id="955" />
<extraparam>
<Prop commName="comm" commType="0" origin="false" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="uint_16" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="true" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="0" />
<Type type="0" typeOther="" />
@@ -2364,34 +2594,34 @@
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="1202" id="862" index="2" uid="6980c11b-5b3e-45d5-aeed-4d2e520c0e58" >
+<COMPONENT type="1202" id="976" index="2" uid="6980c11b-5b3e-45d5-aeed-4d2e520c0e58" >
<cdparam x="111" y="93" />
<sizeparam width="156" height="129" 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="Alice" />
<new d="false" />
-<TGConnectingPoint num="0" id="854" />
-<TGConnectingPoint num="1" id="855" />
-<TGConnectingPoint num="2" id="856" />
-<TGConnectingPoint num="3" id="857" />
-<TGConnectingPoint num="4" id="858" />
-<TGConnectingPoint num="5" id="859" />
-<TGConnectingPoint num="6" id="860" />
-<TGConnectingPoint num="7" id="861" />
+<TGConnectingPoint num="0" id="968" />
+<TGConnectingPoint num="1" id="969" />
+<TGConnectingPoint num="2" id="970" />
+<TGConnectingPoint num="3" id="971" />
+<TGConnectingPoint num="4" id="972" />
+<TGConnectingPoint num="5" id="973" />
+<TGConnectingPoint num="6" id="974" />
+<TGConnectingPoint num="7" id="975" />
<extraparam>
<Data isAttacker="No" daemon="false" periodic="false" periodValue="" unit="" Operation="" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1203" id="853" index="4" uid="202b35dc-5f5c-42d9-b643-a1e886555092" >
-<father id="862" num="0" />
+<SUBCOMPONENT type="1203" id="967" index="4" uid="202b35dc-5f5c-42d9-b643-a1e886555092" >
+<father id="976" num="0" />
<cdparam x="254" y="147" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="143" minY="-13" maxY="116" />
<infoparam name="Primitive port" value="Channel comm" />
<new d="false" />
-<TGConnectingPoint num="0" id="852" />
+<TGConnectingPoint num="0" id="966" />
<extraparam>
<Prop commName="comm" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="uint_16" associatedEvent="" checkConf="true" checkConfStatus="1" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="0" />
<Type type="0" typeOther="" />
@@ -2406,17 +2636,17 @@
</TMLComponentTaskDiagramPanel>
<TMLActivityDiagramPanel name="Bob" minX="10" maxX="2500" minY="10" maxY="1500" zoom="1.0" >
-<COMPONENT type="1001" id="864" index="0" uid="d0043d2a-f233-43c0-b08d-42f246447152" >
+<COMPONENT type="1001" id="978" index="0" uid="d0043d2a-f233-43c0-b08d-42f246447152" >
<cdparam x="398" y="199" />
<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" />
<new d="false" />
-<TGConnectingPoint num="0" id="863" />
+<TGConnectingPoint num="0" id="977" />
</COMPONENT>
-<COMPONENT type="1036" id="867" index="1" uid="5c68f130-d6e8-447d-9c38-c971236e8bd6" >
+<COMPONENT type="1036" id="981" index="1" uid="5c68f130-d6e8-447d-9c38-c971236e8bd6" >
<cdparam x="401" y="148" />
<sizeparam width="15" height="35" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -2424,62 +2654,62 @@
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="decrypt" value="null" />
<new d="false" />
-<TGConnectingPoint num="0" id="865" />
-<TGConnectingPoint num="1" id="866" />
+<TGConnectingPoint num="0" id="979" />
+<TGConnectingPoint num="1" id="980" />
<extraparam>
<Data secPattern="mac" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1009" id="870" index="2" uid="d9de7f37-657d-43b4-b4b1-e19d7831ba42" >
-<cdparam x="373" y="99" />
-<sizeparam width="69" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1009" id="984" index="2" uid="d9de7f37-657d-43b4-b4b1-e19d7831ba42" >
+<cdparam x="363" y="99" />
+<sizeparam width="89" 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) " />
<new d="false" />
-<TGConnectingPoint num="0" id="868" />
-<TGConnectingPoint num="1" id="869" />
+<TGConnectingPoint num="0" id="982" />
+<TGConnectingPoint num="1" id="983" />
<extraparam>
<Data channelName="comm" nbOfSamples="1" secPattern="mac" isAttacker="No" isEncForm="Yes" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1000" id="872" index="3" uid="3d4df8ac-0b9d-4786-8ab0-4767213e85a3" >
+<COMPONENT type="1000" id="986" index="3" uid="3d4df8ac-0b9d-4786-8ab0-4767213e85a3" >
<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="2500" minY="10" maxY="1500" />
<infoparam name="start state" value="null" />
<new d="false" />
-<TGConnectingPoint num="0" id="871" />
+<TGConnectingPoint num="0" id="985" />
</COMPONENT>
-<CONNECTOR type="115" id="873" index="4" uid="548b0df6-b4a3-4eaa-80f4-6b23582955b4" >
+<CONNECTOR type="115" id="987" index="4" uid="548b0df6-b4a3-4eaa-80f4-6b23582955b4" >
<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="407" y="70" id="871" />
-<P2 x="407" y="94" id="868" />
+<P1 x="407" y="70" id="985" />
+<P2 x="407" y="94" id="982" />
<AutomaticDrawing data="true" />
<new d="false" />
</CONNECTOR>
-<CONNECTOR type="115" id="874" index="5" uid="bee636ef-a10c-462d-8d58-274926a2b608" >
+<CONNECTOR type="115" id="988" index="5" uid="bee636ef-a10c-462d-8d58-274926a2b608" >
<cdparam x="407" y="124" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="407" y="124" id="869" />
-<P2 x="408" y="143" id="865" />
+<P1 x="407" y="124" id="983" />
+<P2 x="408" y="143" id="979" />
<AutomaticDrawing data="true" />
<new d="false" />
</CONNECTOR>
-<CONNECTOR type="115" id="875" index="6" uid="14ea3a7e-3e61-42e1-9d04-4735ac00d1be" >
+<CONNECTOR type="115" id="989" index="6" uid="14ea3a7e-3e61-42e1-9d04-4735ac00d1be" >
<cdparam x="408" y="193" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="408" y="193" id="866" />
-<P2 x="408" y="194" id="863" />
+<P1 x="408" y="193" id="980" />
+<P2 x="408" y="194" id="977" />
<AutomaticDrawing data="true" />
<new d="false" />
</CONNECTOR>
@@ -2487,7 +2717,7 @@
</TMLActivityDiagramPanel>
<TMLActivityDiagramPanel name="Alice" minX="10" maxX="2500" minY="10" maxY="1500" zoom="1.0" >
-<COMPONENT type="1035" id="878" index="0" uid="ec1d5bc9-b501-4e61-baee-0bf0b2c85e57" >
+<COMPONENT type="1035" id="992" index="0" uid="ec1d5bc9-b501-4e61-baee-0bf0b2c85e57" >
<cdparam x="400" y="100" />
<sizeparam width="15" height="35" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -2495,72 +2725,72 @@
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="encrypt" value="null" />
<new d="false" />
-<TGConnectingPoint num="0" id="876" />
-<TGConnectingPoint num="1" id="877" />
+<TGConnectingPoint num="0" id="990" />
+<TGConnectingPoint num="1" id="991" />
<extraparam>
<Data secContext="mac" type="MAC" overhead="" size="" encTime="100" decTime="100" nonce="" key="" algorithm="" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1006" id="881" index="1" uid="9a9e86a8-7323-4548-bb87-c500c35458b4" >
-<cdparam x="367" y="174" />
-<sizeparam width="81" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1006" id="995" index="1" uid="9a9e86a8-7323-4548-bb87-c500c35458b4" >
+<cdparam x="365" y="174" />
+<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="write channel" value="comm(1)" />
<new d="false" />
-<TGConnectingPoint num="0" id="879" />
-<TGConnectingPoint num="1" id="880" />
+<TGConnectingPoint num="0" id="993" />
+<TGConnectingPoint num="1" id="994" />
<extraparam>
<Data channelName="comm" nbOfSamples="1" secPattern="mac" isAttacker="No" isEncForm="Yes" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1001" id="883" index="2" uid="71545754-6ceb-48c6-ad4a-124cd34ef610" >
+<COMPONENT type="1001" id="997" index="2" uid="71545754-6ceb-48c6-ad4a-124cd34ef610" >
<cdparam x="397" y="223" />
<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" />
<new d="false" />
-<TGConnectingPoint num="0" id="882" />
+<TGConnectingPoint num="0" id="996" />
</COMPONENT>
-<COMPONENT type="1000" id="885" index="3" uid="63930d2b-30e4-4831-ba8f-f7c3720ad5f0" >
+<COMPONENT type="1000" id="999" index="3" uid="63930d2b-30e4-4831-ba8f-f7c3720ad5f0" >
<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="2500" minY="10" maxY="1500" />
<infoparam name="start state" value="null" />
<new d="false" />
-<TGConnectingPoint num="0" id="884" />
+<TGConnectingPoint num="0" id="998" />
</COMPONENT>
-<CONNECTOR type="115" id="886" index="4" uid="5a31a774-540b-41e5-bc46-6fac70569df0" >
+<CONNECTOR type="115" id="1000" index="4" uid="5a31a774-540b-41e5-bc46-6fac70569df0" >
<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="407" y="70" id="884" />
-<P2 x="407" y="95" id="876" />
+<P1 x="407" y="70" id="998" />
+<P2 x="407" y="95" id="990" />
<AutomaticDrawing data="true" />
<new d="false" />
</CONNECTOR>
-<CONNECTOR type="115" id="887" index="5" uid="f996d27f-091a-4c79-90b0-0857ba4d0f51" >
+<CONNECTOR type="115" id="1001" index="5" uid="f996d27f-091a-4c79-90b0-0857ba4d0f51" >
<cdparam x="407" y="140" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="407" y="145" id="877" />
-<P2 x="407" y="169" id="879" />
+<P1 x="407" y="145" id="991" />
+<P2 x="407" y="169" id="993" />
<AutomaticDrawing data="true" />
<new d="false" />
</CONNECTOR>
-<CONNECTOR type="115" id="888" index="6" uid="222fcad3-b54d-470f-8d93-416350955d23" >
+<CONNECTOR type="115" id="1002" index="6" uid="222fcad3-b54d-470f-8d93-416350955d23" >
<cdparam x="401" y="201" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="407" y="199" id="880" />
-<P2 x="407" y="218" id="882" />
+<P1 x="407" y="199" id="994" />
+<P2 x="407" y="218" id="996" />
<AutomaticDrawing data="true" />
<new d="false" />
</CONNECTOR>
@@ -2574,12 +2804,12 @@
<Modeling type="TML Architecture" nameTab="MACArch" >
<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" >
-<CONNECTOR type="125" id="1680" index="0" uid="08d74845-f87a-4fe7-b541-a1bcb2e2eff1" >
+<CONNECTOR type="125" id="1003" index="0" uid="08d74845-f87a-4fe7-b541-a1bcb2e2eff1" >
<cdparam x="491" y="443" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="{info}" />
-<P1 x="494" y="437" id="1657" />
-<P2 x="487" y="350" id="1013" />
+<P1 x="485" y="354" id="1014" />
+<P2 x="485" y="312" id="1162" />
<AutomaticDrawing data="true" />
<new d="false" />
<extraparam>
@@ -2587,408 +2817,408 @@
<spy value="false" />
</extraparam>
</CONNECTOR>
-<COMPONENT type="1105" id="1655" index="1" uid="09d764f1-7f5e-4877-b6dd-1935adbd7ff6" >
-<cdparam x="394" y="437" />
-<sizeparam width="200" height="200" 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="Memory0" value="name" />
-<new d="false" />
-<TGConnectingPoint num="0" id="1656" />
-<TGConnectingPoint num="1" id="1657" />
-<TGConnectingPoint num="2" id="1658" />
-<TGConnectingPoint num="3" id="1659" />
-<TGConnectingPoint num="4" id="1660" />
-<TGConnectingPoint num="5" id="1661" />
-<TGConnectingPoint num="6" id="1662" />
-<TGConnectingPoint num="7" id="1663" />
-<TGConnectingPoint num="8" id="1664" />
-<TGConnectingPoint num="9" id="1665" />
-<TGConnectingPoint num="10" id="1666" />
-<TGConnectingPoint num="11" id="1667" />
-<TGConnectingPoint num="12" id="1668" />
-<TGConnectingPoint num="13" id="1669" />
-<TGConnectingPoint num="14" id="1670" />
-<TGConnectingPoint num="15" id="1671" />
-<TGConnectingPoint num="16" id="1672" />
-<TGConnectingPoint num="17" id="1673" />
-<TGConnectingPoint num="18" id="1674" />
-<TGConnectingPoint num="19" id="1675" />
-<TGConnectingPoint num="20" id="1676" />
-<TGConnectingPoint num="21" id="1677" />
-<TGConnectingPoint num="22" id="1678" />
-<TGConnectingPoint num="23" id="1679" />
-<extraparam>
-<info stereotype="MEMORY" nodeName="Memory0" />
+<COMPONENT type="1105" id="1037" index="1" uid="09d764f1-7f5e-4877-b6dd-1935adbd7ff6" >
+<cdparam x="392" y="354" />
+<sizeparam width="187" height="131" 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="ExternalMemory" value="name" />
+<new d="false" />
+<TGConnectingPoint num="0" id="1013" />
+<TGConnectingPoint num="1" id="1014" />
+<TGConnectingPoint num="2" id="1015" />
+<TGConnectingPoint num="3" id="1016" />
+<TGConnectingPoint num="4" id="1017" />
+<TGConnectingPoint num="5" id="1018" />
+<TGConnectingPoint num="6" id="1019" />
+<TGConnectingPoint num="7" id="1020" />
+<TGConnectingPoint num="8" id="1021" />
+<TGConnectingPoint num="9" id="1022" />
+<TGConnectingPoint num="10" id="1023" />
+<TGConnectingPoint num="11" id="1024" />
+<TGConnectingPoint num="12" id="1025" />
+<TGConnectingPoint num="13" id="1026" />
+<TGConnectingPoint num="14" id="1027" />
+<TGConnectingPoint num="15" id="1028" />
+<TGConnectingPoint num="16" id="1029" />
+<TGConnectingPoint num="17" id="1030" />
+<TGConnectingPoint num="18" id="1031" />
+<TGConnectingPoint num="19" id="1032" />
+<TGConnectingPoint num="20" id="1033" />
+<TGConnectingPoint num="21" id="1034" />
+<TGConnectingPoint num="22" id="1035" />
+<TGConnectingPoint num="23" id="1036" />
+<extraparam>
+<info stereotype="MEMORY" nodeName="ExternalMemory" />
<attributes byteDataSize="4" memorySize="1024" clockRatio="1" bufferType="0" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1103" id="1681" index="15" uid="82785cce-97cd-4347-8d5a-01ffdc771be5" >
-<father id="1655" num="0" />
-<cdparam x="437" y="515" />
-<sizeparam width="104" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1103" id="1012" index="15" uid="82785cce-97cd-4347-8d5a-01ffdc771be5" >
+<father id="1037" num="0" />
+<cdparam x="432" y="408" />
+<sizeparam width="106" height="40" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="96" minY="0" maxY="160" />
+<cdrectangleparam minX="0" maxX="81" minY="0" maxY="91" />
<infoparam name="TGComponent" value="MAC::comm" />
<new d="false" />
-<TGConnectingPoint num="0" id="1682" />
-<TGConnectingPoint num="1" id="1683" />
-<TGConnectingPoint num="2" id="1684" />
-<TGConnectingPoint num="3" id="1685" />
-<TGConnectingPoint num="4" id="1686" />
-<TGConnectingPoint num="5" id="1687" />
-<TGConnectingPoint num="6" id="1688" />
-<TGConnectingPoint num="7" id="1689" />
+<TGConnectingPoint num="0" id="1004" />
+<TGConnectingPoint num="1" id="1005" />
+<TGConnectingPoint num="2" id="1006" />
+<TGConnectingPoint num="3" id="1007" />
+<TGConnectingPoint num="4" id="1008" />
+<TGConnectingPoint num="5" id="1009" />
+<TGConnectingPoint num="6" id="1010" />
+<TGConnectingPoint num="7" id="1011" />
<extraparam>
<info value="MAC::comm" communicationName="comm" referenceCommunicationName="MAC" mappedElements="ExternalBus" priority="0" typeName="channel" />
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="1105" id="922" index="2" uid="3d4b3bc6-aa2f-42e9-8da6-f535750366d1" >
-<cdparam x="750" y="82" />
+<COMPONENT type="1105" id="1071" index="2" uid="3d4b3bc6-aa2f-42e9-8da6-f535750366d1" >
+<cdparam x="813" y="80" />
<sizeparam width="120" height="96" 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="Memory1" value="name" />
<new d="false" />
-<TGConnectingPoint num="0" id="898" />
-<TGConnectingPoint num="1" id="899" />
-<TGConnectingPoint num="2" id="900" />
-<TGConnectingPoint num="3" id="901" />
-<TGConnectingPoint num="4" id="902" />
-<TGConnectingPoint num="5" id="903" />
-<TGConnectingPoint num="6" id="904" />
-<TGConnectingPoint num="7" id="905" />
-<TGConnectingPoint num="8" id="906" />
-<TGConnectingPoint num="9" id="907" />
-<TGConnectingPoint num="10" id="908" />
-<TGConnectingPoint num="11" id="909" />
-<TGConnectingPoint num="12" id="910" />
-<TGConnectingPoint num="13" id="911" />
-<TGConnectingPoint num="14" id="912" />
-<TGConnectingPoint num="15" id="913" />
-<TGConnectingPoint num="16" id="914" />
-<TGConnectingPoint num="17" id="915" />
-<TGConnectingPoint num="18" id="916" />
-<TGConnectingPoint num="19" id="917" />
-<TGConnectingPoint num="20" id="918" />
-<TGConnectingPoint num="21" id="919" />
-<TGConnectingPoint num="22" id="920" />
-<TGConnectingPoint num="23" id="921" />
+<TGConnectingPoint num="0" id="1047" />
+<TGConnectingPoint num="1" id="1048" />
+<TGConnectingPoint num="2" id="1049" />
+<TGConnectingPoint num="3" id="1050" />
+<TGConnectingPoint num="4" id="1051" />
+<TGConnectingPoint num="5" id="1052" />
+<TGConnectingPoint num="6" id="1053" />
+<TGConnectingPoint num="7" id="1054" />
+<TGConnectingPoint num="8" id="1055" />
+<TGConnectingPoint num="9" id="1056" />
+<TGConnectingPoint num="10" id="1057" />
+<TGConnectingPoint num="11" id="1058" />
+<TGConnectingPoint num="12" id="1059" />
+<TGConnectingPoint num="13" id="1060" />
+<TGConnectingPoint num="14" id="1061" />
+<TGConnectingPoint num="15" id="1062" />
+<TGConnectingPoint num="16" id="1063" />
+<TGConnectingPoint num="17" id="1064" />
+<TGConnectingPoint num="18" id="1065" />
+<TGConnectingPoint num="19" id="1066" />
+<TGConnectingPoint num="20" id="1067" />
+<TGConnectingPoint num="21" id="1068" />
+<TGConnectingPoint num="22" id="1069" />
+<TGConnectingPoint num="23" id="1070" />
<extraparam>
<info stereotype="MEMORY" nodeName="Memory1" />
<attributes byteDataSize="4" memorySize="1024" clockRatio="1" bufferType="0" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1111" id="897" index="16" uid="308a9e4f-73d1-4315-8d62-8af3e667e0b1" >
-<father id="922" num="0" />
-<cdparam x="766" y="125" />
+<SUBCOMPONENT type="1111" id="1046" index="16" uid="308a9e4f-73d1-4315-8d62-8af3e667e0b1" >
+<father id="1071" num="0" />
+<cdparam x="829" y="123" />
<sizeparam width="75" height="40" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="45" minY="0" maxY="56" />
<infoparam name="TGComponent" value="mac" />
<new d="false" />
-<TGConnectingPoint num="0" id="889" />
-<TGConnectingPoint num="1" id="890" />
-<TGConnectingPoint num="2" id="891" />
-<TGConnectingPoint num="3" id="892" />
-<TGConnectingPoint num="4" id="893" />
-<TGConnectingPoint num="5" id="894" />
-<TGConnectingPoint num="6" id="895" />
-<TGConnectingPoint num="7" id="896" />
+<TGConnectingPoint num="0" id="1038" />
+<TGConnectingPoint num="1" id="1039" />
+<TGConnectingPoint num="2" id="1040" />
+<TGConnectingPoint num="3" id="1041" />
+<TGConnectingPoint num="4" id="1042" />
+<TGConnectingPoint num="5" id="1043" />
+<TGConnectingPoint num="6" id="1044" />
+<TGConnectingPoint num="7" id="1045" />
<extraparam>
<info value="mac" referenceKeyName="mac" priority="0" typeName="key" />
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="1105" id="956" index="3" uid="9673b5d6-316a-41a0-b498-54e7641c800f" >
+<COMPONENT type="1105" id="1105" index="3" uid="9673b5d6-316a-41a0-b498-54e7641c800f" >
<cdparam x="119" y="161" />
<sizeparam width="109" height="97" 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="Memory0" value="name" />
<new d="false" />
-<TGConnectingPoint num="0" id="932" />
-<TGConnectingPoint num="1" id="933" />
-<TGConnectingPoint num="2" id="934" />
-<TGConnectingPoint num="3" id="935" />
-<TGConnectingPoint num="4" id="936" />
-<TGConnectingPoint num="5" id="937" />
-<TGConnectingPoint num="6" id="938" />
-<TGConnectingPoint num="7" id="939" />
-<TGConnectingPoint num="8" id="940" />
-<TGConnectingPoint num="9" id="941" />
-<TGConnectingPoint num="10" id="942" />
-<TGConnectingPoint num="11" id="943" />
-<TGConnectingPoint num="12" id="944" />
-<TGConnectingPoint num="13" id="945" />
-<TGConnectingPoint num="14" id="946" />
-<TGConnectingPoint num="15" id="947" />
-<TGConnectingPoint num="16" id="948" />
-<TGConnectingPoint num="17" id="949" />
-<TGConnectingPoint num="18" id="950" />
-<TGConnectingPoint num="19" id="951" />
-<TGConnectingPoint num="20" id="952" />
-<TGConnectingPoint num="21" id="953" />
-<TGConnectingPoint num="22" id="954" />
-<TGConnectingPoint num="23" id="955" />
+<TGConnectingPoint num="0" id="1081" />
+<TGConnectingPoint num="1" id="1082" />
+<TGConnectingPoint num="2" id="1083" />
+<TGConnectingPoint num="3" id="1084" />
+<TGConnectingPoint num="4" id="1085" />
+<TGConnectingPoint num="5" id="1086" />
+<TGConnectingPoint num="6" id="1087" />
+<TGConnectingPoint num="7" id="1088" />
+<TGConnectingPoint num="8" id="1089" />
+<TGConnectingPoint num="9" id="1090" />
+<TGConnectingPoint num="10" id="1091" />
+<TGConnectingPoint num="11" id="1092" />
+<TGConnectingPoint num="12" id="1093" />
+<TGConnectingPoint num="13" id="1094" />
+<TGConnectingPoint num="14" id="1095" />
+<TGConnectingPoint num="15" id="1096" />
+<TGConnectingPoint num="16" id="1097" />
+<TGConnectingPoint num="17" id="1098" />
+<TGConnectingPoint num="18" id="1099" />
+<TGConnectingPoint num="19" id="1100" />
+<TGConnectingPoint num="20" id="1101" />
+<TGConnectingPoint num="21" id="1102" />
+<TGConnectingPoint num="22" id="1103" />
+<TGConnectingPoint num="23" id="1104" />
<extraparam>
<info stereotype="MEMORY" nodeName="Memory0" />
<attributes byteDataSize="4" memorySize="1024" clockRatio="1" bufferType="0" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1111" id="931" index="17" uid="1fa2691f-6b3b-4ab9-951c-4e1a903783bb" >
-<father id="956" num="0" />
+<SUBCOMPONENT type="1111" id="1080" index="17" uid="1fa2691f-6b3b-4ab9-951c-4e1a903783bb" >
+<father id="1105" num="0" />
<cdparam x="133" y="210" />
<sizeparam width="75" height="40" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="34" minY="0" maxY="57" />
<infoparam name="TGComponent" value="mac" />
<new d="false" />
-<TGConnectingPoint num="0" id="923" />
-<TGConnectingPoint num="1" id="924" />
-<TGConnectingPoint num="2" id="925" />
-<TGConnectingPoint num="3" id="926" />
-<TGConnectingPoint num="4" id="927" />
-<TGConnectingPoint num="5" id="928" />
-<TGConnectingPoint num="6" id="929" />
-<TGConnectingPoint num="7" id="930" />
+<TGConnectingPoint num="0" id="1072" />
+<TGConnectingPoint num="1" id="1073" />
+<TGConnectingPoint num="2" id="1074" />
+<TGConnectingPoint num="3" id="1075" />
+<TGConnectingPoint num="4" id="1076" />
+<TGConnectingPoint num="5" id="1077" />
+<TGConnectingPoint num="6" id="1078" />
+<TGConnectingPoint num="7" id="1079" />
<extraparam>
<info value="mac" referenceKeyName="mac" priority="5" typeName="key" />
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="1102" id="981" index="4" uid="4291e747-9de5-4c63-8856-98abdb5e82b7" >
+<COMPONENT type="1102" id="1130" index="4" uid="4291e747-9de5-4c63-8856-98abdb5e82b7" >
<cdparam x="103" y="95" />
<sizeparam width="140" height="50" 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="Bus0" value="name" />
<new d="false" />
-<TGConnectingPoint num="0" id="957" />
-<TGConnectingPoint num="1" id="958" />
-<TGConnectingPoint num="2" id="959" />
-<TGConnectingPoint num="3" id="960" />
-<TGConnectingPoint num="4" id="961" />
-<TGConnectingPoint num="5" id="962" />
-<TGConnectingPoint num="6" id="963" />
-<TGConnectingPoint num="7" id="964" />
-<TGConnectingPoint num="8" id="965" />
-<TGConnectingPoint num="9" id="966" />
-<TGConnectingPoint num="10" id="967" />
-<TGConnectingPoint num="11" id="968" />
-<TGConnectingPoint num="12" id="969" />
-<TGConnectingPoint num="13" id="970" />
-<TGConnectingPoint num="14" id="971" />
-<TGConnectingPoint num="15" id="972" />
-<TGConnectingPoint num="16" id="973" />
-<TGConnectingPoint num="17" id="974" />
-<TGConnectingPoint num="18" id="975" />
-<TGConnectingPoint num="19" id="976" />
-<TGConnectingPoint num="20" id="977" />
-<TGConnectingPoint num="21" id="978" />
-<TGConnectingPoint num="22" id="979" />
-<TGConnectingPoint num="23" id="980" />
+<TGConnectingPoint num="0" id="1106" />
+<TGConnectingPoint num="1" id="1107" />
+<TGConnectingPoint num="2" id="1108" />
+<TGConnectingPoint num="3" id="1109" />
+<TGConnectingPoint num="4" id="1110" />
+<TGConnectingPoint num="5" id="1111" />
+<TGConnectingPoint num="6" id="1112" />
+<TGConnectingPoint num="7" id="1113" />
+<TGConnectingPoint num="8" id="1114" />
+<TGConnectingPoint num="9" id="1115" />
+<TGConnectingPoint num="10" id="1116" />
+<TGConnectingPoint num="11" id="1117" />
+<TGConnectingPoint num="12" id="1118" />
+<TGConnectingPoint num="13" id="1119" />
+<TGConnectingPoint num="14" id="1120" />
+<TGConnectingPoint num="15" id="1121" />
+<TGConnectingPoint num="16" id="1122" />
+<TGConnectingPoint num="17" id="1123" />
+<TGConnectingPoint num="18" id="1124" />
+<TGConnectingPoint num="19" id="1125" />
+<TGConnectingPoint num="20" id="1126" />
+<TGConnectingPoint num="21" id="1127" />
+<TGConnectingPoint num="22" id="1128" />
+<TGConnectingPoint num="23" id="1129" />
<extraparam>
<info stereotype="BUS-RR" nodeName="Bus0" />
<attributes byteDataSize="4" arbitrationPolicy="0" sliceTime="10000" pipelineSize="1" burstSize="100" clockRatio="1" privacy="1" referenceAttack="" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1102" id="1006" index="5" uid="9a1aa6ff-14dc-4db4-af58-e5cd76acec4e" >
-<cdparam x="672" y="200" />
+<COMPONENT type="1102" id="1155" index="5" uid="9a1aa6ff-14dc-4db4-af58-e5cd76acec4e" >
+<cdparam x="700" y="200" />
<sizeparam width="165" height="50" 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="Bus1" value="name" />
<new d="false" />
-<TGConnectingPoint num="0" id="982" />
-<TGConnectingPoint num="1" id="983" />
-<TGConnectingPoint num="2" id="984" />
-<TGConnectingPoint num="3" id="985" />
-<TGConnectingPoint num="4" id="986" />
-<TGConnectingPoint num="5" id="987" />
-<TGConnectingPoint num="6" id="988" />
-<TGConnectingPoint num="7" id="989" />
-<TGConnectingPoint num="8" id="990" />
-<TGConnectingPoint num="9" id="991" />
-<TGConnectingPoint num="10" id="992" />
-<TGConnectingPoint num="11" id="993" />
-<TGConnectingPoint num="12" id="994" />
-<TGConnectingPoint num="13" id="995" />
-<TGConnectingPoint num="14" id="996" />
-<TGConnectingPoint num="15" id="997" />
-<TGConnectingPoint num="16" id="998" />
-<TGConnectingPoint num="17" id="999" />
-<TGConnectingPoint num="18" id="1000" />
-<TGConnectingPoint num="19" id="1001" />
-<TGConnectingPoint num="20" id="1002" />
-<TGConnectingPoint num="21" id="1003" />
-<TGConnectingPoint num="22" id="1004" />
-<TGConnectingPoint num="23" id="1005" />
+<TGConnectingPoint num="0" id="1131" />
+<TGConnectingPoint num="1" id="1132" />
+<TGConnectingPoint num="2" id="1133" />
+<TGConnectingPoint num="3" id="1134" />
+<TGConnectingPoint num="4" id="1135" />
+<TGConnectingPoint num="5" id="1136" />
+<TGConnectingPoint num="6" id="1137" />
+<TGConnectingPoint num="7" id="1138" />
+<TGConnectingPoint num="8" id="1139" />
+<TGConnectingPoint num="9" id="1140" />
+<TGConnectingPoint num="10" id="1141" />
+<TGConnectingPoint num="11" id="1142" />
+<TGConnectingPoint num="12" id="1143" />
+<TGConnectingPoint num="13" id="1144" />
+<TGConnectingPoint num="14" id="1145" />
+<TGConnectingPoint num="15" id="1146" />
+<TGConnectingPoint num="16" id="1147" />
+<TGConnectingPoint num="17" id="1148" />
+<TGConnectingPoint num="18" id="1149" />
+<TGConnectingPoint num="19" id="1150" />
+<TGConnectingPoint num="20" id="1151" />
+<TGConnectingPoint num="21" id="1152" />
+<TGConnectingPoint num="22" id="1153" />
+<TGConnectingPoint num="23" id="1154" />
<extraparam>
<info stereotype="BUS-RR" nodeName="Bus1" />
<attributes byteDataSize="4" arbitrationPolicy="0" sliceTime="10000" pipelineSize="1" burstSize="100" clockRatio="1" privacy="1" referenceAttack="" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1102" id="1031" index="6" uid="4887a4ba-b1f2-4ee7-a3c6-1d1525e06fd8" >
+<COMPONENT type="1102" id="1180" index="6" uid="4887a4ba-b1f2-4ee7-a3c6-1d1525e06fd8" >
<cdparam x="381" y="245" />
-<sizeparam width="212" height="105" minWidth="100" minHeight="50" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="209" height="67" 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="ExternalBus" value="name" />
<new d="false" />
-<TGConnectingPoint num="0" id="1007" />
-<TGConnectingPoint num="1" id="1008" />
-<TGConnectingPoint num="2" id="1009" />
-<TGConnectingPoint num="3" id="1010" />
-<TGConnectingPoint num="4" id="1011" />
-<TGConnectingPoint num="5" id="1012" />
-<TGConnectingPoint num="6" id="1013" />
-<TGConnectingPoint num="7" id="1014" />
-<TGConnectingPoint num="8" id="1015" />
-<TGConnectingPoint num="9" id="1016" />
-<TGConnectingPoint num="10" id="1017" />
-<TGConnectingPoint num="11" id="1018" />
-<TGConnectingPoint num="12" id="1019" />
-<TGConnectingPoint num="13" id="1020" />
-<TGConnectingPoint num="14" id="1021" />
-<TGConnectingPoint num="15" id="1022" />
-<TGConnectingPoint num="16" id="1023" />
-<TGConnectingPoint num="17" id="1024" />
-<TGConnectingPoint num="18" id="1025" />
-<TGConnectingPoint num="19" id="1026" />
-<TGConnectingPoint num="20" id="1027" />
-<TGConnectingPoint num="21" id="1028" />
-<TGConnectingPoint num="22" id="1029" />
-<TGConnectingPoint num="23" id="1030" />
-<extraparam>
-<info stereotype="BUS-RR" nodeName="ExternalBus" />
-<attributes byteDataSize="4" arbitrationPolicy="0" sliceTime="10000" pipelineSize="1" burstSize="100" clockRatio="1" privacy="0" referenceAttack="" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1100" id="1065" index="7" uid="93ad15ae-3511-494c-9add-95db007fb98c" >
-<cdparam x="524" y="57" />
-<sizeparam width="208" height="101" 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="CPUAlice" value="name" />
-<new d="false" />
-<TGConnectingPoint num="0" id="1041" />
-<TGConnectingPoint num="1" id="1042" />
-<TGConnectingPoint num="2" id="1043" />
-<TGConnectingPoint num="3" id="1044" />
-<TGConnectingPoint num="4" id="1045" />
-<TGConnectingPoint num="5" id="1046" />
-<TGConnectingPoint num="6" id="1047" />
-<TGConnectingPoint num="7" id="1048" />
-<TGConnectingPoint num="8" id="1049" />
-<TGConnectingPoint num="9" id="1050" />
-<TGConnectingPoint num="10" id="1051" />
-<TGConnectingPoint num="11" id="1052" />
-<TGConnectingPoint num="12" id="1053" />
-<TGConnectingPoint num="13" id="1054" />
-<TGConnectingPoint num="14" id="1055" />
-<TGConnectingPoint num="15" id="1056" />
-<TGConnectingPoint num="16" id="1057" />
-<TGConnectingPoint num="17" id="1058" />
-<TGConnectingPoint num="18" id="1059" />
-<TGConnectingPoint num="19" id="1060" />
-<TGConnectingPoint num="20" id="1061" />
-<TGConnectingPoint num="21" id="1062" />
-<TGConnectingPoint num="22" id="1063" />
-<TGConnectingPoint num="23" id="1064" />
-<extraparam>
-<info stereotype="CPURR" nodeName="CPUAlice" />
-<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="1040" index="18" uid="f7bd214e-253e-4a5b-b1eb-8daa6faffbea" >
-<father id="1065" num="0" />
-<cdparam x="530" y="99" />
-<sizeparam width="96" height="40" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="0" maxX="112" minY="0" maxY="61" />
-<infoparam name="TGComponent" value="MAC::Alice" />
-<new d="false" />
-<TGConnectingPoint num="0" id="1032" />
-<TGConnectingPoint num="1" id="1033" />
-<TGConnectingPoint num="2" id="1034" />
-<TGConnectingPoint num="3" id="1035" />
-<TGConnectingPoint num="4" id="1036" />
-<TGConnectingPoint num="5" id="1037" />
-<TGConnectingPoint num="6" id="1038" />
-<TGConnectingPoint num="7" id="1039" />
+<TGConnectingPoint num="0" id="1156" />
+<TGConnectingPoint num="1" id="1157" />
+<TGConnectingPoint num="2" id="1158" />
+<TGConnectingPoint num="3" id="1159" />
+<TGConnectingPoint num="4" id="1160" />
+<TGConnectingPoint num="5" id="1161" />
+<TGConnectingPoint num="6" id="1162" />
+<TGConnectingPoint num="7" id="1163" />
+<TGConnectingPoint num="8" id="1164" />
+<TGConnectingPoint num="9" id="1165" />
+<TGConnectingPoint num="10" id="1166" />
+<TGConnectingPoint num="11" id="1167" />
+<TGConnectingPoint num="12" id="1168" />
+<TGConnectingPoint num="13" id="1169" />
+<TGConnectingPoint num="14" id="1170" />
+<TGConnectingPoint num="15" id="1171" />
+<TGConnectingPoint num="16" id="1172" />
+<TGConnectingPoint num="17" id="1173" />
+<TGConnectingPoint num="18" id="1174" />
+<TGConnectingPoint num="19" id="1175" />
+<TGConnectingPoint num="20" id="1176" />
+<TGConnectingPoint num="21" id="1177" />
+<TGConnectingPoint num="22" id="1178" />
+<TGConnectingPoint num="23" id="1179" />
+<extraparam>
+<info stereotype="BUS-RR" nodeName="ExternalBus" />
+<attributes byteDataSize="4" arbitrationPolicy="0" sliceTime="10000" pipelineSize="1" burstSize="100" clockRatio="1" privacy="0" referenceAttack="" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="1100" id="1214" index="7" uid="93ad15ae-3511-494c-9add-95db007fb98c" >
+<cdparam x="524" y="57" />
+<sizeparam width="208" height="101" 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="CPUAlice" value="name" />
+<new d="false" />
+<TGConnectingPoint num="0" id="1190" />
+<TGConnectingPoint num="1" id="1191" />
+<TGConnectingPoint num="2" id="1192" />
+<TGConnectingPoint num="3" id="1193" />
+<TGConnectingPoint num="4" id="1194" />
+<TGConnectingPoint num="5" id="1195" />
+<TGConnectingPoint num="6" id="1196" />
+<TGConnectingPoint num="7" id="1197" />
+<TGConnectingPoint num="8" id="1198" />
+<TGConnectingPoint num="9" id="1199" />
+<TGConnectingPoint num="10" id="1200" />
+<TGConnectingPoint num="11" id="1201" />
+<TGConnectingPoint num="12" id="1202" />
+<TGConnectingPoint num="13" id="1203" />
+<TGConnectingPoint num="14" id="1204" />
+<TGConnectingPoint num="15" id="1205" />
+<TGConnectingPoint num="16" id="1206" />
+<TGConnectingPoint num="17" id="1207" />
+<TGConnectingPoint num="18" id="1208" />
+<TGConnectingPoint num="19" id="1209" />
+<TGConnectingPoint num="20" id="1210" />
+<TGConnectingPoint num="21" id="1211" />
+<TGConnectingPoint num="22" id="1212" />
+<TGConnectingPoint num="23" id="1213" />
+<extraparam>
+<info stereotype="CPURR" nodeName="CPUAlice" />
+<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="1189" index="18" uid="f7bd214e-253e-4a5b-b1eb-8daa6faffbea" >
+<father id="1214" num="0" />
+<cdparam x="530" y="99" />
+<sizeparam width="98" height="40" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="0" maxX="110" minY="0" maxY="61" />
+<infoparam name="TGComponent" value="MAC::Alice" />
+<new d="false" />
+<TGConnectingPoint num="0" id="1181" />
+<TGConnectingPoint num="1" id="1182" />
+<TGConnectingPoint num="2" id="1183" />
+<TGConnectingPoint num="3" id="1184" />
+<TGConnectingPoint num="4" id="1185" />
+<TGConnectingPoint num="5" id="1186" />
+<TGConnectingPoint num="6" id="1187" />
+<TGConnectingPoint num="7" id="1188" />
<extraparam>
<info value="MAC::Alice" taskName="Alice" referenceTaskName="MAC" priority="0" operationMEC="Alice" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="1100" id="1099" index="8" uid="256b41d1-895b-4a36-bb55-2129e955c63c" >
+<COMPONENT type="1100" id="1248" index="8" uid="256b41d1-895b-4a36-bb55-2129e955c63c" >
<cdparam x="296" y="58" />
<sizeparam width="212" height="102" 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="CPUBob" value="name" />
<new d="false" />
-<TGConnectingPoint num="0" id="1075" />
-<TGConnectingPoint num="1" id="1076" />
-<TGConnectingPoint num="2" id="1077" />
-<TGConnectingPoint num="3" id="1078" />
-<TGConnectingPoint num="4" id="1079" />
-<TGConnectingPoint num="5" id="1080" />
-<TGConnectingPoint num="6" id="1081" />
-<TGConnectingPoint num="7" id="1082" />
-<TGConnectingPoint num="8" id="1083" />
-<TGConnectingPoint num="9" id="1084" />
-<TGConnectingPoint num="10" id="1085" />
-<TGConnectingPoint num="11" id="1086" />
-<TGConnectingPoint num="12" id="1087" />
-<TGConnectingPoint num="13" id="1088" />
-<TGConnectingPoint num="14" id="1089" />
-<TGConnectingPoint num="15" id="1090" />
-<TGConnectingPoint num="16" id="1091" />
-<TGConnectingPoint num="17" id="1092" />
-<TGConnectingPoint num="18" id="1093" />
-<TGConnectingPoint num="19" id="1094" />
-<TGConnectingPoint num="20" id="1095" />
-<TGConnectingPoint num="21" id="1096" />
-<TGConnectingPoint num="22" id="1097" />
-<TGConnectingPoint num="23" id="1098" />
+<TGConnectingPoint num="0" id="1224" />
+<TGConnectingPoint num="1" id="1225" />
+<TGConnectingPoint num="2" id="1226" />
+<TGConnectingPoint num="3" id="1227" />
+<TGConnectingPoint num="4" id="1228" />
+<TGConnectingPoint num="5" id="1229" />
+<TGConnectingPoint num="6" id="1230" />
+<TGConnectingPoint num="7" id="1231" />
+<TGConnectingPoint num="8" id="1232" />
+<TGConnectingPoint num="9" id="1233" />
+<TGConnectingPoint num="10" id="1234" />
+<TGConnectingPoint num="11" id="1235" />
+<TGConnectingPoint num="12" id="1236" />
+<TGConnectingPoint num="13" id="1237" />
+<TGConnectingPoint num="14" id="1238" />
+<TGConnectingPoint num="15" id="1239" />
+<TGConnectingPoint num="16" id="1240" />
+<TGConnectingPoint num="17" id="1241" />
+<TGConnectingPoint num="18" id="1242" />
+<TGConnectingPoint num="19" id="1243" />
+<TGConnectingPoint num="20" id="1244" />
+<TGConnectingPoint num="21" id="1245" />
+<TGConnectingPoint num="22" id="1246" />
+<TGConnectingPoint num="23" id="1247" />
<extraparam>
<info stereotype="CPURR" nodeName="CPUBob" />
<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="1074" index="19" uid="467ba799-1d32-4cad-a893-74add4b8598f" >
-<father id="1099" num="0" />
+<SUBCOMPONENT type="1101" id="1223" index="19" uid="467ba799-1d32-4cad-a893-74add4b8598f" >
+<father id="1248" num="0" />
<cdparam x="308" y="110" />
-<sizeparam width="91" height="40" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="93" height="40" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="121" minY="0" maxY="62" />
+<cdrectangleparam minX="0" maxX="119" minY="0" maxY="62" />
<infoparam name="TGComponent" value="MAC::Bob" />
<new d="false" />
-<TGConnectingPoint num="0" id="1066" />
-<TGConnectingPoint num="1" id="1067" />
-<TGConnectingPoint num="2" id="1068" />
-<TGConnectingPoint num="3" id="1069" />
-<TGConnectingPoint num="4" id="1070" />
-<TGConnectingPoint num="5" id="1071" />
-<TGConnectingPoint num="6" id="1072" />
-<TGConnectingPoint num="7" id="1073" />
+<TGConnectingPoint num="0" id="1215" />
+<TGConnectingPoint num="1" id="1216" />
+<TGConnectingPoint num="2" id="1217" />
+<TGConnectingPoint num="3" id="1218" />
+<TGConnectingPoint num="4" id="1219" />
+<TGConnectingPoint num="5" id="1220" />
+<TGConnectingPoint num="6" id="1221" />
+<TGConnectingPoint num="7" id="1222" />
<extraparam>
<info value="MAC::Bob" taskName="Bob" referenceTaskName="MAC" priority="0" operationMEC="Bob" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="125" id="1100" index="9" uid="cc06f0c9-981d-4b92-9751-3cb0074bfdb2" >
+<CONNECTOR type="125" id="1249" index="9" uid="cc06f0c9-981d-4b92-9751-3cb0074bfdb2" >
<cdparam x="612" y="186" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="{info}" />
-<P1 x="576" y="158" id="1055" />
-<P2 x="540" y="245" id="1016" />
+<P1 x="576" y="158" id="1204" />
+<P2 x="537" y="245" id="1165" />
<AutomaticDrawing data="true" />
<new d="false" />
<extraparam>
@@ -2996,12 +3226,12 @@
<spy value="false" />
</extraparam>
</CONNECTOR>
-<CONNECTOR type="125" id="1101" index="10" uid="ab83c6a4-5261-410a-89d5-ed867931875d" >
+<CONNECTOR type="125" id="1250" index="10" uid="ab83c6a4-5261-410a-89d5-ed867931875d" >
<cdparam x="260" y="139" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="{info}" />
-<P1 x="296" y="109" id="1078" />
-<P2 x="243" y="120" id="961" />
+<P1 x="296" y="109" id="1227" />
+<P2 x="243" y="120" id="1110" />
<AutomaticDrawing data="true" />
<new d="false" />
<extraparam>
@@ -3009,12 +3239,12 @@
<spy value="false" />
</extraparam>
</CONNECTOR>
-<CONNECTOR type="125" id="1102" index="11" uid="3d0eb3b5-9513-4cf4-97aa-7da1b29af1f9" >
+<CONNECTOR type="125" id="1251" index="11" uid="3d0eb3b5-9513-4cf4-97aa-7da1b29af1f9" >
<cdparam x="791" y="201" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="{info}" />
-<P1 x="680" y="158" id="1056" />
-<P2 x="672" y="225" id="985" />
+<P1 x="680" y="158" id="1205" />
+<P2 x="700" y="225" id="1134" />
<AutomaticDrawing data="true" />
<new d="false" />
<extraparam>
@@ -3022,12 +3252,12 @@
<spy value="false" />
</extraparam>
</CONNECTOR>
-<CONNECTOR type="125" id="1103" index="12" uid="bd5dcfc2-3056-49a8-9ab1-a563396dfac8" >
+<CONNECTOR type="125" id="1252" index="12" uid="bd5dcfc2-3056-49a8-9ab1-a563396dfac8" >
<cdparam x="1130" y="171" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="{info}" />
-<P1 x="810" y="178" id="904" />
-<P2 x="795" y="200" id="991" />
+<P1 x="873" y="176" id="1053" />
+<P2 x="823" y="200" id="1140" />
<AutomaticDrawing data="true" />
<new d="false" />
<extraparam>
@@ -3035,12 +3265,12 @@
<spy value="false" />
</extraparam>
</CONNECTOR>
-<CONNECTOR type="125" id="1104" index="13" uid="c614e745-dd83-4f97-9cb8-d9428a8254ae" >
+<CONNECTOR type="125" id="1253" index="13" uid="c614e745-dd83-4f97-9cb8-d9428a8254ae" >
<cdparam x="-71" y="161" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="{info}" />
-<P1 x="173" y="161" id="933" />
-<P2 x="173" y="145" id="963" />
+<P1 x="173" y="161" id="1082" />
+<P2 x="173" y="145" id="1112" />
<AutomaticDrawing data="true" />
<new d="false" />
<extraparam>
@@ -3048,12 +3278,12 @@
<spy value="false" />
</extraparam>
</CONNECTOR>
-<CONNECTOR type="125" id="1105" index="14" uid="9032967d-7d98-4bfd-843a-13af08935c34" >
+<CONNECTOR type="125" id="1254" index="14" uid="9032967d-7d98-4bfd-843a-13af08935c34" >
<cdparam x="437" y="191" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="{info}" />
-<P1 x="349" y="160" id="1089" />
-<P2 x="434" y="245" id="1015" />
+<P1 x="349" y="160" id="1238" />
+<P2 x="433" y="245" id="1164" />
<AutomaticDrawing data="true" />
<new d="false" />
<extraparam>
@@ -3071,43 +3301,43 @@
<Modeling type="TML Component Design" nameTab="sampleAutoSec" tabs="TML Component Task Diagram$Bob$Alice" >
<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="1106" index="0" uid="84769165-43c4-4d27-8a6a-53302ea067f7" >
+<CONNECTOR type="126" id="1255" index="0" uid="84769165-43c4-4d27-8a6a-53302ea067f7" >
<cdparam x="255" y="121" />
<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="262" y="123" id="1118" />
-<P2 x="342" y="123" id="1107" />
+<P1 x="262" y="123" id="1267" />
+<P2 x="342" y="123" id="1256" />
<AutomaticDrawing data="true" />
<new d="false" />
</CONNECTOR>
-<COMPONENT type="1202" id="1117" index="1" uid="6f61ba4c-11e6-45a6-b62d-b3cf62bf5786" >
+<COMPONENT type="1202" id="1266" index="1" uid="6f61ba4c-11e6-45a6-b62d-b3cf62bf5786" >
<cdparam x="342" y="67" />
<sizeparam width="133" height="134" 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="Bob" />
<new d="false" />
-<TGConnectingPoint num="0" id="1109" />
-<TGConnectingPoint num="1" id="1110" />
-<TGConnectingPoint num="2" id="1111" />
-<TGConnectingPoint num="3" id="1112" />
-<TGConnectingPoint num="4" id="1113" />
-<TGConnectingPoint num="5" id="1114" />
-<TGConnectingPoint num="6" id="1115" />
-<TGConnectingPoint num="7" id="1116" />
+<TGConnectingPoint num="0" id="1258" />
+<TGConnectingPoint num="1" id="1259" />
+<TGConnectingPoint num="2" id="1260" />
+<TGConnectingPoint num="3" id="1261" />
+<TGConnectingPoint num="4" id="1262" />
+<TGConnectingPoint num="5" id="1263" />
+<TGConnectingPoint num="6" id="1264" />
+<TGConnectingPoint num="7" id="1265" />
<extraparam>
<Data isAttacker="No" daemon="false" periodic="false" periodValue="" unit="" Operation="" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1203" id="1108" index="3" uid="710ec9b4-5ac2-42db-9b3a-76b2690e56e7" >
-<father id="1117" num="0" />
+<SUBCOMPONENT type="1203" id="1257" index="3" uid="710ec9b4-5ac2-42db-9b3a-76b2690e56e7" >
+<father id="1266" num="0" />
<cdparam x="329" y="123" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="120" minY="-13" maxY="121" />
<infoparam name="Primitive port" value="Channel comm" />
<new d="false" />
-<TGConnectingPoint num="0" id="1107" />
+<TGConnectingPoint num="0" id="1256" />
<extraparam>
<Prop commName="comm" commType="0" origin="false" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="uint_16" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="true" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="0" />
<Type type="0" typeOther="" />
@@ -3118,34 +3348,34 @@
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="1202" id="1128" index="2" uid="1b62acf3-c202-466e-b332-61050ce961eb" >
+<COMPONENT type="1202" id="1277" index="2" uid="1b62acf3-c202-466e-b332-61050ce961eb" >
<cdparam x="106" y="69" />
<sizeparam width="156" height="129" 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="Alice" />
<new d="false" />
-<TGConnectingPoint num="0" id="1120" />
-<TGConnectingPoint num="1" id="1121" />
-<TGConnectingPoint num="2" id="1122" />
-<TGConnectingPoint num="3" id="1123" />
-<TGConnectingPoint num="4" id="1124" />
-<TGConnectingPoint num="5" id="1125" />
-<TGConnectingPoint num="6" id="1126" />
-<TGConnectingPoint num="7" id="1127" />
+<TGConnectingPoint num="0" id="1269" />
+<TGConnectingPoint num="1" id="1270" />
+<TGConnectingPoint num="2" id="1271" />
+<TGConnectingPoint num="3" id="1272" />
+<TGConnectingPoint num="4" id="1273" />
+<TGConnectingPoint num="5" id="1274" />
+<TGConnectingPoint num="6" id="1275" />
+<TGConnectingPoint num="7" id="1276" />
<extraparam>
<Data isAttacker="No" daemon="false" periodic="false" periodValue="" unit="" Operation="" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1203" id="1119" index="4" uid="4fd38963-8665-4923-b779-9c2c98144f2b" >
-<father id="1128" num="0" />
+<SUBCOMPONENT type="1203" id="1268" index="4" uid="4fd38963-8665-4923-b779-9c2c98144f2b" >
+<father id="1277" num="0" />
<cdparam x="249" y="123" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="143" minY="-13" maxY="116" />
<infoparam name="Primitive port" value="Channel comm" />
<new d="false" />
-<TGConnectingPoint num="0" id="1118" />
+<TGConnectingPoint num="0" id="1267" />
<extraparam>
<Prop commName="comm" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="uint_16" associatedEvent="" checkConf="true" checkConfStatus="1" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="0" />
<Type type="0" typeOther="" />
@@ -3160,56 +3390,56 @@
</TMLComponentTaskDiagramPanel>
<TMLActivityDiagramPanel name="Bob" minX="10" maxX="2500" minY="10" maxY="1500" zoom="1.0" >
-<COMPONENT type="1001" id="1130" index="0" uid="07b1b931-ac93-4a50-b251-4f055829d76e" >
+<COMPONENT type="1001" id="1279" index="0" uid="07b1b931-ac93-4a50-b251-4f055829d76e" >
<cdparam x="397" y="168" />
<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" />
<new d="false" />
-<TGConnectingPoint num="0" id="1129" />
+<TGConnectingPoint num="0" id="1278" />
</COMPONENT>
-<COMPONENT type="1009" id="1133" index="1" uid="f93517fc-9ae7-402b-98a6-213341efe835" >
-<cdparam x="373" y="99" />
-<sizeparam width="69" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1009" id="1282" index="1" uid="f93517fc-9ae7-402b-98a6-213341efe835" >
+<cdparam x="363" y="99" />
+<sizeparam width="89" 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) " />
<new d="false" />
-<TGConnectingPoint num="0" id="1131" />
-<TGConnectingPoint num="1" id="1132" />
+<TGConnectingPoint num="0" id="1280" />
+<TGConnectingPoint num="1" id="1281" />
<extraparam>
<Data channelName="comm" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1000" id="1135" index="2" uid="dab32d79-f6ac-476b-81fa-4a7d9e6db21f" >
+<COMPONENT type="1000" id="1284" index="2" uid="dab32d79-f6ac-476b-81fa-4a7d9e6db21f" >
<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="2500" minY="10" maxY="1500" />
<infoparam name="start state" value="null" />
<new d="false" />
-<TGConnectingPoint num="0" id="1134" />
+<TGConnectingPoint num="0" id="1283" />
</COMPONENT>
-<CONNECTOR type="115" id="1136" index="3" uid="b2429388-218d-4c4e-a439-e49e5867f294" >
+<CONNECTOR type="115" id="1285" index="3" uid="b2429388-218d-4c4e-a439-e49e5867f294" >
<cdparam x="407" y="124" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="407" y="124" id="1132" />
-<P2 x="407" y="163" id="1129" />
+<P1 x="407" y="124" id="1281" />
+<P2 x="407" y="163" id="1278" />
<AutomaticDrawing data="true" />
<new d="false" />
</CONNECTOR>
-<CONNECTOR type="115" id="1137" index="4" uid="a9d3c3a9-f75a-4d14-87e6-729c2585e2e2" >
+<CONNECTOR type="115" id="1286" index="4" uid="a9d3c3a9-f75a-4d14-87e6-729c2585e2e2" >
<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="407" y="70" id="1134" />
-<P2 x="407" y="94" id="1131" />
+<P1 x="407" y="70" id="1283" />
+<P2 x="407" y="94" id="1280" />
<AutomaticDrawing data="true" />
<new d="false" />
</CONNECTOR>
@@ -3217,56 +3447,56 @@
</TMLActivityDiagramPanel>
<TMLActivityDiagramPanel name="Alice" minX="10" maxX="2500" minY="10" maxY="1500" zoom="1.0" >
-<COMPONENT type="1006" id="1140" index="0" uid="52e43d57-b5c4-47e8-a10b-59e1ee7bc97b" >
-<cdparam x="375" y="99" />
-<sizeparam width="65" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1006" id="1289" index="0" uid="52e43d57-b5c4-47e8-a10b-59e1ee7bc97b" >
+<cdparam x="365" y="99" />
+<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="write channel" value="comm(1)" />
<new d="false" />
-<TGConnectingPoint num="0" id="1138" />
-<TGConnectingPoint num="1" id="1139" />
+<TGConnectingPoint num="0" id="1287" />
+<TGConnectingPoint num="1" id="1288" />
<extraparam>
<Data channelName="comm" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1001" id="1142" index="1" uid="ad48472f-6bfc-4384-883c-984b9b09b164" >
+<COMPONENT type="1001" id="1291" index="1" uid="ad48472f-6bfc-4384-883c-984b9b09b164" >
<cdparam x="397" y="148" />
<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" />
<new d="false" />
-<TGConnectingPoint num="0" id="1141" />
+<TGConnectingPoint num="0" id="1290" />
</COMPONENT>
-<COMPONENT type="1000" id="1144" index="2" uid="58011580-81c2-4c36-b815-f3d5e1fa4976" >
+<COMPONENT type="1000" id="1293" index="2" uid="58011580-81c2-4c36-b815-f3d5e1fa4976" >
<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="2500" minY="10" maxY="1500" />
<infoparam name="start state" value="null" />
<new d="false" />
-<TGConnectingPoint num="0" id="1143" />
+<TGConnectingPoint num="0" id="1292" />
</COMPONENT>
-<CONNECTOR type="115" id="1145" index="3" uid="3a8a601e-b9a7-48c1-9d8d-b3d61445b11f" >
+<CONNECTOR type="115" id="1294" index="3" uid="3a8a601e-b9a7-48c1-9d8d-b3d61445b11f" >
<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="407" y="70" id="1143" />
-<P2 x="407" y="94" id="1138" />
+<P1 x="407" y="70" id="1292" />
+<P2 x="407" y="94" id="1287" />
<AutomaticDrawing data="true" />
<new d="false" />
</CONNECTOR>
-<CONNECTOR type="115" id="1146" index="4" uid="795e6df3-57b2-44ac-ab91-08e1a7b13a42" >
+<CONNECTOR type="115" id="1295" index="4" uid="795e6df3-57b2-44ac-ab91-08e1a7b13a42" >
<cdparam x="401" y="126" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="407" y="124" id="1139" />
-<P2 x="407" y="143" id="1141" />
+<P1 x="407" y="124" id="1288" />
+<P2 x="407" y="143" id="1290" />
<AutomaticDrawing data="true" />
<new d="false" />
</CONNECTOR>
@@ -3280,344 +3510,12 @@
<Modeling type="TML Architecture" nameTab="Architecture" >
<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="1180" index="0" uid="f362b9c2-9ef7-4b81-8495-324e5058a435" >
-<cdparam x="985" y="212" />
-<sizeparam width="120" height="96" 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="Memory1" value="name" />
-<new d="false" />
-<TGConnectingPoint num="0" id="1156" />
-<TGConnectingPoint num="1" id="1157" />
-<TGConnectingPoint num="2" id="1158" />
-<TGConnectingPoint num="3" id="1159" />
-<TGConnectingPoint num="4" id="1160" />
-<TGConnectingPoint num="5" id="1161" />
-<TGConnectingPoint num="6" id="1162" />
-<TGConnectingPoint num="7" id="1163" />
-<TGConnectingPoint num="8" id="1164" />
-<TGConnectingPoint num="9" id="1165" />
-<TGConnectingPoint num="10" id="1166" />
-<TGConnectingPoint num="11" id="1167" />
-<TGConnectingPoint num="12" id="1168" />
-<TGConnectingPoint num="13" id="1169" />
-<TGConnectingPoint num="14" id="1170" />
-<TGConnectingPoint num="15" id="1171" />
-<TGConnectingPoint num="16" id="1172" />
-<TGConnectingPoint num="17" id="1173" />
-<TGConnectingPoint num="18" id="1174" />
-<TGConnectingPoint num="19" id="1175" />
-<TGConnectingPoint num="20" id="1176" />
-<TGConnectingPoint num="21" id="1177" />
-<TGConnectingPoint num="22" id="1178" />
-<TGConnectingPoint num="23" id="1179" />
-<extraparam>
-<info stereotype="MEMORY" nodeName="Memory1" />
-<attributes byteDataSize="4" memorySize="1024" clockRatio="1" bufferType="0" />
-</extraparam>
-</COMPONENT>
-<SUBCOMPONENT type="1111" id="1155" index="13" uid="de852dfc-23ca-4ebc-98e6-aeb2b18f79b2" >
-<father id="1180" num="0" />
-<cdparam x="1001" y="255" />
-<sizeparam width="75" height="40" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="0" maxX="45" minY="0" maxY="56" />
-<infoparam name="TGComponent" value="sym" />
-<new d="false" />
-<TGConnectingPoint num="0" id="1147" />
-<TGConnectingPoint num="1" id="1148" />
-<TGConnectingPoint num="2" id="1149" />
-<TGConnectingPoint num="3" id="1150" />
-<TGConnectingPoint num="4" id="1151" />
-<TGConnectingPoint num="5" id="1152" />
-<TGConnectingPoint num="6" id="1153" />
-<TGConnectingPoint num="7" id="1154" />
-<extraparam>
-<info value="sym" referenceKeyName="sym" priority="0" typeName="key" />
-</extraparam>
-</SUBCOMPONENT>
-
-<COMPONENT type="1105" id="1205" index="1" uid="82172e03-eea9-4d8a-b071-29562e4e0e9f" >
-<cdparam x="354" y="291" />
-<sizeparam width="109" height="97" 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="Memory0" value="name" />
-<new d="false" />
-<TGConnectingPoint num="0" id="1181" />
-<TGConnectingPoint num="1" id="1182" />
-<TGConnectingPoint num="2" id="1183" />
-<TGConnectingPoint num="3" id="1184" />
-<TGConnectingPoint num="4" id="1185" />
-<TGConnectingPoint num="5" id="1186" />
-<TGConnectingPoint num="6" id="1187" />
-<TGConnectingPoint num="7" id="1188" />
-<TGConnectingPoint num="8" id="1189" />
-<TGConnectingPoint num="9" id="1190" />
-<TGConnectingPoint num="10" id="1191" />
-<TGConnectingPoint num="11" id="1192" />
-<TGConnectingPoint num="12" id="1193" />
-<TGConnectingPoint num="13" id="1194" />
-<TGConnectingPoint num="14" id="1195" />
-<TGConnectingPoint num="15" id="1196" />
-<TGConnectingPoint num="16" id="1197" />
-<TGConnectingPoint num="17" id="1198" />
-<TGConnectingPoint num="18" id="1199" />
-<TGConnectingPoint num="19" id="1200" />
-<TGConnectingPoint num="20" id="1201" />
-<TGConnectingPoint num="21" id="1202" />
-<TGConnectingPoint num="22" id="1203" />
-<TGConnectingPoint num="23" id="1204" />
-<extraparam>
-<info stereotype="MEMORY" nodeName="Memory0" />
-<attributes byteDataSize="4" memorySize="1024" clockRatio="1" bufferType="0" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1102" id="1230" index="2" uid="be7a0bf5-32f9-4305-b953-01655cf64b18" >
-<cdparam x="338" y="225" />
-<sizeparam width="140" height="50" 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="Bus0" value="name" />
-<new d="false" />
-<TGConnectingPoint num="0" id="1206" />
-<TGConnectingPoint num="1" id="1207" />
-<TGConnectingPoint num="2" id="1208" />
-<TGConnectingPoint num="3" id="1209" />
-<TGConnectingPoint num="4" id="1210" />
-<TGConnectingPoint num="5" id="1211" />
-<TGConnectingPoint num="6" id="1212" />
-<TGConnectingPoint num="7" id="1213" />
-<TGConnectingPoint num="8" id="1214" />
-<TGConnectingPoint num="9" id="1215" />
-<TGConnectingPoint num="10" id="1216" />
-<TGConnectingPoint num="11" id="1217" />
-<TGConnectingPoint num="12" id="1218" />
-<TGConnectingPoint num="13" id="1219" />
-<TGConnectingPoint num="14" id="1220" />
-<TGConnectingPoint num="15" id="1221" />
-<TGConnectingPoint num="16" id="1222" />
-<TGConnectingPoint num="17" id="1223" />
-<TGConnectingPoint num="18" id="1224" />
-<TGConnectingPoint num="19" id="1225" />
-<TGConnectingPoint num="20" id="1226" />
-<TGConnectingPoint num="21" id="1227" />
-<TGConnectingPoint num="22" id="1228" />
-<TGConnectingPoint num="23" id="1229" />
-<extraparam>
-<info stereotype="BUS-RR" nodeName="Bus0" />
-<attributes byteDataSize="4" arbitrationPolicy="0" sliceTime="10000" pipelineSize="1" burstSize="100" clockRatio="1" privacy="1" referenceAttack="" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1102" id="1255" index="3" uid="506e27c9-d32e-4be4-9bdf-ed365c3202b1" >
-<cdparam x="907" y="330" />
-<sizeparam width="165" height="50" 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="Bus1" value="name" />
-<new d="false" />
-<TGConnectingPoint num="0" id="1231" />
-<TGConnectingPoint num="1" id="1232" />
-<TGConnectingPoint num="2" id="1233" />
-<TGConnectingPoint num="3" id="1234" />
-<TGConnectingPoint num="4" id="1235" />
-<TGConnectingPoint num="5" id="1236" />
-<TGConnectingPoint num="6" id="1237" />
-<TGConnectingPoint num="7" id="1238" />
-<TGConnectingPoint num="8" id="1239" />
-<TGConnectingPoint num="9" id="1240" />
-<TGConnectingPoint num="10" id="1241" />
-<TGConnectingPoint num="11" id="1242" />
-<TGConnectingPoint num="12" id="1243" />
-<TGConnectingPoint num="13" id="1244" />
-<TGConnectingPoint num="14" id="1245" />
-<TGConnectingPoint num="15" id="1246" />
-<TGConnectingPoint num="16" id="1247" />
-<TGConnectingPoint num="17" id="1248" />
-<TGConnectingPoint num="18" id="1249" />
-<TGConnectingPoint num="19" id="1250" />
-<TGConnectingPoint num="20" id="1251" />
-<TGConnectingPoint num="21" id="1252" />
-<TGConnectingPoint num="22" id="1253" />
-<TGConnectingPoint num="23" id="1254" />
-<extraparam>
-<info stereotype="BUS-RR" nodeName="Bus1" />
-<attributes byteDataSize="4" arbitrationPolicy="0" sliceTime="10000" pipelineSize="1" burstSize="100" clockRatio="1" privacy="1" referenceAttack="" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1102" id="1280" index="4" uid="75de2e24-d510-4024-9e59-2af7d6f5a00d" >
-<cdparam x="635" y="345" />
-<sizeparam width="170" height="50" 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="ExternalBus" value="name" />
-<new d="false" />
-<TGConnectingPoint num="0" id="1256" />
-<TGConnectingPoint num="1" id="1257" />
-<TGConnectingPoint num="2" id="1258" />
-<TGConnectingPoint num="3" id="1259" />
-<TGConnectingPoint num="4" id="1260" />
-<TGConnectingPoint num="5" id="1261" />
-<TGConnectingPoint num="6" id="1262" />
-<TGConnectingPoint num="7" id="1263" />
-<TGConnectingPoint num="8" id="1264" />
-<TGConnectingPoint num="9" id="1265" />
-<TGConnectingPoint num="10" id="1266" />
-<TGConnectingPoint num="11" id="1267" />
-<TGConnectingPoint num="12" id="1268" />
-<TGConnectingPoint num="13" id="1269" />
-<TGConnectingPoint num="14" id="1270" />
-<TGConnectingPoint num="15" id="1271" />
-<TGConnectingPoint num="16" id="1272" />
-<TGConnectingPoint num="17" id="1273" />
-<TGConnectingPoint num="18" id="1274" />
-<TGConnectingPoint num="19" id="1275" />
-<TGConnectingPoint num="20" id="1276" />
-<TGConnectingPoint num="21" id="1277" />
-<TGConnectingPoint num="22" id="1278" />
-<TGConnectingPoint num="23" id="1279" />
-<extraparam>
-<info stereotype="BUS-RR" nodeName="ExternalBus" />
-<attributes byteDataSize="4" arbitrationPolicy="0" sliceTime="10000" pipelineSize="1" burstSize="100" clockRatio="1" privacy="0" referenceAttack="" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1100" id="1314" index="5" uid="23e1d4c8-54ce-4c77-9e94-194e403034d7" >
-<cdparam x="759" y="212" />
-<sizeparam width="208" height="101" 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="CPUAlice" value="name" />
-<new d="false" />
-<TGConnectingPoint num="0" id="1290" />
-<TGConnectingPoint num="1" id="1291" />
-<TGConnectingPoint num="2" id="1292" />
-<TGConnectingPoint num="3" id="1293" />
-<TGConnectingPoint num="4" id="1294" />
-<TGConnectingPoint num="5" id="1295" />
-<TGConnectingPoint num="6" id="1296" />
-<TGConnectingPoint num="7" id="1297" />
-<TGConnectingPoint num="8" id="1298" />
-<TGConnectingPoint num="9" id="1299" />
-<TGConnectingPoint num="10" id="1300" />
-<TGConnectingPoint num="11" id="1301" />
-<TGConnectingPoint num="12" id="1302" />
-<TGConnectingPoint num="13" id="1303" />
-<TGConnectingPoint num="14" id="1304" />
-<TGConnectingPoint num="15" id="1305" />
-<TGConnectingPoint num="16" id="1306" />
-<TGConnectingPoint num="17" id="1307" />
-<TGConnectingPoint num="18" id="1308" />
-<TGConnectingPoint num="19" id="1309" />
-<TGConnectingPoint num="20" id="1310" />
-<TGConnectingPoint num="21" id="1311" />
-<TGConnectingPoint num="22" id="1312" />
-<TGConnectingPoint num="23" id="1313" />
-<extraparam>
-<info stereotype="CPURR" nodeName="CPUAlice" />
-<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="1289" index="14" uid="c7474298-2870-477a-94e1-9846ca975d53" >
-<father id="1314" num="0" />
-<cdparam x="765" y="254" />
-<sizeparam width="169" height="40" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="0" maxX="39" minY="0" maxY="61" />
-<infoparam name="TGComponent" value="sampleAutoSec::Alice" />
-<new d="false" />
-<TGConnectingPoint num="0" id="1281" />
-<TGConnectingPoint num="1" id="1282" />
-<TGConnectingPoint num="2" id="1283" />
-<TGConnectingPoint num="3" id="1284" />
-<TGConnectingPoint num="4" id="1285" />
-<TGConnectingPoint num="5" id="1286" />
-<TGConnectingPoint num="6" id="1287" />
-<TGConnectingPoint num="7" id="1288" />
-<extraparam>
-<info value="sampleAutoSec::Alice" taskName="Alice" referenceTaskName="sampleAutoSec" priority="0" operationMEC="Alice" fatherComponentMECType="0" />
-</extraparam>
-</SUBCOMPONENT>
-
-<COMPONENT type="1100" id="1348" index="6" uid="6a7578b9-2df0-4124-931e-828c8cb25cec" >
-<cdparam x="523" y="219" />
-<sizeparam width="212" height="102" 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="CPUBob" value="name" />
-<new d="false" />
-<TGConnectingPoint num="0" id="1324" />
-<TGConnectingPoint num="1" id="1325" />
-<TGConnectingPoint num="2" id="1326" />
-<TGConnectingPoint num="3" id="1327" />
-<TGConnectingPoint num="4" id="1328" />
-<TGConnectingPoint num="5" id="1329" />
-<TGConnectingPoint num="6" id="1330" />
-<TGConnectingPoint num="7" id="1331" />
-<TGConnectingPoint num="8" id="1332" />
-<TGConnectingPoint num="9" id="1333" />
-<TGConnectingPoint num="10" id="1334" />
-<TGConnectingPoint num="11" id="1335" />
-<TGConnectingPoint num="12" id="1336" />
-<TGConnectingPoint num="13" id="1337" />
-<TGConnectingPoint num="14" id="1338" />
-<TGConnectingPoint num="15" id="1339" />
-<TGConnectingPoint num="16" id="1340" />
-<TGConnectingPoint num="17" id="1341" />
-<TGConnectingPoint num="18" id="1342" />
-<TGConnectingPoint num="19" id="1343" />
-<TGConnectingPoint num="20" id="1344" />
-<TGConnectingPoint num="21" id="1345" />
-<TGConnectingPoint num="22" id="1346" />
-<TGConnectingPoint num="23" id="1347" />
-<extraparam>
-<info stereotype="CPURR" nodeName="CPUBob" />
-<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="1323" index="15" uid="11418474-089b-4199-90d7-d9884cf6b8d0" >
-<father id="1348" num="0" />
-<cdparam x="535" y="271" />
-<sizeparam width="164" height="40" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="0" maxX="48" minY="0" maxY="62" />
-<infoparam name="TGComponent" value="sampleAutoSec::Bob" />
-<new d="false" />
-<TGConnectingPoint num="0" id="1315" />
-<TGConnectingPoint num="1" id="1316" />
-<TGConnectingPoint num="2" id="1317" />
-<TGConnectingPoint num="3" id="1318" />
-<TGConnectingPoint num="4" id="1319" />
-<TGConnectingPoint num="5" id="1320" />
-<TGConnectingPoint num="6" id="1321" />
-<TGConnectingPoint num="7" id="1322" />
-<extraparam>
-<info value="sampleAutoSec::Bob" taskName="Bob" referenceTaskName="sampleAutoSec" priority="0" operationMEC="Bob" fatherComponentMECType="0" />
-</extraparam>
-</SUBCOMPONENT>
-
-<CONNECTOR type="125" id="1349" index="7" uid="f00cc7c2-cd3d-4bc2-916d-6890409c59a0" >
-<cdparam x="847" y="316" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="{info}" />
-<P1 x="811" y="313" id="1304" />
-<P2 x="762" y="345" id="1265" />
-<AutomaticDrawing data="true" />
-<new d="false" />
-<extraparam>
-<info priority="0" />
-<spy value="false" />
-</extraparam>
-</CONNECTOR>
-<CONNECTOR type="125" id="1350" index="8" uid="a54b7890-f963-43cb-97d6-a4019fa50691" >
-<cdparam x="495" y="269" />
+<CONNECTOR type="125" id="1296" index="0" uid="ca1c58f5-a2e1-47f5-ab07-32144ac86044" >
+<cdparam x="719" y="460" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="{info}" />
-<P1 x="523" y="270" id="1327" />
-<P2 x="478" y="250" id="1210" />
+<P1 x="720" y="449" id="1307" />
+<P2 x="720" y="395" id="1437" />
<AutomaticDrawing data="true" />
<new d="false" />
<extraparam>
@@ -3625,393 +3523,368 @@
<spy value="false" />
</extraparam>
</CONNECTOR>
-<CONNECTOR type="125" id="1351" index="9" uid="5b3a6654-4fff-4332-801e-a392620f46cd" >
-<cdparam x="1026" y="331" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="{info}" />
-<P1 x="915" y="313" id="1305" />
-<P2 x="907" y="355" id="1234" />
-<AutomaticDrawing data="true" />
-<new d="false" />
-<extraparam>
-<info priority="0" />
-<spy value="false" />
-</extraparam>
-</CONNECTOR>
-<CONNECTOR type="125" id="1352" index="10" uid="554fee9f-605e-444a-8d98-b29093348577" >
-<cdparam x="1365" y="301" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="{info}" />
-<P1 x="1045" y="308" id="1162" />
-<P2 x="1030" y="330" id="1240" />
-<AutomaticDrawing data="true" />
-<new d="false" />
-<extraparam>
-<info priority="0" />
-<spy value="false" />
-</extraparam>
-</CONNECTOR>
-<CONNECTOR type="125" id="1353" index="11" uid="7bafad10-a7ac-4186-9bcd-da7c054a3d44" >
-<cdparam x="164" y="291" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="{info}" />
-<P1 x="408" y="291" id="1182" />
-<P2 x="408" y="275" id="1212" />
-<AutomaticDrawing data="true" />
-<new d="false" />
-<extraparam>
-<info priority="0" />
-<spy value="false" />
+<COMPONENT type="1105" id="1330" index="1" uid="19ed3c53-8048-49ce-841f-c27c5887a891" >
+<cdparam x="622" y="449" />
+<sizeparam width="196" height="128" 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="ExternalMemory" value="name" />
+<new d="false" />
+<TGConnectingPoint num="0" id="1306" />
+<TGConnectingPoint num="1" id="1307" />
+<TGConnectingPoint num="2" id="1308" />
+<TGConnectingPoint num="3" id="1309" />
+<TGConnectingPoint num="4" id="1310" />
+<TGConnectingPoint num="5" id="1311" />
+<TGConnectingPoint num="6" id="1312" />
+<TGConnectingPoint num="7" id="1313" />
+<TGConnectingPoint num="8" id="1314" />
+<TGConnectingPoint num="9" id="1315" />
+<TGConnectingPoint num="10" id="1316" />
+<TGConnectingPoint num="11" id="1317" />
+<TGConnectingPoint num="12" id="1318" />
+<TGConnectingPoint num="13" id="1319" />
+<TGConnectingPoint num="14" id="1320" />
+<TGConnectingPoint num="15" id="1321" />
+<TGConnectingPoint num="16" id="1322" />
+<TGConnectingPoint num="17" id="1323" />
+<TGConnectingPoint num="18" id="1324" />
+<TGConnectingPoint num="19" id="1325" />
+<TGConnectingPoint num="20" id="1326" />
+<TGConnectingPoint num="21" id="1327" />
+<TGConnectingPoint num="22" id="1328" />
+<TGConnectingPoint num="23" id="1329" />
+<extraparam>
+<info stereotype="MEMORY" nodeName="ExternalMemory" />
+<attributes byteDataSize="4" memorySize="1024" clockRatio="1" bufferType="0" />
</extraparam>
-</CONNECTOR>
-<CONNECTOR type="125" id="1354" index="12" uid="2f228cd6-968b-4da5-847b-c41a9f10b26d" >
-<cdparam x="672" y="321" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="{info}" />
-<P1 x="576" y="321" id="1338" />
-<P2 x="677" y="345" id="1264" />
-<AutomaticDrawing data="true" />
+</COMPONENT>
+<SUBCOMPONENT type="1103" id="1305" index="15" uid="aae53980-557f-4311-a068-007a66f748a4" >
+<father id="1330" num="0" />
+<cdparam x="630" y="507" />
+<sizeparam width="177" height="40" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="0" maxX="19" minY="0" maxY="88" />
+<infoparam name="TGComponent" value="sampleAutoSec::comm" />
<new d="false" />
+<TGConnectingPoint num="0" id="1297" />
+<TGConnectingPoint num="1" id="1298" />
+<TGConnectingPoint num="2" id="1299" />
+<TGConnectingPoint num="3" id="1300" />
+<TGConnectingPoint num="4" id="1301" />
+<TGConnectingPoint num="5" id="1302" />
+<TGConnectingPoint num="6" id="1303" />
+<TGConnectingPoint num="7" id="1304" />
<extraparam>
-<info priority="0" />
-<spy value="false" />
+<info value="sampleAutoSec::comm" communicationName="comm" referenceCommunicationName="sampleAutoSec" mappedElements="ExternalBus" priority="0" typeName="channel" />
</extraparam>
-</CONNECTOR>
-
-</TMLArchiDiagramPanel>
-
-</Modeling>
-
-
-
+</SUBCOMPONENT>
-<Modeling type="TML Architecture" nameTab="Architecture_enc" >
-<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="1388" index="0" uid="a4b4c68e-a465-4cac-887c-d807c70803a6" >
+<COMPONENT type="1105" id="1355" index="2" uid="f362b9c2-9ef7-4b81-8495-324e5058a435" >
<cdparam x="985" y="212" />
<sizeparam width="120" height="96" 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="Memory1" value="name" />
<new d="false" />
-<TGConnectingPoint num="0" id="1364" />
-<TGConnectingPoint num="1" id="1365" />
-<TGConnectingPoint num="2" id="1366" />
-<TGConnectingPoint num="3" id="1367" />
-<TGConnectingPoint num="4" id="1368" />
-<TGConnectingPoint num="5" id="1369" />
-<TGConnectingPoint num="6" id="1370" />
-<TGConnectingPoint num="7" id="1371" />
-<TGConnectingPoint num="8" id="1372" />
-<TGConnectingPoint num="9" id="1373" />
-<TGConnectingPoint num="10" id="1374" />
-<TGConnectingPoint num="11" id="1375" />
-<TGConnectingPoint num="12" id="1376" />
-<TGConnectingPoint num="13" id="1377" />
-<TGConnectingPoint num="14" id="1378" />
-<TGConnectingPoint num="15" id="1379" />
-<TGConnectingPoint num="16" id="1380" />
-<TGConnectingPoint num="17" id="1381" />
-<TGConnectingPoint num="18" id="1382" />
-<TGConnectingPoint num="19" id="1383" />
-<TGConnectingPoint num="20" id="1384" />
-<TGConnectingPoint num="21" id="1385" />
-<TGConnectingPoint num="22" id="1386" />
-<TGConnectingPoint num="23" id="1387" />
+<TGConnectingPoint num="0" id="1331" />
+<TGConnectingPoint num="1" id="1332" />
+<TGConnectingPoint num="2" id="1333" />
+<TGConnectingPoint num="3" id="1334" />
+<TGConnectingPoint num="4" id="1335" />
+<TGConnectingPoint num="5" id="1336" />
+<TGConnectingPoint num="6" id="1337" />
+<TGConnectingPoint num="7" id="1338" />
+<TGConnectingPoint num="8" id="1339" />
+<TGConnectingPoint num="9" id="1340" />
+<TGConnectingPoint num="10" id="1341" />
+<TGConnectingPoint num="11" id="1342" />
+<TGConnectingPoint num="12" id="1343" />
+<TGConnectingPoint num="13" id="1344" />
+<TGConnectingPoint num="14" id="1345" />
+<TGConnectingPoint num="15" id="1346" />
+<TGConnectingPoint num="16" id="1347" />
+<TGConnectingPoint num="17" id="1348" />
+<TGConnectingPoint num="18" id="1349" />
+<TGConnectingPoint num="19" id="1350" />
+<TGConnectingPoint num="20" id="1351" />
+<TGConnectingPoint num="21" id="1352" />
+<TGConnectingPoint num="22" id="1353" />
+<TGConnectingPoint num="23" id="1354" />
<extraparam>
<info stereotype="MEMORY" nodeName="Memory1" />
<attributes byteDataSize="4" memorySize="1024" clockRatio="1" bufferType="0" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1111" id="1363" index="13" uid="b0f7aea2-4960-4e2f-b9e1-b7e5592cef82" >
-<father id="1388" num="0" />
-<cdparam x="1001" y="255" />
-<sizeparam width="75" height="40" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="0" maxX="45" minY="0" maxY="56" />
-<infoparam name="TGComponent" value="sym" />
-<new d="false" />
-<TGConnectingPoint num="0" id="1355" />
-<TGConnectingPoint num="1" id="1356" />
-<TGConnectingPoint num="2" id="1357" />
-<TGConnectingPoint num="3" id="1358" />
-<TGConnectingPoint num="4" id="1359" />
-<TGConnectingPoint num="5" id="1360" />
-<TGConnectingPoint num="6" id="1361" />
-<TGConnectingPoint num="7" id="1362" />
-<extraparam>
-<info value="sym" referenceKeyName="sym" priority="0" typeName="key" />
-</extraparam>
-</SUBCOMPONENT>
-<COMPONENT type="1105" id="1413" index="1" uid="0415aeee-7bba-44b2-b38c-6f0828cc8c14" >
+<COMPONENT type="1105" id="1380" index="3" uid="82172e03-eea9-4d8a-b071-29562e4e0e9f" >
<cdparam x="354" y="291" />
<sizeparam width="109" height="97" 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="Memory0" value="name" />
<new d="false" />
-<TGConnectingPoint num="0" id="1389" />
-<TGConnectingPoint num="1" id="1390" />
-<TGConnectingPoint num="2" id="1391" />
-<TGConnectingPoint num="3" id="1392" />
-<TGConnectingPoint num="4" id="1393" />
-<TGConnectingPoint num="5" id="1394" />
-<TGConnectingPoint num="6" id="1395" />
-<TGConnectingPoint num="7" id="1396" />
-<TGConnectingPoint num="8" id="1397" />
-<TGConnectingPoint num="9" id="1398" />
-<TGConnectingPoint num="10" id="1399" />
-<TGConnectingPoint num="11" id="1400" />
-<TGConnectingPoint num="12" id="1401" />
-<TGConnectingPoint num="13" id="1402" />
-<TGConnectingPoint num="14" id="1403" />
-<TGConnectingPoint num="15" id="1404" />
-<TGConnectingPoint num="16" id="1405" />
-<TGConnectingPoint num="17" id="1406" />
-<TGConnectingPoint num="18" id="1407" />
-<TGConnectingPoint num="19" id="1408" />
-<TGConnectingPoint num="20" id="1409" />
-<TGConnectingPoint num="21" id="1410" />
-<TGConnectingPoint num="22" id="1411" />
-<TGConnectingPoint num="23" id="1412" />
+<TGConnectingPoint num="0" id="1356" />
+<TGConnectingPoint num="1" id="1357" />
+<TGConnectingPoint num="2" id="1358" />
+<TGConnectingPoint num="3" id="1359" />
+<TGConnectingPoint num="4" id="1360" />
+<TGConnectingPoint num="5" id="1361" />
+<TGConnectingPoint num="6" id="1362" />
+<TGConnectingPoint num="7" id="1363" />
+<TGConnectingPoint num="8" id="1364" />
+<TGConnectingPoint num="9" id="1365" />
+<TGConnectingPoint num="10" id="1366" />
+<TGConnectingPoint num="11" id="1367" />
+<TGConnectingPoint num="12" id="1368" />
+<TGConnectingPoint num="13" id="1369" />
+<TGConnectingPoint num="14" id="1370" />
+<TGConnectingPoint num="15" id="1371" />
+<TGConnectingPoint num="16" id="1372" />
+<TGConnectingPoint num="17" id="1373" />
+<TGConnectingPoint num="18" id="1374" />
+<TGConnectingPoint num="19" id="1375" />
+<TGConnectingPoint num="20" id="1376" />
+<TGConnectingPoint num="21" id="1377" />
+<TGConnectingPoint num="22" id="1378" />
+<TGConnectingPoint num="23" id="1379" />
<extraparam>
<info stereotype="MEMORY" nodeName="Memory0" />
<attributes byteDataSize="4" memorySize="1024" clockRatio="1" bufferType="0" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1102" id="1438" index="2" uid="265ece23-a778-4c2c-b6e1-7338fc59b71b" >
+<COMPONENT type="1102" id="1405" index="4" uid="be7a0bf5-32f9-4305-b953-01655cf64b18" >
<cdparam x="338" y="225" />
<sizeparam width="140" height="50" 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="Bus0" value="name" />
<new d="false" />
-<TGConnectingPoint num="0" id="1414" />
-<TGConnectingPoint num="1" id="1415" />
-<TGConnectingPoint num="2" id="1416" />
-<TGConnectingPoint num="3" id="1417" />
-<TGConnectingPoint num="4" id="1418" />
-<TGConnectingPoint num="5" id="1419" />
-<TGConnectingPoint num="6" id="1420" />
-<TGConnectingPoint num="7" id="1421" />
-<TGConnectingPoint num="8" id="1422" />
-<TGConnectingPoint num="9" id="1423" />
-<TGConnectingPoint num="10" id="1424" />
-<TGConnectingPoint num="11" id="1425" />
-<TGConnectingPoint num="12" id="1426" />
-<TGConnectingPoint num="13" id="1427" />
-<TGConnectingPoint num="14" id="1428" />
-<TGConnectingPoint num="15" id="1429" />
-<TGConnectingPoint num="16" id="1430" />
-<TGConnectingPoint num="17" id="1431" />
-<TGConnectingPoint num="18" id="1432" />
-<TGConnectingPoint num="19" id="1433" />
-<TGConnectingPoint num="20" id="1434" />
-<TGConnectingPoint num="21" id="1435" />
-<TGConnectingPoint num="22" id="1436" />
-<TGConnectingPoint num="23" id="1437" />
+<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" />
<extraparam>
<info stereotype="BUS-RR" nodeName="Bus0" />
<attributes byteDataSize="4" arbitrationPolicy="0" sliceTime="10000" pipelineSize="1" burstSize="100" clockRatio="1" privacy="1" referenceAttack="" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1102" id="1463" index="3" uid="c8945507-293d-4a93-9d74-9f247e83219a" >
+<COMPONENT type="1102" id="1430" index="5" uid="506e27c9-d32e-4be4-9bdf-ed365c3202b1" >
<cdparam x="907" y="330" />
<sizeparam width="165" height="50" 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="Bus1" value="name" />
<new d="false" />
-<TGConnectingPoint num="0" id="1439" />
-<TGConnectingPoint num="1" id="1440" />
-<TGConnectingPoint num="2" id="1441" />
-<TGConnectingPoint num="3" id="1442" />
-<TGConnectingPoint num="4" id="1443" />
-<TGConnectingPoint num="5" id="1444" />
-<TGConnectingPoint num="6" id="1445" />
-<TGConnectingPoint num="7" id="1446" />
-<TGConnectingPoint num="8" id="1447" />
-<TGConnectingPoint num="9" id="1448" />
-<TGConnectingPoint num="10" id="1449" />
-<TGConnectingPoint num="11" id="1450" />
-<TGConnectingPoint num="12" id="1451" />
-<TGConnectingPoint num="13" id="1452" />
-<TGConnectingPoint num="14" id="1453" />
-<TGConnectingPoint num="15" id="1454" />
-<TGConnectingPoint num="16" id="1455" />
-<TGConnectingPoint num="17" id="1456" />
-<TGConnectingPoint num="18" id="1457" />
-<TGConnectingPoint num="19" id="1458" />
-<TGConnectingPoint num="20" id="1459" />
-<TGConnectingPoint num="21" id="1460" />
-<TGConnectingPoint num="22" id="1461" />
-<TGConnectingPoint num="23" id="1462" />
+<TGConnectingPoint num="0" id="1406" />
+<TGConnectingPoint num="1" id="1407" />
+<TGConnectingPoint num="2" id="1408" />
+<TGConnectingPoint num="3" id="1409" />
+<TGConnectingPoint num="4" id="1410" />
+<TGConnectingPoint num="5" id="1411" />
+<TGConnectingPoint num="6" id="1412" />
+<TGConnectingPoint num="7" id="1413" />
+<TGConnectingPoint num="8" id="1414" />
+<TGConnectingPoint num="9" id="1415" />
+<TGConnectingPoint num="10" id="1416" />
+<TGConnectingPoint num="11" id="1417" />
+<TGConnectingPoint num="12" id="1418" />
+<TGConnectingPoint num="13" id="1419" />
+<TGConnectingPoint num="14" id="1420" />
+<TGConnectingPoint num="15" id="1421" />
+<TGConnectingPoint num="16" id="1422" />
+<TGConnectingPoint num="17" id="1423" />
+<TGConnectingPoint num="18" id="1424" />
+<TGConnectingPoint num="19" id="1425" />
+<TGConnectingPoint num="20" id="1426" />
+<TGConnectingPoint num="21" id="1427" />
+<TGConnectingPoint num="22" id="1428" />
+<TGConnectingPoint num="23" id="1429" />
<extraparam>
<info stereotype="BUS-RR" nodeName="Bus1" />
<attributes byteDataSize="4" arbitrationPolicy="0" sliceTime="10000" pipelineSize="1" burstSize="100" clockRatio="1" privacy="1" referenceAttack="" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1102" id="1488" index="4" uid="fad40fdd-eea5-4c91-a0cc-2d4f26660374" >
+<COMPONENT type="1102" id="1455" index="6" uid="75de2e24-d510-4024-9e59-2af7d6f5a00d" >
<cdparam x="635" y="345" />
<sizeparam width="170" height="50" 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="ExternalBus" value="name" />
<new d="false" />
-<TGConnectingPoint num="0" id="1464" />
-<TGConnectingPoint num="1" id="1465" />
-<TGConnectingPoint num="2" id="1466" />
-<TGConnectingPoint num="3" id="1467" />
-<TGConnectingPoint num="4" id="1468" />
-<TGConnectingPoint num="5" id="1469" />
-<TGConnectingPoint num="6" id="1470" />
-<TGConnectingPoint num="7" id="1471" />
-<TGConnectingPoint num="8" id="1472" />
-<TGConnectingPoint num="9" id="1473" />
-<TGConnectingPoint num="10" id="1474" />
-<TGConnectingPoint num="11" id="1475" />
-<TGConnectingPoint num="12" id="1476" />
-<TGConnectingPoint num="13" id="1477" />
-<TGConnectingPoint num="14" id="1478" />
-<TGConnectingPoint num="15" id="1479" />
-<TGConnectingPoint num="16" id="1480" />
-<TGConnectingPoint num="17" id="1481" />
-<TGConnectingPoint num="18" id="1482" />
-<TGConnectingPoint num="19" id="1483" />
-<TGConnectingPoint num="20" id="1484" />
-<TGConnectingPoint num="21" id="1485" />
-<TGConnectingPoint num="22" id="1486" />
-<TGConnectingPoint num="23" id="1487" />
+<TGConnectingPoint num="0" id="1431" />
+<TGConnectingPoint num="1" id="1432" />
+<TGConnectingPoint num="2" id="1433" />
+<TGConnectingPoint num="3" id="1434" />
+<TGConnectingPoint num="4" id="1435" />
+<TGConnectingPoint num="5" id="1436" />
+<TGConnectingPoint num="6" id="1437" />
+<TGConnectingPoint num="7" id="1438" />
+<TGConnectingPoint num="8" id="1439" />
+<TGConnectingPoint num="9" id="1440" />
+<TGConnectingPoint num="10" id="1441" />
+<TGConnectingPoint num="11" id="1442" />
+<TGConnectingPoint num="12" id="1443" />
+<TGConnectingPoint num="13" id="1444" />
+<TGConnectingPoint num="14" id="1445" />
+<TGConnectingPoint num="15" id="1446" />
+<TGConnectingPoint num="16" id="1447" />
+<TGConnectingPoint num="17" id="1448" />
+<TGConnectingPoint num="18" id="1449" />
+<TGConnectingPoint num="19" id="1450" />
+<TGConnectingPoint num="20" id="1451" />
+<TGConnectingPoint num="21" id="1452" />
+<TGConnectingPoint num="22" id="1453" />
+<TGConnectingPoint num="23" id="1454" />
<extraparam>
<info stereotype="BUS-RR" nodeName="ExternalBus" />
<attributes byteDataSize="4" arbitrationPolicy="0" sliceTime="10000" pipelineSize="1" burstSize="100" clockRatio="1" privacy="0" referenceAttack="" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1100" id="1522" index="5" uid="efeb415b-3fb4-48f5-a1e8-7e745ce76d65" >
+<COMPONENT type="1100" id="1489" index="7" uid="23e1d4c8-54ce-4c77-9e94-194e403034d7" >
<cdparam x="759" y="212" />
<sizeparam width="208" height="101" 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="CPUAlice" value="name" />
<new d="false" />
-<TGConnectingPoint num="0" id="1498" />
-<TGConnectingPoint num="1" id="1499" />
-<TGConnectingPoint num="2" id="1500" />
-<TGConnectingPoint num="3" id="1501" />
-<TGConnectingPoint num="4" id="1502" />
-<TGConnectingPoint num="5" id="1503" />
-<TGConnectingPoint num="6" id="1504" />
-<TGConnectingPoint num="7" id="1505" />
-<TGConnectingPoint num="8" id="1506" />
-<TGConnectingPoint num="9" id="1507" />
-<TGConnectingPoint num="10" id="1508" />
-<TGConnectingPoint num="11" id="1509" />
-<TGConnectingPoint num="12" id="1510" />
-<TGConnectingPoint num="13" id="1511" />
-<TGConnectingPoint num="14" id="1512" />
-<TGConnectingPoint num="15" id="1513" />
-<TGConnectingPoint num="16" id="1514" />
-<TGConnectingPoint num="17" id="1515" />
-<TGConnectingPoint num="18" id="1516" />
-<TGConnectingPoint num="19" id="1517" />
-<TGConnectingPoint num="20" id="1518" />
-<TGConnectingPoint num="21" id="1519" />
-<TGConnectingPoint num="22" id="1520" />
-<TGConnectingPoint num="23" id="1521" />
+<TGConnectingPoint num="0" id="1465" />
+<TGConnectingPoint num="1" id="1466" />
+<TGConnectingPoint num="2" id="1467" />
+<TGConnectingPoint num="3" id="1468" />
+<TGConnectingPoint num="4" id="1469" />
+<TGConnectingPoint num="5" id="1470" />
+<TGConnectingPoint num="6" id="1471" />
+<TGConnectingPoint num="7" id="1472" />
+<TGConnectingPoint num="8" id="1473" />
+<TGConnectingPoint num="9" id="1474" />
+<TGConnectingPoint num="10" id="1475" />
+<TGConnectingPoint num="11" id="1476" />
+<TGConnectingPoint num="12" id="1477" />
+<TGConnectingPoint num="13" id="1478" />
+<TGConnectingPoint num="14" id="1479" />
+<TGConnectingPoint num="15" id="1480" />
+<TGConnectingPoint num="16" id="1481" />
+<TGConnectingPoint num="17" id="1482" />
+<TGConnectingPoint num="18" id="1483" />
+<TGConnectingPoint num="19" id="1484" />
+<TGConnectingPoint num="20" id="1485" />
+<TGConnectingPoint num="21" id="1486" />
+<TGConnectingPoint num="22" id="1487" />
+<TGConnectingPoint num="23" id="1488" />
<extraparam>
<info stereotype="CPURR" nodeName="CPUAlice" />
<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="1497" index="14" uid="71faedfa-5f63-423f-a327-f3cefa4aad67" >
-<father id="1522" num="0" />
+<SUBCOMPONENT type="1101" id="1464" index="16" uid="c7474298-2870-477a-94e1-9846ca975d53" >
+<father id="1489" num="0" />
<cdparam x="765" y="254" />
<sizeparam width="169" height="40" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="39" minY="0" maxY="61" />
-<infoparam name="TGComponent" value="sampleAutoSec_enc::Alice" />
+<infoparam name="TGComponent" value="sampleAutoSec::Alice" />
<new d="false" />
-<TGConnectingPoint num="0" id="1489" />
-<TGConnectingPoint num="1" id="1490" />
-<TGConnectingPoint num="2" id="1491" />
-<TGConnectingPoint num="3" id="1492" />
-<TGConnectingPoint num="4" id="1493" />
-<TGConnectingPoint num="5" id="1494" />
-<TGConnectingPoint num="6" id="1495" />
-<TGConnectingPoint num="7" id="1496" />
+<TGConnectingPoint num="0" id="1456" />
+<TGConnectingPoint num="1" id="1457" />
+<TGConnectingPoint num="2" id="1458" />
+<TGConnectingPoint num="3" id="1459" />
+<TGConnectingPoint num="4" id="1460" />
+<TGConnectingPoint num="5" id="1461" />
+<TGConnectingPoint num="6" id="1462" />
+<TGConnectingPoint num="7" id="1463" />
<extraparam>
-<info value="sampleAutoSec_enc::Alice" taskName="Alice" referenceTaskName="sampleAutoSec_enc" priority="0" operationMEC="Alice" fatherComponentMECType="0" />
+<info value="sampleAutoSec::Alice" taskName="Alice" referenceTaskName="sampleAutoSec" priority="0" operationMEC="Alice" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="1100" id="1556" index="6" uid="b1f4c086-085b-4694-83bd-e2c3c869a2f9" >
+<COMPONENT type="1100" id="1523" index="8" uid="6a7578b9-2df0-4124-931e-828c8cb25cec" >
<cdparam x="523" y="219" />
<sizeparam width="212" height="102" 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="CPUBob" value="name" />
<new d="false" />
-<TGConnectingPoint num="0" id="1532" />
-<TGConnectingPoint num="1" id="1533" />
-<TGConnectingPoint num="2" id="1534" />
-<TGConnectingPoint num="3" id="1535" />
-<TGConnectingPoint num="4" id="1536" />
-<TGConnectingPoint num="5" id="1537" />
-<TGConnectingPoint num="6" id="1538" />
-<TGConnectingPoint num="7" id="1539" />
-<TGConnectingPoint num="8" id="1540" />
-<TGConnectingPoint num="9" id="1541" />
-<TGConnectingPoint num="10" id="1542" />
-<TGConnectingPoint num="11" id="1543" />
-<TGConnectingPoint num="12" id="1544" />
-<TGConnectingPoint num="13" id="1545" />
-<TGConnectingPoint num="14" id="1546" />
-<TGConnectingPoint num="15" id="1547" />
-<TGConnectingPoint num="16" id="1548" />
-<TGConnectingPoint num="17" id="1549" />
-<TGConnectingPoint num="18" id="1550" />
-<TGConnectingPoint num="19" id="1551" />
-<TGConnectingPoint num="20" id="1552" />
-<TGConnectingPoint num="21" id="1553" />
-<TGConnectingPoint num="22" id="1554" />
-<TGConnectingPoint num="23" id="1555" />
+<TGConnectingPoint num="0" id="1499" />
+<TGConnectingPoint num="1" id="1500" />
+<TGConnectingPoint num="2" id="1501" />
+<TGConnectingPoint num="3" id="1502" />
+<TGConnectingPoint num="4" id="1503" />
+<TGConnectingPoint num="5" id="1504" />
+<TGConnectingPoint num="6" id="1505" />
+<TGConnectingPoint num="7" id="1506" />
+<TGConnectingPoint num="8" id="1507" />
+<TGConnectingPoint num="9" id="1508" />
+<TGConnectingPoint num="10" id="1509" />
+<TGConnectingPoint num="11" id="1510" />
+<TGConnectingPoint num="12" id="1511" />
+<TGConnectingPoint num="13" id="1512" />
+<TGConnectingPoint num="14" id="1513" />
+<TGConnectingPoint num="15" id="1514" />
+<TGConnectingPoint num="16" id="1515" />
+<TGConnectingPoint num="17" id="1516" />
+<TGConnectingPoint num="18" id="1517" />
+<TGConnectingPoint num="19" id="1518" />
+<TGConnectingPoint num="20" id="1519" />
+<TGConnectingPoint num="21" id="1520" />
+<TGConnectingPoint num="22" id="1521" />
+<TGConnectingPoint num="23" id="1522" />
<extraparam>
<info stereotype="CPURR" nodeName="CPUBob" />
<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="1531" index="15" uid="2a727dde-ff28-4782-9a43-1614abeeafdb" >
-<father id="1556" num="0" />
+<SUBCOMPONENT type="1101" id="1498" index="17" uid="11418474-089b-4199-90d7-d9884cf6b8d0" >
+<father id="1523" num="0" />
<cdparam x="535" y="271" />
<sizeparam width="164" height="40" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="48" minY="0" maxY="62" />
-<infoparam name="TGComponent" value="sampleAutoSec_enc::Bob" />
+<infoparam name="TGComponent" value="sampleAutoSec::Bob" />
<new d="false" />
-<TGConnectingPoint num="0" id="1523" />
-<TGConnectingPoint num="1" id="1524" />
-<TGConnectingPoint num="2" id="1525" />
-<TGConnectingPoint num="3" id="1526" />
-<TGConnectingPoint num="4" id="1527" />
-<TGConnectingPoint num="5" id="1528" />
-<TGConnectingPoint num="6" id="1529" />
-<TGConnectingPoint num="7" id="1530" />
+<TGConnectingPoint num="0" id="1490" />
+<TGConnectingPoint num="1" id="1491" />
+<TGConnectingPoint num="2" id="1492" />
+<TGConnectingPoint num="3" id="1493" />
+<TGConnectingPoint num="4" id="1494" />
+<TGConnectingPoint num="5" id="1495" />
+<TGConnectingPoint num="6" id="1496" />
+<TGConnectingPoint num="7" id="1497" />
<extraparam>
-<info value="sampleAutoSec_enc::Bob" taskName="Bob" referenceTaskName="sampleAutoSec_enc" priority="0" operationMEC="Bob" fatherComponentMECType="0" />
+<info value="sampleAutoSec::Bob" taskName="Bob" referenceTaskName="sampleAutoSec" priority="0" operationMEC="Bob" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="125" id="1557" index="7" uid="4410f2a0-8096-436d-93eb-610fa87d6201" >
+<CONNECTOR type="125" id="1524" index="9" uid="f00cc7c2-cd3d-4bc2-916d-6890409c59a0" >
<cdparam x="847" y="316" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="{info}" />
-<P1 x="811" y="313" id="1512" />
-<P2 x="762" y="345" id="1473" />
+<P1 x="811" y="313" id="1479" />
+<P2 x="762" y="345" id="1440" />
<AutomaticDrawing data="true" />
<new d="false" />
<extraparam>
@@ -4019,12 +3892,12 @@
<spy value="false" />
</extraparam>
</CONNECTOR>
-<CONNECTOR type="125" id="1558" index="8" uid="113e703c-16e5-4e30-8eb4-ece58dc8644d" >
+<CONNECTOR type="125" id="1525" index="10" uid="a54b7890-f963-43cb-97d6-a4019fa50691" >
<cdparam x="495" y="269" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="{info}" />
-<P1 x="523" y="270" id="1535" />
-<P2 x="478" y="250" id="1418" />
+<P1 x="523" y="270" id="1502" />
+<P2 x="478" y="250" id="1385" />
<AutomaticDrawing data="true" />
<new d="false" />
<extraparam>
@@ -4032,12 +3905,12 @@
<spy value="false" />
</extraparam>
</CONNECTOR>
-<CONNECTOR type="125" id="1559" index="9" uid="076e5ca7-7707-4d53-a49c-63c86e0fe82e" >
+<CONNECTOR type="125" id="1526" index="11" uid="5b3a6654-4fff-4332-801e-a392620f46cd" >
<cdparam x="1026" y="331" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="{info}" />
-<P1 x="915" y="313" id="1513" />
-<P2 x="907" y="355" id="1442" />
+<P1 x="915" y="313" id="1480" />
+<P2 x="907" y="355" id="1409" />
<AutomaticDrawing data="true" />
<new d="false" />
<extraparam>
@@ -4045,12 +3918,12 @@
<spy value="false" />
</extraparam>
</CONNECTOR>
-<CONNECTOR type="125" id="1560" index="10" uid="487dd903-5bfd-4b14-a779-81b673da0e9a" >
+<CONNECTOR type="125" id="1527" index="12" uid="554fee9f-605e-444a-8d98-b29093348577" >
<cdparam x="1365" y="301" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="{info}" />
-<P1 x="1045" y="308" id="1370" />
-<P2 x="1030" y="330" id="1448" />
+<P1 x="1045" y="308" id="1337" />
+<P2 x="1030" y="330" id="1415" />
<AutomaticDrawing data="true" />
<new d="false" />
<extraparam>
@@ -4058,12 +3931,12 @@
<spy value="false" />
</extraparam>
</CONNECTOR>
-<CONNECTOR type="125" id="1561" index="11" uid="6de99db2-7871-4fae-a870-6a606781cf15" >
+<CONNECTOR type="125" id="1528" index="13" uid="7bafad10-a7ac-4186-9bcd-da7c054a3d44" >
<cdparam x="164" y="291" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="{info}" />
-<P1 x="408" y="291" id="1390" />
-<P2 x="408" y="275" id="1420" />
+<P1 x="408" y="291" id="1357" />
+<P2 x="408" y="275" id="1387" />
<AutomaticDrawing data="true" />
<new d="false" />
<extraparam>
@@ -4071,12 +3944,12 @@
<spy value="false" />
</extraparam>
</CONNECTOR>
-<CONNECTOR type="125" id="1562" index="12" uid="68fda931-6bea-48f0-b276-5793f418d393" >
+<CONNECTOR type="125" id="1529" index="14" uid="2f228cd6-968b-4da5-847b-c41a9f10b26d" >
<cdparam x="672" y="321" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="{info}" />
-<P1 x="576" y="321" id="1546" />
-<P2 x="677" y="345" id="1472" />
+<P1 x="576" y="321" id="1513" />
+<P2 x="677" y="345" id="1439" />
<AutomaticDrawing data="true" />
<new d="false" />
<extraparam>
@@ -4092,378 +3965,4 @@
-<Modeling type="TML Component Design" nameTab="sampleAutoSec_enc" tabs="TML Component Task Diagram$Bob$Alice" >
-<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="1563" index="0" uid="cb6cedbf-c8e6-4741-bbd0-8d37e4ca34d7" >
-<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="Connector between ports" />
-<P1 x="411" y="76" id="1565" />
-<P2 x="262" y="76" id="1578" />
-<AutomaticDrawing data="true" />
-<new d="false" />
-</CONNECTOR>
-<CONNECTOR type="126" id="1564" index="1" uid="ceda1663-3127-494c-826a-7260157d10a7" >
-<cdparam x="255" y="121" />
-<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="262" y="123" id="1580" />
-<P2 x="411" y="123" id="1567" />
-<AutomaticDrawing data="true" />
-<new d="false" />
-</CONNECTOR>
-<COMPONENT type="1202" id="1577" index="2" uid="f79e85e6-be50-4c3f-8bc5-e0da56b0bc66" >
-<cdparam x="411" y="58" />
-<sizeparam width="133" height="134" 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="Bob" />
-<new d="false" />
-<TGConnectingPoint num="0" id="1569" />
-<TGConnectingPoint num="1" id="1570" />
-<TGConnectingPoint num="2" id="1571" />
-<TGConnectingPoint num="3" id="1572" />
-<TGConnectingPoint num="4" id="1573" />
-<TGConnectingPoint num="5" id="1574" />
-<TGConnectingPoint num="6" id="1575" />
-<TGConnectingPoint num="7" id="1576" />
-<extraparam>
-<Data isAttacker="No" daemon="false" periodic="false" periodValue="" unit="" Operation="" />
-</extraparam>
-</COMPONENT>
-<SUBCOMPONENT type="1203" id="1566" index="4" uid="49d41c35-9c85-4489-a304-458e09714971" >
-<father id="1577" num="0" />
-<cdparam x="398" y="76" />
-<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="120" minY="-13" maxY="121" />
-<infoparam name="Primitive port" value="Channel nonceChBob_Alice" />
-<new d="false" />
-<TGConnectingPoint num="0" id="1565" />
-<extraparam>
-<Prop commName="nonceChBob_Alice" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="0" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-</extraparam>
-</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="1568" index="5" uid="d61211c3-3ffa-4944-a310-59703777a110" >
-<father id="1577" num="1" />
-<cdparam x="398" y="123" />
-<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="120" minY="-13" maxY="121" />
-<infoparam name="Primitive port" value="Channel comm" />
-<new d="false" />
-<TGConnectingPoint num="0" id="1567" />
-<extraparam>
-<Prop commName="comm" commType="0" origin="false" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="uint_16" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="true" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="0" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-</extraparam>
-</SUBCOMPONENT>
-
-<COMPONENT type="1202" id="1590" index="3" uid="3953f479-04a2-4372-9d87-c224e6c8c685" >
-<cdparam x="106" y="69" />
-<sizeparam width="156" height="129" 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="Alice" />
-<new d="false" />
-<TGConnectingPoint num="0" id="1582" />
-<TGConnectingPoint num="1" id="1583" />
-<TGConnectingPoint num="2" id="1584" />
-<TGConnectingPoint num="3" id="1585" />
-<TGConnectingPoint num="4" id="1586" />
-<TGConnectingPoint num="5" id="1587" />
-<TGConnectingPoint num="6" id="1588" />
-<TGConnectingPoint num="7" id="1589" />
-<extraparam>
-<Data isAttacker="No" daemon="false" periodic="false" periodValue="" unit="" Operation="" />
-</extraparam>
-</COMPONENT>
-<SUBCOMPONENT type="1203" id="1579" index="6" uid="16d42e0a-098a-4735-a994-cfba59a90978" >
-<father id="1590" num="0" />
-<cdparam x="249" y="76" />
-<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="143" minY="-13" maxY="116" />
-<infoparam name="Primitive port" value="Channel nonceChBob_Alice" />
-<new d="false" />
-<TGConnectingPoint num="0" id="1578" />
-<extraparam>
-<Prop commName="nonceChBob_Alice" commType="0" origin="false" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="0" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-</extraparam>
-</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="1581" index="7" uid="e01d494c-cb1c-43aa-82b4-6ea1b1649e2b" >
-<father id="1590" num="1" />
-<cdparam x="249" y="123" />
-<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="143" minY="-13" maxY="116" />
-<infoparam name="Primitive port" value="Channel comm" />
-<new d="false" />
-<TGConnectingPoint num="0" id="1580" />
-<extraparam>
-<Prop commName="comm" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="uint_16" associatedEvent="" checkConf="true" checkConfStatus="1" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="0" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-</extraparam>
-</SUBCOMPONENT>
-
-
-</TMLComponentTaskDiagramPanel>
-
-<TMLActivityDiagramPanel name="Bob" minX="10" maxX="2500" minY="10" maxY="1640" zoom="1.0" >
-<COMPONENT type="1036" id="1593" index="0" uid="189c5913-2988-4d05-811e-b9a42ff53c45" >
-<cdparam x="401" y="255" />
-<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="1640" />
-<infoparam name="decrypt" value="null" />
-<new d="false" />
-<TGConnectingPoint num="0" id="1591" />
-<TGConnectingPoint num="1" id="1592" />
-<extraparam>
-<Data secPattern="autoEncrypt_comm" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1006" id="1596" index="1" uid="efac8602-41ab-4b9f-9d6e-148690bb8208" >
-<cdparam x="336" y="161" />
-<sizeparam width="142" 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="1640" />
-<infoparam name="write channel" value="nonceChBob_Alice(1)" />
-<new d="false" />
-<TGConnectingPoint num="0" id="1594" />
-<TGConnectingPoint num="1" id="1595" />
-<extraparam>
-<Data channelName="nonceChBob_Alice" nbOfSamples="1" secPattern="nonce_Bob_Alice" isAttacker="No" isEncForm="Yes" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1035" id="1599" index="2" uid="b265d7b0-3be4-49a3-97e9-c31eba48f1c8" >
-<cdparam x="400" y="90" />
-<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="1640" />
-<infoparam name="encrypt" value="null" />
-<new d="false" />
-<TGConnectingPoint num="0" id="1597" />
-<TGConnectingPoint num="1" id="1598" />
-<extraparam>
-<Data secContext="nonce_Bob_Alice" type="Nonce" overhead="0" size="" encTime="100" decTime="100" nonce="" key="" algorithm="" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1001" id="1601" index="3" uid="60b68743-3805-4ab3-87ff-cbac76123e61" >
-<cdparam x="398" y="321" />
-<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="1640" />
-<infoparam name="stop state" value="null" />
-<new d="false" />
-<TGConnectingPoint num="0" id="1600" />
-</COMPONENT>
-
-<COMPONENT type="1009" id="1604" index="4" uid="82f5cdb4-db1f-44e3-8aa7-6c2194f0166a" >
-<cdparam x="373" y="209" />
-<sizeparam width="69" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<enabled value="true" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1640" />
-<infoparam name="read channel" value="comm(1) " />
-<new d="false" />
-<TGConnectingPoint num="0" id="1602" />
-<TGConnectingPoint num="1" id="1603" />
-<extraparam>
-<Data channelName="comm" nbOfSamples="1" secPattern="autoEncrypt_comm" isAttacker="No" isEncForm="Yes" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1000" id="1606" index="5" uid="c7e2a44a-1307-4fd4-bbe3-d4c83fb800f1" >
-<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="2500" minY="10" maxY="1640" />
-<infoparam name="start state" value="null" />
-<new d="false" />
-<TGConnectingPoint num="0" id="1605" />
-</COMPONENT>
-
-<CONNECTOR type="115" id="1607" index="6" uid="0699e52c-71b9-4f2f-9268-f5ec67329558" >
-<cdparam x="388" y="468" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="null" />
-<P1 x="408" y="300" id="1592" />
-<P2 x="408" y="316" id="1600" />
-<AutomaticDrawing data="true" />
-<new d="false" />
-</CONNECTOR>
-<CONNECTOR type="115" id="1608" index="7" uid="399dbd97-51ae-4e9b-aa57-dd32abc800a7" >
-<cdparam x="392" y="371" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="null" />
-<P1 x="407" y="186" id="1595" />
-<P2 x="407" y="204" id="1602" />
-<AutomaticDrawing data="true" />
-<new d="false" />
-</CONNECTOR>
-<CONNECTOR type="115" id="1609" index="8" uid="3c7a6b11-7452-4190-a1eb-e8e38cb6245c" >
-<cdparam x="392" y="441" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="null" />
-<P1 x="407" y="135" id="1598" />
-<P2 x="407" y="156" id="1594" />
-<AutomaticDrawing data="true" />
-<new d="false" />
-</CONNECTOR>
-<CONNECTOR type="115" id="1610" index="9" uid="93768ea3-1a8f-49a8-91f8-9f9121bbc4c5" >
-<cdparam x="407" y="374" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="null" />
-<P1 x="407" y="234" id="1603" />
-<P2 x="408" y="250" id="1591" />
-<AutomaticDrawing data="true" />
-<new d="false" />
-</CONNECTOR>
-<CONNECTOR type="115" id="1611" index="10" uid="65a39007-ba40-4c01-8db8-3c6d0a437bf8" >
-<cdparam x="407" y="140" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="null" />
-<P1 x="407" y="70" id="1605" />
-<P2 x="407" y="85" id="1597" />
-<AutomaticDrawing data="true" />
-<new d="false" />
-</CONNECTOR>
-
-</TMLActivityDiagramPanel>
-
-<TMLActivityDiagramPanel name="Alice" minX="10" maxX="2500" minY="10" maxY="1670" zoom="1.0" >
-<COMPONENT type="1035" id="1614" index="0" uid="138e0bb6-0cb9-4168-802c-efa4fb0560a3" >
-<cdparam x="401" y="141" />
-<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="1670" />
-<infoparam name="encrypt" value="null" />
-<new d="false" />
-<TGConnectingPoint num="0" id="1612" />
-<TGConnectingPoint num="1" id="1613" />
-<extraparam>
-<Data secContext="autoEncrypt_comm" type="Symmetric Encryption" overhead="0" size="" encTime="100" decTime="100" nonce="nonce_Bob_Alice" key="" algorithm="" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1009" id="1617" index="1" uid="c0a9fbc3-bd7d-443c-b95a-2d507a90b1d2" >
-<cdparam x="334" y="96" />
-<sizeparam width="146" 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="1670" />
-<infoparam name="read channel" value="nonceChBob_Alice(1) " />
-<new d="false" />
-<TGConnectingPoint num="0" id="1615" />
-<TGConnectingPoint num="1" id="1616" />
-<extraparam>
-<Data channelName="nonceChBob_Alice" nbOfSamples="1" secPattern="nonce_Bob_Alice" isAttacker="No" isEncForm="Yes" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1006" id="1620" index="2" uid="6ccb4e29-4586-4074-a8cc-5b6c3a085fe8" >
-<cdparam x="376" y="207" />
-<sizeparam width="65" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<enabled value="true" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1670" />
-<infoparam name="write channel" value="comm(1)" />
-<new d="false" />
-<TGConnectingPoint num="0" id="1618" />
-<TGConnectingPoint num="1" id="1619" />
-<extraparam>
-<Data channelName="comm" nbOfSamples="1" secPattern="autoEncrypt_comm" isAttacker="No" isEncForm="Yes" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1001" id="1622" index="3" uid="d9017c0c-2c84-4eeb-96d3-c87742ad67e6" >
-<cdparam x="398" 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="1670" />
-<infoparam name="stop state" value="null" />
-<new d="false" />
-<TGConnectingPoint num="0" id="1621" />
-</COMPONENT>
-
-<COMPONENT type="1000" id="1624" index="4" uid="2aa32618-0396-40d3-857d-2fe680a34ebd" >
-<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="2500" minY="10" maxY="1670" />
-<infoparam name="start state" value="null" />
-<new d="false" />
-<TGConnectingPoint num="0" id="1623" />
-</COMPONENT>
-
-<CONNECTOR type="115" id="1625" index="5" uid="4c659c2c-c813-4c13-81ad-aba1e9e30b37" >
-<cdparam x="375" y="379" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="null" />
-<P1 x="408" y="186" id="1613" />
-<P2 x="408" y="202" id="1618" />
-<AutomaticDrawing data="true" />
-<new d="false" />
-</CONNECTOR>
-<CONNECTOR type="115" id="1626" index="6" uid="7cac21e4-a47b-4489-85dc-015bed7c1393" >
-<cdparam x="375" y="319" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="null" />
-<P1 x="407" y="121" id="1616" />
-<P2 x="408" y="136" id="1612" />
-<AutomaticDrawing data="true" />
-<new d="false" />
-</CONNECTOR>
-<CONNECTOR type="115" id="1627" index="7" uid="fdd86df2-89a8-4101-8a20-b12756fa3e66" >
-<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="407" y="70" id="1623" />
-<P2 x="407" y="91" id="1615" />
-<AutomaticDrawing data="true" />
-<new d="false" />
-</CONNECTOR>
-<CONNECTOR type="115" id="1628" index="8" uid="3fee3360-7093-4bc1-a80b-a6a3f87d3b0b" >
-<cdparam x="401" y="296" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="null" />
-<P1 x="408" y="232" id="1619" />
-<P2 x="408" y="260" id="1621" />
-<AutomaticDrawing data="true" />
-<new d="false" />
-</CONNECTOR>
-
-</TMLActivityDiagramPanel>
-
-</Modeling>
-
-
-
-
</TURTLEGMODELING>
\ No newline at end of file
diff --git a/modeling/SysMLSec/SysMLSecTutorial.xml b/modeling/SysMLSec/SysMLSecTutorial.xml
index 646cae2169cf6c263e5dfadb10e6b50af0b09b7e..51c21474a272d19ec6f26f08abd4898ce0735ae8 100644
--- a/modeling/SysMLSec/SysMLSecTutorial.xml
+++ b/modeling/SysMLSec/SysMLSecTutorial.xml
@@ -1,6 +1,6 @@
<?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="7" 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="3" 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" >
@@ -192,13 +192,13 @@
<TGConnectingPoint num="19" id="134" />
<TGConnectingPoint num="20" id="135" />
</COMPONENT>
-<SUBCOMPONENT type="5707" id="112" index="23" uid="faf8a9c6-abd0-4394-b69e-bc2bb622ac93" >
+<SUBCOMPONENT type="5707" id="112" index="23" uid="1370a96e-0d89-48c4-a29b-0a049e868e13" >
<father id="136" num="0" />
-<cdparam x="818" y="267" />
+<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>
<SUBCOMPONENT type="5707" id="113" index="24" uid="a75435a4-67d9-4be4-a579-68815106caeb" >
@@ -210,13 +210,13 @@
<infoparam name="value " value="SecureArchitectureWithNonSecureFV" />
<new d="false" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="5707" id="114" index="25" uid="1370a96e-0d89-48c4-a29b-0a049e868e13" >
+<SUBCOMPONENT type="5707" id="114" index="25" uid="faf8a9c6-abd0-4394-b69e-bc2bb622ac93" >
<father id="136" num="2" />
-<cdparam x="818" y="297" />
+<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>
@@ -249,13 +249,13 @@
<TGConnectingPoint num="19" id="159" />
<TGConnectingPoint num="20" id="160" />
</COMPONENT>
-<SUBCOMPONENT type="5707" id="137" index="26" uid="02e527d6-856a-40b4-b8a3-2a10e74fa930" >
+<SUBCOMPONENT type="5707" id="137" index="26" uid="3beb2cdc-16ad-4be0-beb5-d5589509c270" >
<father id="161" num="0" />
-<cdparam x="1155" y="141" />
+<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>
<SUBCOMPONENT type="5707" id="138" index="27" uid="93271dfb-16c3-4c66-8b66-e66c40f2fdd6" >
@@ -267,13 +267,13 @@
<infoparam name="value " value="SecureArchitectureWithNonSecureFV" />
<new d="false" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="5707" id="139" index="28" uid="3beb2cdc-16ad-4be0-beb5-d5589509c270" >
+<SUBCOMPONENT type="5707" id="139" index="28" uid="02e527d6-856a-40b4-b8a3-2a10e74fa930" >
<father id="161" num="2" />
-<cdparam x="1155" y="171" />
+<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>
@@ -306,22 +306,22 @@
<TGConnectingPoint num="19" id="183" />
<TGConnectingPoint num="20" id="184" />
</COMPONENT>
-<SUBCOMPONENT type="5707" id="162" index="29" uid="ce6c8db0-5c95-400b-a68a-a80af90eb337" >
+<SUBCOMPONENT type="5707" id="162" index="29" uid="f9282079-9523-430f-9a47-a23e2645f6aa" >
<father id="185" num="0" />
-<cdparam x="655" y="140" />
+<cdparam x="655" y="155" />
<sizeparam width="10" height="10" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="655" maxX="655" minY="140" maxY="140" />
-<infoparam name="value " value="NonSecureFV" />
+<cdrectangleparam minX="655" maxX="655" minY="155" maxY="155" />
+<infoparam name="value " value="SecureFV" />
<new d="false" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="5707" id="163" index="30" uid="f9282079-9523-430f-9a47-a23e2645f6aa" >
+<SUBCOMPONENT type="5707" id="163" index="30" uid="ce6c8db0-5c95-400b-a68a-a80af90eb337" >
<father id="185" num="1" />
-<cdparam x="655" y="155" />
+<cdparam x="655" y="140" />
<sizeparam width="10" height="10" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="655" maxX="655" minY="155" maxY="155" />
-<infoparam name="value " value="SecureFV" />
+<cdrectangleparam minX="655" maxX="655" minY="140" maxY="140" />
+<infoparam name="value " value="NonSecureFV" />
<new d="false" />
</SUBCOMPONENT>
@@ -1053,16 +1053,16 @@
<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" 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" />
+<cdparam x="505" y="300" />
<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="555" />
-<P2 x="565" y="185" id="544" />
+<P1 x="505" y="300" id="555" />
+<P2 x="597" y="301" id="544" />
<AutomaticDrawing data="true" />
<new d="false" />
</CONNECTOR>
<COMPONENT type="1202" id="554" index="1" uid="e4cc3c45-2a2a-48f9-9648-cf634cb268d7" >
-<cdparam x="565" y="132" />
+<cdparam x="610" y="235" />
<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" />
@@ -1083,7 +1083,7 @@
<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" />
+<cdparam x="597" y="288" />
<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" />
@@ -1091,7 +1091,7 @@
<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" />
+<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="0" checkStrongAuthStatus="0" vc="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -1101,7 +1101,7 @@
</SUBCOMPONENT>
<COMPONENT type="1202" id="565" index="2" uid="c85f17f8-5408-49d7-bd1a-4bfcbb49834c" >
-<cdparam x="206" y="130" />
+<cdparam x="292" y="232" />
<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" />
@@ -1122,7 +1122,7 @@
<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" />
+<cdparam x="479" y="287" />
<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" />
@@ -1302,9 +1302,9 @@
<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" />
+<sizeparam width="164" 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" />
+<cdrectangleparam minX="0" maxX="41" minY="0" maxY="99" />
<infoparam name="TGComponent" value="NonSecureFV::comm" />
<new d="false" />
<TGConnectingPoint num="0" id="584" />
@@ -1359,9 +1359,9 @@
<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" />
+<sizeparam width="164" 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" />
+<cdrectangleparam minX="0" maxX="86" minY="0" maxY="56" />
<infoparam name="TGComponent" value="NonSecureFV::comm" />
<new d="false" />
<TGConnectingPoint num="0" id="618" />
@@ -1416,9 +1416,9 @@
<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" />
+<sizeparam width="142" 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" />
+<cdrectangleparam minX="0" maxX="108" minY="0" maxY="160" />
<infoparam name="TGComponent" value="NonSecureFV::T2" />
<new d="false" />
<TGConnectingPoint num="0" id="652" />
@@ -1473,9 +1473,9 @@
<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" />
+<sizeparam width="142" 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" />
+<cdrectangleparam minX="0" maxX="108" minY="0" maxY="160" />
<infoparam name="TGComponent" value="NonSecureFV::T1" />
<new d="false" />
<TGConnectingPoint num="0" id="686" />
@@ -1579,9 +1579,9 @@
<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" />
+<sizeparam width="164" 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" />
+<cdrectangleparam minX="0" maxX="41" minY="0" maxY="99" />
<infoparam name="TGComponent" value="NonSecureFV::comm" />
<new d="false" />
<TGConnectingPoint num="0" id="723" />
@@ -1636,9 +1636,9 @@
<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" />
+<sizeparam width="164" 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" />
+<cdrectangleparam minX="0" maxX="86" minY="0" maxY="56" />
<infoparam name="TGComponent" value="NonSecureFV::comm" />
<new d="false" />
<TGConnectingPoint num="0" id="757" />
@@ -1693,9 +1693,9 @@
<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" />
+<sizeparam width="142" 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" />
+<cdrectangleparam minX="0" maxX="108" minY="0" maxY="160" />
<infoparam name="TGComponent" value="NonSecureFV::T2" />
<new d="false" />
<TGConnectingPoint num="0" id="791" />
@@ -1750,9 +1750,9 @@
<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" />
+<sizeparam width="142" 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" />
+<cdrectangleparam minX="0" maxX="108" minY="0" maxY="160" />
<infoparam name="TGComponent" value="NonSecureFV::T1" />
<new d="false" />
<TGConnectingPoint num="0" id="825" />
@@ -1821,8 +1821,8 @@
<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="419" y="198" id="874" />
-<P2 x="570" y="198" id="863" />
+<P1 x="406" y="185" id="874" />
+<P2 x="583" y="185" id="863" />
<AutomaticDrawing data="true" />
<new d="false" />
</CONNECTOR>
@@ -1856,7 +1856,7 @@
<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="true" checkWeakAuthStatus="1" checkStrongAuthStatus="1" 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="0" checkStrongAuthStatus="0" vc="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -1895,7 +1895,7 @@
<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="1" checkStrongAuthStatus="1" 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="0" checkStrongAuthStatus="0" vc="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -2112,13 +2112,13 @@
<attributes byteDataSize="4" memorySize="1024" clockRatio="1" bufferType="0" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1111" id="919" index="7" uid="0acfc1db-b1b2-414f-8921-97e25a1dfdee" >
+<SUBCOMPONENT type="1103" id="919" index="7" uid="ec253bf8-8c3e-4999-a477-62fa04920940" >
<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" />
+<cdparam x="590" y="530" />
+<sizeparam width="139" height="40" minWidth="75" minHeight="1" 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" />
+<cdrectangleparam minX="0" maxX="134" minY="0" maxY="104" />
+<infoparam name="TGComponent" value="SecureFV::comm" />
<new d="false" />
<TGConnectingPoint num="0" id="911" />
<TGConnectingPoint num="1" id="912" />
@@ -2129,16 +2129,16 @@
<TGConnectingPoint num="6" id="917" />
<TGConnectingPoint num="7" id="918" />
<extraparam>
-<info value="Cipherdata" referenceKeyName="Cipherdata" priority="5" typeName="key" />
+<info value="SecureFV::comm" communicationName="comm" referenceCommunicationName="SecureFV" mappedElements="" priority="0" typeName="channel" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1103" id="928" index="8" uid="ec253bf8-8c3e-4999-a477-62fa04920940" >
+<SUBCOMPONENT type="1111" id="928" index="8" uid="0acfc1db-b1b2-414f-8921-97e25a1dfdee" >
<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" />
+<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="143" minY="0" maxY="104" />
-<infoparam name="TGComponent" value="SecureFV::comm" />
+<cdrectangleparam minX="0" maxX="178" minY="0" maxY="105" />
+<infoparam name="TGComponent" value="Cipherdata" />
<new d="false" />
<TGConnectingPoint num="0" id="920" />
<TGConnectingPoint num="1" id="921" />
@@ -2149,7 +2149,7 @@
<TGConnectingPoint num="6" id="926" />
<TGConnectingPoint num="7" id="927" />
<extraparam>
-<info value="SecureFV::comm" communicationName="comm" referenceCommunicationName="SecureFV" mappedElements="" priority="0" typeName="channel" />
+<info value="Cipherdata" referenceKeyName="Cipherdata" priority="5" typeName="key" />
</extraparam>
</SUBCOMPONENT>
@@ -2192,9 +2192,9 @@
<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" />
+<sizeparam width="139" 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" />
+<cdrectangleparam minX="0" maxX="111" minY="0" maxY="56" />
<infoparam name="TGComponent" value="SecureFV::comm" />
<new d="false" />
<TGConnectingPoint num="0" id="954" />
@@ -2249,9 +2249,9 @@
<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" />
+<sizeparam width="117" 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" />
+<cdrectangleparam minX="0" maxX="133" minY="0" maxY="160" />
<infoparam name="TGComponent" value="SecureFV::T2" />
<new d="false" />
<TGConnectingPoint num="0" id="988" />
@@ -2306,9 +2306,9 @@
<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" />
+<sizeparam width="117" 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" />
+<cdrectangleparam minX="0" maxX="133" minY="0" maxY="160" />
<infoparam name="TGComponent" value="SecureFV::T1" />
<new d="false" />
<TGConnectingPoint num="0" id="1022" />
@@ -2371,7 +2371,7 @@
-<Modeling type="AVATAR Design" nameTab="SecurityMechanismDesign" tabs="Block Diagram$System$T2$T1$Block$Block" >
+<Modeling type="AVATAR Design" nameTab="SecurityMechanismDesign" tabs="Block Diagram$System$T2$T1" >
<AVATARBlockDiagramPanel name="Block Diagram" minX="10" maxX="1900" minY="10" maxY="900" zoom="1.0" >
<MainCode value="void __user_init() {"/>
<MainCode value="}"/>
@@ -2380,263 +2380,15 @@
<Validated value="" />
<Ignored value="" />
-<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" >
+<CONNECTOR type="5002" id="1064" index="0" 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="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" />
+<TGConnectingPoint num="0" id="1061" />
+<TGConnectingPoint num="1" id="1062" />
+<TGConnectingPoint num="2" id="1063" />
+<P1 x="459" y="88" id="1193" />
+<P2 x="459" y="143" id="1186" />
<Point x="490" y="88" />
<Point x="490" y="143" />
<AutomaticDrawing data="true" />
@@ -2646,8 +2398,8 @@
<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="1178" index="11" uid="3c00520f-5ad9-4ce4-a254-242a4e994208" >
-<father id="1183" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1059" index="5" uid="3c00520f-5ad9-4ce4-a254-242a4e994208" >
+<father id="1064" 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" />
@@ -2655,8 +2407,8 @@
<infoparam name="point " value="null" />
<new d="false" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="1179" index="12" uid="4b38daa0-222b-49e0-b12b-1278f4f4a2cd" >
-<father id="1183" num="1" />
+<SUBCOMPONENT type="-1" id="1060" index="6" uid="4b38daa0-222b-49e0-b12b-1278f4f4a2cd" >
+<father id="1064" 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" />
@@ -2665,9 +2417,9 @@
<new d="false" />
</SUBCOMPONENT>
-<COMPONENT type="302" id="1200" index="7" uid="12bc1e8f-c160-40b5-9c76-535083b73fe1" >
+<COMPONENT type="302" id="1081" index="1" 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" />
+<sizeparam width="274" height="66" minWidth="80" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="900" />
<infoparam name="Proverif Pragma" value="#InitialSystemKnowledge T1.sk T2.sk
@@ -2675,22 +2427,22 @@
#Confidentiality T1.secretData
" />
<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" />
+<TGConnectingPoint num="0" id="1065" />
+<TGConnectingPoint num="1" id="1066" />
+<TGConnectingPoint num="2" id="1067" />
+<TGConnectingPoint num="3" id="1068" />
+<TGConnectingPoint num="4" id="1069" />
+<TGConnectingPoint num="5" id="1070" />
+<TGConnectingPoint num="6" id="1071" />
+<TGConnectingPoint num="7" id="1072" />
+<TGConnectingPoint num="8" id="1073" />
+<TGConnectingPoint num="9" id="1074" />
+<TGConnectingPoint num="10" id="1075" />
+<TGConnectingPoint num="11" id="1076" />
+<TGConnectingPoint num="12" id="1077" />
+<TGConnectingPoint num="13" id="1078" />
+<TGConnectingPoint num="14" id="1079" />
+<TGConnectingPoint num="15" id="1080" />
<extraparam>
<Line value="#InitialSystemKnowledge T1.sk T2.sk" />
<Line value="" />
@@ -2698,93 +2450,93 @@
</extraparam>
</COMPONENT>
-<COMPONENT type="5003" id="1209" index="8" uid="c53b882a-3bdd-42ec-b942-b9febe1ac229" >
+<COMPONENT type="5003" id="1090" index="2" 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" />
+<sizeparam width="124" height="71" 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" />
<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" />
+<TGConnectingPoint num="0" id="1082" />
+<TGConnectingPoint num="1" id="1083" />
+<TGConnectingPoint num="2" id="1084" />
+<TGConnectingPoint num="3" id="1085" />
+<TGConnectingPoint num="4" id="1086" />
+<TGConnectingPoint num="5" id="1087" />
+<TGConnectingPoint num="6" id="1088" />
+<TGConnectingPoint num="7" id="1089" />
<extraparam>
<Attribute access="0" id="data" value="" type="8" typeOther="" />
</extraparam>
</COMPONENT>
-<COMPONENT type="5003" id="1218" index="9" uid="451d5e5e-bf99-48b4-85ad-e63209864c9b" >
+<COMPONENT type="5003" id="1099" index="3" 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" />
+<sizeparam width="119" height="72" 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" />
<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" />
+<TGConnectingPoint num="0" id="1091" />
+<TGConnectingPoint num="1" id="1092" />
+<TGConnectingPoint num="2" id="1093" />
+<TGConnectingPoint num="3" id="1094" />
+<TGConnectingPoint num="4" id="1095" />
+<TGConnectingPoint num="5" id="1096" />
+<TGConnectingPoint num="6" id="1097" />
+<TGConnectingPoint num="7" id="1098" />
<extraparam>
<Attribute access="0" id="data" value="" type="8" typeOther="" />
</extraparam>
</COMPONENT>
-<COMPONENT type="5000" id="1341" index="10" uid="b2874923-24b8-4f17-bd28-ee88aa64f45c" >
+<COMPONENT type="5000" id="1222" index="4" 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" />
<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" />
+<TGConnectingPoint num="0" id="1182" />
+<TGConnectingPoint num="1" id="1183" />
+<TGConnectingPoint num="2" id="1184" />
+<TGConnectingPoint num="3" id="1185" />
+<TGConnectingPoint num="4" id="1186" />
+<TGConnectingPoint num="5" id="1187" />
+<TGConnectingPoint num="6" id="1188" />
+<TGConnectingPoint num="7" id="1189" />
+<TGConnectingPoint num="8" id="1190" />
+<TGConnectingPoint num="9" id="1191" />
+<TGConnectingPoint num="10" id="1192" />
+<TGConnectingPoint num="11" id="1193" />
+<TGConnectingPoint num="12" id="1194" />
+<TGConnectingPoint num="13" id="1195" />
+<TGConnectingPoint num="14" id="1196" />
+<TGConnectingPoint num="15" id="1197" />
+<TGConnectingPoint num="16" id="1198" />
+<TGConnectingPoint num="17" id="1199" />
+<TGConnectingPoint num="18" id="1200" />
+<TGConnectingPoint num="19" id="1201" />
+<TGConnectingPoint num="20" id="1202" />
+<TGConnectingPoint num="21" id="1203" />
+<TGConnectingPoint num="22" id="1204" />
+<TGConnectingPoint num="23" id="1205" />
+<TGConnectingPoint num="24" id="1206" />
+<TGConnectingPoint num="25" id="1207" />
+<TGConnectingPoint num="26" id="1208" />
+<TGConnectingPoint num="27" id="1209" />
+<TGConnectingPoint num="28" id="1210" />
+<TGConnectingPoint num="29" id="1211" />
+<TGConnectingPoint num="30" id="1212" />
+<TGConnectingPoint num="31" id="1213" />
+<TGConnectingPoint num="32" id="1214" />
+<TGConnectingPoint num="33" id="1215" />
+<TGConnectingPoint num="34" id="1216" />
+<TGConnectingPoint num="35" id="1217" />
+<TGConnectingPoint num="36" id="1218" />
+<TGConnectingPoint num="37" id="1219" />
+<TGConnectingPoint num="38" id="1220" />
+<TGConnectingPoint num="39" id="1221" />
<extraparam>
<blockType data="block" color="-4072719" />
<CryptoBlock value="false" />
@@ -2792,61 +2544,61 @@
<Signal value="out chout(Message msg)" attached="true" />
</extraparam>
</COMPONENT>
-<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" />
+<SUBCOMPONENT type="5000" id="1140" index="7" uid="8227d454-31f1-4610-afd9-7ec516c8d9f4" >
+<father id="1222" num="0" />
+<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" />
+<cdrectangleparam minX="0" maxX="299" minY="0" maxY="93" />
+<infoparam name="Block0" value="T2" />
<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" />
+<TGConnectingPoint num="0" id="1100" />
+<TGConnectingPoint num="1" id="1101" />
+<TGConnectingPoint num="2" id="1102" />
+<TGConnectingPoint num="3" id="1103" />
+<TGConnectingPoint num="4" id="1104" />
+<TGConnectingPoint num="5" id="1105" />
+<TGConnectingPoint num="6" id="1106" />
+<TGConnectingPoint num="7" id="1107" />
+<TGConnectingPoint num="8" id="1108" />
+<TGConnectingPoint num="9" id="1109" />
+<TGConnectingPoint num="10" id="1110" />
+<TGConnectingPoint num="11" id="1111" />
+<TGConnectingPoint num="12" id="1112" />
+<TGConnectingPoint num="13" id="1113" />
+<TGConnectingPoint num="14" id="1114" />
+<TGConnectingPoint num="15" id="1115" />
+<TGConnectingPoint num="16" id="1116" />
+<TGConnectingPoint num="17" id="1117" />
+<TGConnectingPoint num="18" id="1118" />
+<TGConnectingPoint num="19" id="1119" />
+<TGConnectingPoint num="20" id="1120" />
+<TGConnectingPoint num="21" id="1121" />
+<TGConnectingPoint num="22" id="1122" />
+<TGConnectingPoint num="23" id="1123" />
+<TGConnectingPoint num="24" id="1124" />
+<TGConnectingPoint num="25" id="1125" />
+<TGConnectingPoint num="26" id="1126" />
+<TGConnectingPoint num="27" id="1127" />
+<TGConnectingPoint num="28" id="1128" />
+<TGConnectingPoint num="29" id="1129" />
+<TGConnectingPoint num="30" id="1130" />
+<TGConnectingPoint num="31" id="1131" />
+<TGConnectingPoint num="32" id="1132" />
+<TGConnectingPoint num="33" id="1133" />
+<TGConnectingPoint num="34" id="1134" />
+<TGConnectingPoint num="35" id="1135" />
+<TGConnectingPoint num="36" id="1136" />
+<TGConnectingPoint num="37" id="1137" />
+<TGConnectingPoint num="38" id="1138" />
+<TGConnectingPoint num="39" id="1139" />
<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)" />
@@ -2871,61 +2623,61 @@
<Method value="Message hash(Message msg)" />
</extraparam>
</SUBCOMPONENT>
-<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" />
+<SUBCOMPONENT type="5000" id="1181" index="8" uid="5e66075c-c37b-4b3e-ac45-2340e7ead245" >
+<father id="1222" num="1" />
+<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" />
+<cdrectangleparam minX="0" maxX="223" minY="0" maxY="93" />
+<infoparam name="Block0" value="T1" />
<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" />
+<TGConnectingPoint num="0" id="1141" />
+<TGConnectingPoint num="1" id="1142" />
+<TGConnectingPoint num="2" id="1143" />
+<TGConnectingPoint num="3" id="1144" />
+<TGConnectingPoint num="4" id="1145" />
+<TGConnectingPoint num="5" id="1146" />
+<TGConnectingPoint num="6" id="1147" />
+<TGConnectingPoint num="7" id="1148" />
+<TGConnectingPoint num="8" id="1149" />
+<TGConnectingPoint num="9" id="1150" />
+<TGConnectingPoint num="10" id="1151" />
+<TGConnectingPoint num="11" id="1152" />
+<TGConnectingPoint num="12" id="1153" />
+<TGConnectingPoint num="13" id="1154" />
+<TGConnectingPoint num="14" id="1155" />
+<TGConnectingPoint num="15" id="1156" />
+<TGConnectingPoint num="16" id="1157" />
+<TGConnectingPoint num="17" id="1158" />
+<TGConnectingPoint num="18" id="1159" />
+<TGConnectingPoint num="19" id="1160" />
+<TGConnectingPoint num="20" id="1161" />
+<TGConnectingPoint num="21" id="1162" />
+<TGConnectingPoint num="22" id="1163" />
+<TGConnectingPoint num="23" id="1164" />
+<TGConnectingPoint num="24" id="1165" />
+<TGConnectingPoint num="25" id="1166" />
+<TGConnectingPoint num="26" id="1167" />
+<TGConnectingPoint num="27" id="1168" />
+<TGConnectingPoint num="28" id="1169" />
+<TGConnectingPoint num="29" id="1170" />
+<TGConnectingPoint num="30" id="1171" />
+<TGConnectingPoint num="31" id="1172" />
+<TGConnectingPoint num="32" id="1173" />
+<TGConnectingPoint num="33" id="1174" />
+<TGConnectingPoint num="34" id="1175" />
+<TGConnectingPoint num="35" id="1176" />
+<TGConnectingPoint num="36" id="1177" />
+<TGConnectingPoint num="37" id="1178" />
+<TGConnectingPoint num="38" id="1179" />
+<TGConnectingPoint num="39" id="1180" />
<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)" />
@@ -2955,42 +2707,42 @@
</AVATARBlockDiagramPanel>
<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" >
+<COMPONENT type="5100" id="1224" 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" />
<new d="false" />
-<TGConnectingPoint num="0" id="1342" />
+<TGConnectingPoint num="0" id="1223" />
</COMPONENT>
</AVATARStateMachineDiagramPanel>
-<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" />
+<AVATARStateMachineDiagramPanel name="T2" minX="10" maxX="2500" minY="10" maxY="1500" zoom="1.0" >
+<CONNECTOR type="5102" id="1231" index="0" uid="edc55b0e-f500-4ae5-9b56-7a366a01b624" >
+<cdparam x="395" y="469" />
<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" />
+<TGConnectingPoint num="0" id="1230" />
+<P1 x="407" y="464" id="1286" />
+<P2 x="407" y="496" id="1267" />
<AutomaticDrawing data="true" />
<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" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1229" index="13" uid="9bada02f-ec5d-408b-af44-53d0a89198f0" >
+<father id="1231" num="0" />
+<cdparam x="396" y="482" />
+<sizeparam width="10" height="25" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
<new d="false" />
-<TGConnectingPoint num="0" id="1344" />
-<TGConnectingPoint num="1" id="1345" />
-<TGConnectingPoint num="2" id="1346" />
-<TGConnectingPoint num="3" id="1347" />
+<TGConnectingPoint num="0" id="1225" />
+<TGConnectingPoint num="1" id="1226" />
+<TGConnectingPoint num="2" id="1227" />
+<TGConnectingPoint num="3" id="1228" />
<extraparam>
<guard value="[ ]" enabled="true"/>
<afterMin value="" enabled="true"/>
@@ -3004,28 +2756,28 @@
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="1357" index="1" uid="a444de41-918b-4483-bb92-d487ccb52c85" >
-<cdparam x="400" y="140" />
+<CONNECTOR type="5102" id="1238" index="1" uid="e64f71d6-01b6-4924-84a5-ddfe2f705bf8" >
+<cdparam x="394" y="393" />
<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" />
+<TGConnectingPoint num="0" id="1237" />
+<P1 x="407" y="375" id="1359" />
+<P2 x="407" y="414" id="1281" />
<AutomaticDrawing data="true" />
<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" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1236" index="14" uid="c94c80e6-67f5-4e10-84de-27e982e75bf3" >
+<father id="1238" num="0" />
+<cdparam x="418" y="384" />
+<sizeparam width="150" height="25" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
<new d="false" />
-<TGConnectingPoint num="0" id="1351" />
-<TGConnectingPoint num="1" id="1352" />
-<TGConnectingPoint num="2" id="1353" />
-<TGConnectingPoint num="3" id="1354" />
+<TGConnectingPoint num="0" id="1232" />
+<TGConnectingPoint num="1" id="1233" />
+<TGConnectingPoint num="2" id="1234" />
+<TGConnectingPoint num="3" id="1235" />
<extraparam>
<guard value="[ ]" enabled="true"/>
<afterMin value="" enabled="true"/>
@@ -3036,31 +2788,32 @@
<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="1364" index="2" uid="0c933618-60ab-421c-81f2-f3bf291f51f3" >
-<cdparam x="400" y="440" />
+<CONNECTOR type="5102" id="1245" index="2" uid="47607c76-cf2e-4f89-8503-79bf5282b993" >
+<cdparam x="402" y="302" />
<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" />
+<TGConnectingPoint num="0" id="1244" />
+<P1 x="407" y="283" id="1432" />
+<P2 x="407" y="325" id="1354" />
<AutomaticDrawing data="true" />
<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" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1243" index="15" uid="4855ec11-3969-447f-a2c0-dc5cf4895675" >
+<father id="1245" num="0" />
+<cdparam x="414" y="290" />
+<sizeparam width="139" height="25" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
<new d="false" />
-<TGConnectingPoint num="0" id="1358" />
-<TGConnectingPoint num="1" id="1359" />
-<TGConnectingPoint num="2" id="1360" />
-<TGConnectingPoint num="3" id="1361" />
+<TGConnectingPoint num="0" id="1239" />
+<TGConnectingPoint num="1" id="1240" />
+<TGConnectingPoint num="2" id="1241" />
+<TGConnectingPoint num="3" id="1242" />
<extraparam>
<guard value="[ ]" enabled="true"/>
<afterMin value="" enabled="true"/>
@@ -3071,31 +2824,32 @@
<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="1371" index="3" uid="cdad3972-1c37-43a2-81ed-308b5c055d99" >
-<cdparam x="415" y="265" />
+<CONNECTOR type="5102" id="1252" index="3" uid="4f71ab0f-a3a4-45f7-9ad5-af71552000d5" >
+<cdparam x="409" y="219" />
<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" />
+<TGConnectingPoint num="0" id="1251" />
+<P1 x="407" y="206" id="1270" />
+<P2 x="407" y="233" id="1427" />
<AutomaticDrawing data="true" />
<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" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1250" index="16" uid="28e36de1-decd-4011-8627-42cd43330833" >
+<father id="1252" num="0" />
+<cdparam x="405" y="235" />
+<sizeparam width="10" height="25" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
<new d="false" />
-<TGConnectingPoint num="0" id="1365" />
-<TGConnectingPoint num="1" id="1366" />
-<TGConnectingPoint num="2" id="1367" />
-<TGConnectingPoint num="3" id="1368" />
+<TGConnectingPoint num="0" id="1246" />
+<TGConnectingPoint num="1" id="1247" />
+<TGConnectingPoint num="2" id="1248" />
+<TGConnectingPoint num="3" id="1249" />
<extraparam>
<guard value="[ ]" enabled="true"/>
<afterMin value="" enabled="true"/>
@@ -3109,28 +2863,63 @@
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="1378" index="4" uid="5c465d11-1f71-4a51-ab67-99d03bab40dc" >
-<cdparam x="400" y="340" />
+<CONNECTOR type="5102" id="1259" index="4" uid="eed44c30-c8cb-4486-bfba-2f7089925b47" >
+<cdparam x="405" y="155" />
<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" />
+<TGConnectingPoint num="0" id="1258" />
+<P1 x="407" y="144" id="1505" />
+<P2 x="407" y="176" id="1269" />
<AutomaticDrawing data="true" />
<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" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1257" index="17" uid="ce660052-6a00-4141-bfab-3c62705c6a88" >
+<father id="1259" num="0" />
+<cdparam x="407" y="172" />
+<sizeparam width="10" height="25" 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="List of all parameters of an Avatar SMD transition" value="" />
+<new d="false" />
+<TGConnectingPoint num="0" id="1253" />
+<TGConnectingPoint num="1" id="1254" />
+<TGConnectingPoint num="2" id="1255" />
+<TGConnectingPoint num="3" id="1256" />
+<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>
+
+<CONNECTOR type="5102" id="1266" index="5" uid="af1891b6-d8d0-4340-bf3b-bdfad4961575" >
+<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" />
+<TGConnectingPoint num="0" id="1265" />
+<P1 x="407" y="70" id="1572" />
+<P2 x="407" y="94" id="1500" />
+<AutomaticDrawing data="true" />
+<new d="false" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1264" index="18" uid="ce77428e-5f8d-4961-a651-df86aa584218" >
+<father id="1266" num="0" />
+<cdparam x="406" y="87" />
+<sizeparam width="10" height="25" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
<new d="false" />
-<TGConnectingPoint num="0" id="1372" />
-<TGConnectingPoint num="1" id="1373" />
-<TGConnectingPoint num="2" id="1374" />
-<TGConnectingPoint num="3" id="1375" />
+<TGConnectingPoint num="0" id="1260" />
+<TGConnectingPoint num="1" id="1261" />
+<TGConnectingPoint num="2" id="1262" />
+<TGConnectingPoint num="3" id="1263" />
<extraparam>
<guard value="[ ]" enabled="true"/>
<afterMin value="" enabled="true"/>
@@ -3141,328 +2930,411 @@
<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="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" />
+<COMPONENT type="5101" id="1268" index="6" uid="20ba76d9-e438-4116-a1e2-7cd2b772f28b" >
+<cdparam x="397" y="501" />
+<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" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="stop state" value="null" />
<new d="false" />
-<TGConnectingPoint num="0" id="1379" />
+<TGConnectingPoint num="0" id="1267" />
</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" />
+<COMPONENT type="5104" id="1279" index="7" uid="86bbe846-7a5e-4969-9fc1-0a889fcfe503" >
+<cdparam x="371" y="181" />
+<sizeparam width="73" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="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" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="Receive signal" value="chin(m2)" />
+<new d="false" />
+<TGConnectingPoint num="0" id="1269" />
+<TGConnectingPoint num="1" id="1270" />
+<TGConnectingPoint num="2" id="1271" />
+<TGConnectingPoint num="3" id="1272" />
+<TGConnectingPoint num="4" id="1273" />
+<TGConnectingPoint num="5" id="1274" />
+<TGConnectingPoint num="6" id="1275" />
+<TGConnectingPoint num="7" id="1276" />
+<TGConnectingPoint num="8" id="1277" />
+<TGConnectingPoint num="9" id="1278" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="1352" index="8" uid="e9303f09-a7a8-4000-ab27-b55943c6dbf4" >
+<cdparam x="308" y="414" />
+<sizeparam width="198" 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="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" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="state2" value="SecretDataReceived" />
+<new d="false" />
+<TGConnectingPoint num="0" id="1280" />
+<TGConnectingPoint num="1" id="1281" />
+<TGConnectingPoint num="2" id="1282" />
+<TGConnectingPoint num="3" id="1283" />
+<TGConnectingPoint num="4" id="1284" />
+<TGConnectingPoint num="5" id="1285" />
+<TGConnectingPoint num="6" id="1286" />
+<TGConnectingPoint num="7" id="1287" />
+<TGConnectingPoint num="8" id="1288" />
+<TGConnectingPoint num="9" id="1289" />
+<TGConnectingPoint num="10" id="1290" />
+<TGConnectingPoint num="11" id="1291" />
+<TGConnectingPoint num="12" id="1292" />
+<TGConnectingPoint num="13" id="1293" />
+<TGConnectingPoint num="14" id="1294" />
+<TGConnectingPoint num="15" id="1295" />
+<TGConnectingPoint num="16" id="1296" />
+<TGConnectingPoint num="17" id="1297" />
+<TGConnectingPoint num="18" id="1298" />
+<TGConnectingPoint num="19" id="1299" />
+<TGConnectingPoint num="20" id="1300" />
+<TGConnectingPoint num="21" id="1301" />
+<TGConnectingPoint num="22" id="1302" />
+<TGConnectingPoint num="23" id="1303" />
+<TGConnectingPoint num="24" id="1304" />
+<TGConnectingPoint num="25" id="1305" />
+<TGConnectingPoint num="26" id="1306" />
+<TGConnectingPoint num="27" id="1307" />
+<TGConnectingPoint num="28" id="1308" />
+<TGConnectingPoint num="29" id="1309" />
+<TGConnectingPoint num="30" id="1310" />
+<TGConnectingPoint num="31" id="1311" />
+<TGConnectingPoint num="32" id="1312" />
+<TGConnectingPoint num="33" id="1313" />
+<TGConnectingPoint num="34" id="1314" />
+<TGConnectingPoint num="35" id="1315" />
+<TGConnectingPoint num="36" id="1316" />
+<TGConnectingPoint num="37" id="1317" />
+<TGConnectingPoint num="38" id="1318" />
+<TGConnectingPoint num="39" id="1319" />
+<TGConnectingPoint num="40" id="1320" />
+<TGConnectingPoint num="41" id="1321" />
+<TGConnectingPoint num="42" id="1322" />
+<TGConnectingPoint num="43" id="1323" />
+<TGConnectingPoint num="44" id="1324" />
+<TGConnectingPoint num="45" id="1325" />
+<TGConnectingPoint num="46" id="1326" />
+<TGConnectingPoint num="47" id="1327" />
+<TGConnectingPoint num="48" id="1328" />
+<TGConnectingPoint num="49" id="1329" />
+<TGConnectingPoint num="50" id="1330" />
+<TGConnectingPoint num="51" id="1331" />
+<TGConnectingPoint num="52" id="1332" />
+<TGConnectingPoint num="53" id="1333" />
+<TGConnectingPoint num="54" id="1334" />
+<TGConnectingPoint num="55" id="1335" />
+<TGConnectingPoint num="56" id="1336" />
+<TGConnectingPoint num="57" id="1337" />
+<TGConnectingPoint num="58" id="1338" />
+<TGConnectingPoint num="59" id="1339" />
+<TGConnectingPoint num="60" id="1340" />
+<TGConnectingPoint num="61" id="1341" />
+<TGConnectingPoint num="62" id="1342" />
+<TGConnectingPoint num="63" id="1343" />
+<TGConnectingPoint num="64" id="1344" />
+<TGConnectingPoint num="65" id="1345" />
+<TGConnectingPoint num="66" id="1346" />
+<TGConnectingPoint num="67" id="1347" />
+<TGConnectingPoint num="68" id="1348" />
+<TGConnectingPoint num="69" id="1349" />
+<TGConnectingPoint num="70" id="1350" />
+<TGConnectingPoint num="71" id="1351" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5106" id="1425" index="9" uid="150a585c-334b-46d1-af20-10110426b07e" >
+<cdparam x="319" y="325" />
+<sizeparam width="176" 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="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" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="state1" value="messageDecrypted" />
+<new d="false" />
+<TGConnectingPoint num="0" id="1353" />
+<TGConnectingPoint num="1" id="1354" />
+<TGConnectingPoint num="2" id="1355" />
+<TGConnectingPoint num="3" id="1356" />
+<TGConnectingPoint num="4" id="1357" />
+<TGConnectingPoint num="5" id="1358" />
+<TGConnectingPoint num="6" id="1359" />
+<TGConnectingPoint num="7" id="1360" />
+<TGConnectingPoint num="8" id="1361" />
+<TGConnectingPoint num="9" id="1362" />
+<TGConnectingPoint num="10" id="1363" />
+<TGConnectingPoint num="11" id="1364" />
+<TGConnectingPoint num="12" id="1365" />
+<TGConnectingPoint num="13" id="1366" />
+<TGConnectingPoint num="14" id="1367" />
+<TGConnectingPoint num="15" id="1368" />
+<TGConnectingPoint num="16" id="1369" />
+<TGConnectingPoint num="17" id="1370" />
+<TGConnectingPoint num="18" id="1371" />
+<TGConnectingPoint num="19" id="1372" />
+<TGConnectingPoint num="20" id="1373" />
+<TGConnectingPoint num="21" id="1374" />
+<TGConnectingPoint num="22" id="1375" />
+<TGConnectingPoint num="23" id="1376" />
+<TGConnectingPoint num="24" id="1377" />
+<TGConnectingPoint num="25" id="1378" />
+<TGConnectingPoint num="26" id="1379" />
+<TGConnectingPoint num="27" id="1380" />
+<TGConnectingPoint num="28" id="1381" />
+<TGConnectingPoint num="29" id="1382" />
+<TGConnectingPoint num="30" id="1383" />
+<TGConnectingPoint num="31" id="1384" />
+<TGConnectingPoint num="32" id="1385" />
+<TGConnectingPoint num="33" id="1386" />
+<TGConnectingPoint num="34" id="1387" />
+<TGConnectingPoint num="35" id="1388" />
+<TGConnectingPoint num="36" id="1389" />
+<TGConnectingPoint num="37" id="1390" />
+<TGConnectingPoint num="38" id="1391" />
+<TGConnectingPoint num="39" id="1392" />
+<TGConnectingPoint num="40" id="1393" />
+<TGConnectingPoint num="41" id="1394" />
+<TGConnectingPoint num="42" id="1395" />
+<TGConnectingPoint num="43" id="1396" />
+<TGConnectingPoint num="44" id="1397" />
+<TGConnectingPoint num="45" id="1398" />
+<TGConnectingPoint num="46" id="1399" />
+<TGConnectingPoint num="47" id="1400" />
+<TGConnectingPoint num="48" id="1401" />
+<TGConnectingPoint num="49" id="1402" />
+<TGConnectingPoint num="50" id="1403" />
+<TGConnectingPoint num="51" id="1404" />
+<TGConnectingPoint num="52" id="1405" />
+<TGConnectingPoint num="53" id="1406" />
+<TGConnectingPoint num="54" id="1407" />
+<TGConnectingPoint num="55" id="1408" />
+<TGConnectingPoint num="56" id="1409" />
+<TGConnectingPoint num="57" id="1410" />
+<TGConnectingPoint num="58" id="1411" />
+<TGConnectingPoint num="59" id="1412" />
+<TGConnectingPoint num="60" id="1413" />
+<TGConnectingPoint num="61" id="1414" />
+<TGConnectingPoint num="62" id="1415" />
+<TGConnectingPoint num="63" id="1416" />
+<TGConnectingPoint num="64" id="1417" />
+<TGConnectingPoint num="65" id="1418" />
+<TGConnectingPoint num="66" id="1419" />
+<TGConnectingPoint num="67" id="1420" />
+<TGConnectingPoint num="68" id="1421" />
+<TGConnectingPoint num="69" id="1422" />
+<TGConnectingPoint num="70" id="1423" />
+<TGConnectingPoint num="71" id="1424" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5106" id="1498" index="10" uid="4d4e46c4-bb01-4735-acbe-9465e10e672e" >
+<cdparam x="319" y="233" />
+<sizeparam width="176" 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="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" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="state0" value="messageDecrypt" />
+<new d="false" />
+<TGConnectingPoint num="0" id="1426" />
+<TGConnectingPoint num="1" id="1427" />
+<TGConnectingPoint num="2" id="1428" />
+<TGConnectingPoint num="3" id="1429" />
+<TGConnectingPoint num="4" id="1430" />
+<TGConnectingPoint num="5" id="1431" />
+<TGConnectingPoint num="6" id="1432" />
+<TGConnectingPoint num="7" id="1433" />
+<TGConnectingPoint num="8" id="1434" />
+<TGConnectingPoint num="9" id="1435" />
+<TGConnectingPoint num="10" id="1436" />
+<TGConnectingPoint num="11" id="1437" />
+<TGConnectingPoint num="12" id="1438" />
+<TGConnectingPoint num="13" id="1439" />
+<TGConnectingPoint num="14" id="1440" />
+<TGConnectingPoint num="15" id="1441" />
+<TGConnectingPoint num="16" id="1442" />
+<TGConnectingPoint num="17" id="1443" />
+<TGConnectingPoint num="18" id="1444" />
+<TGConnectingPoint num="19" id="1445" />
+<TGConnectingPoint num="20" id="1446" />
+<TGConnectingPoint num="21" id="1447" />
+<TGConnectingPoint num="22" id="1448" />
+<TGConnectingPoint num="23" id="1449" />
+<TGConnectingPoint num="24" id="1450" />
+<TGConnectingPoint num="25" id="1451" />
+<TGConnectingPoint num="26" id="1452" />
+<TGConnectingPoint num="27" id="1453" />
+<TGConnectingPoint num="28" id="1454" />
+<TGConnectingPoint num="29" id="1455" />
+<TGConnectingPoint num="30" id="1456" />
+<TGConnectingPoint num="31" id="1457" />
+<TGConnectingPoint num="32" id="1458" />
+<TGConnectingPoint num="33" id="1459" />
+<TGConnectingPoint num="34" id="1460" />
+<TGConnectingPoint num="35" id="1461" />
+<TGConnectingPoint num="36" id="1462" />
+<TGConnectingPoint num="37" id="1463" />
+<TGConnectingPoint num="38" id="1464" />
+<TGConnectingPoint num="39" id="1465" />
+<TGConnectingPoint num="40" id="1466" />
+<TGConnectingPoint num="41" id="1467" />
+<TGConnectingPoint num="42" id="1468" />
+<TGConnectingPoint num="43" id="1469" />
+<TGConnectingPoint num="44" id="1470" />
+<TGConnectingPoint num="45" id="1471" />
+<TGConnectingPoint num="46" id="1472" />
+<TGConnectingPoint num="47" id="1473" />
+<TGConnectingPoint num="48" id="1474" />
+<TGConnectingPoint num="49" id="1475" />
+<TGConnectingPoint num="50" id="1476" />
+<TGConnectingPoint num="51" id="1477" />
+<TGConnectingPoint num="52" id="1478" />
+<TGConnectingPoint num="53" id="1479" />
+<TGConnectingPoint num="54" id="1480" />
+<TGConnectingPoint num="55" id="1481" />
+<TGConnectingPoint num="56" id="1482" />
+<TGConnectingPoint num="57" id="1483" />
+<TGConnectingPoint num="58" id="1484" />
+<TGConnectingPoint num="59" id="1485" />
+<TGConnectingPoint num="60" id="1486" />
+<TGConnectingPoint num="61" id="1487" />
+<TGConnectingPoint num="62" id="1488" />
+<TGConnectingPoint num="63" id="1489" />
+<TGConnectingPoint num="64" id="1490" />
+<TGConnectingPoint num="65" id="1491" />
+<TGConnectingPoint num="66" id="1492" />
+<TGConnectingPoint num="67" id="1493" />
+<TGConnectingPoint num="68" id="1494" />
+<TGConnectingPoint num="69" id="1495" />
+<TGConnectingPoint num="70" id="1496" />
+<TGConnectingPoint num="71" id="1497" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5106" id="1571" index="11" uid="3aa2ea31-6fdb-4b90-af14-8397fa04f75e" >
+<cdparam x="314" y="94" />
+<sizeparam width="187" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<enabled value="true" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="state" value="waitingForMessage" />
+<new d="false" />
+<TGConnectingPoint num="0" id="1499" />
+<TGConnectingPoint num="1" id="1500" />
+<TGConnectingPoint num="2" id="1501" />
+<TGConnectingPoint num="3" id="1502" />
+<TGConnectingPoint num="4" id="1503" />
+<TGConnectingPoint num="5" id="1504" />
+<TGConnectingPoint num="6" id="1505" />
+<TGConnectingPoint num="7" id="1506" />
+<TGConnectingPoint num="8" id="1507" />
+<TGConnectingPoint num="9" id="1508" />
+<TGConnectingPoint num="10" id="1509" />
+<TGConnectingPoint num="11" id="1510" />
+<TGConnectingPoint num="12" id="1511" />
+<TGConnectingPoint num="13" id="1512" />
+<TGConnectingPoint num="14" id="1513" />
+<TGConnectingPoint num="15" id="1514" />
+<TGConnectingPoint num="16" id="1515" />
+<TGConnectingPoint num="17" id="1516" />
+<TGConnectingPoint num="18" id="1517" />
+<TGConnectingPoint num="19" id="1518" />
+<TGConnectingPoint num="20" id="1519" />
+<TGConnectingPoint num="21" id="1520" />
+<TGConnectingPoint num="22" id="1521" />
+<TGConnectingPoint num="23" id="1522" />
+<TGConnectingPoint num="24" id="1523" />
+<TGConnectingPoint num="25" id="1524" />
+<TGConnectingPoint num="26" id="1525" />
+<TGConnectingPoint num="27" id="1526" />
+<TGConnectingPoint num="28" id="1527" />
+<TGConnectingPoint num="29" id="1528" />
+<TGConnectingPoint num="30" id="1529" />
+<TGConnectingPoint num="31" id="1530" />
+<TGConnectingPoint num="32" id="1531" />
+<TGConnectingPoint num="33" id="1532" />
+<TGConnectingPoint num="34" id="1533" />
+<TGConnectingPoint num="35" id="1534" />
+<TGConnectingPoint num="36" id="1535" />
+<TGConnectingPoint num="37" id="1536" />
+<TGConnectingPoint num="38" id="1537" />
+<TGConnectingPoint num="39" id="1538" />
+<TGConnectingPoint num="40" id="1539" />
+<TGConnectingPoint num="41" id="1540" />
+<TGConnectingPoint num="42" id="1541" />
+<TGConnectingPoint num="43" id="1542" />
+<TGConnectingPoint num="44" id="1543" />
+<TGConnectingPoint num="45" id="1544" />
+<TGConnectingPoint num="46" id="1545" />
+<TGConnectingPoint num="47" id="1546" />
+<TGConnectingPoint num="48" id="1547" />
+<TGConnectingPoint num="49" id="1548" />
+<TGConnectingPoint num="50" id="1549" />
+<TGConnectingPoint num="51" id="1550" />
+<TGConnectingPoint num="52" id="1551" />
+<TGConnectingPoint num="53" id="1552" />
+<TGConnectingPoint num="54" id="1553" />
+<TGConnectingPoint num="55" id="1554" />
+<TGConnectingPoint num="56" id="1555" />
+<TGConnectingPoint num="57" id="1556" />
+<TGConnectingPoint num="58" id="1557" />
+<TGConnectingPoint num="59" id="1558" />
+<TGConnectingPoint num="60" id="1559" />
+<TGConnectingPoint num="61" id="1560" />
+<TGConnectingPoint num="62" id="1561" />
+<TGConnectingPoint num="63" id="1562" />
+<TGConnectingPoint num="64" id="1563" />
+<TGConnectingPoint num="65" id="1564" />
+<TGConnectingPoint num="66" id="1565" />
+<TGConnectingPoint num="67" id="1566" />
+<TGConnectingPoint num="68" id="1567" />
+<TGConnectingPoint num="69" id="1568" />
+<TGConnectingPoint num="70" id="1569" />
+<TGConnectingPoint num="71" id="1570" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5100" id="1573" index="12" uid="f575d4ce-8f5a-4412-8719-8c43d635e0aa" >
+<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="2500" minY="10" maxY="1500" />
<infoparam name="start state" value="null" />
<new d="false" />
-<TGConnectingPoint num="0" id="1611" />
+<TGConnectingPoint num="0" id="1572" />
</COMPONENT>
</AVATARStateMachineDiagramPanel>
-<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" />
+<AVATARStateMachineDiagramPanel name="T1" minX="10" maxX="2500" minY="10" maxY="1500" zoom="1.0" >
+<CONNECTOR type="5102" id="1580" index="0" uid="ce94cfa7-aef2-468f-9fd0-1b4dfaf7b8a7" >
+<cdparam x="415" y="424" />
<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="1618" />
-<P1 x="400" y="140" id="1727" />
-<P2 x="614" y="240" id="1655" />
+<TGConnectingPoint num="0" id="1579" />
+<P1 x="407" y="395" id="1628" />
+<P2 x="407" y="427" id="1609" />
<AutomaticDrawing data="true" />
<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" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1578" index="11" uid="94671695-0076-490d-b899-f09376230b97" >
+<father id="1580" num="0" />
+<cdparam x="417" y="439" />
+<sizeparam width="10" height="25" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
<new d="false" />
-<TGConnectingPoint num="0" id="1613" />
-<TGConnectingPoint num="1" id="1614" />
-<TGConnectingPoint num="2" id="1615" />
-<TGConnectingPoint num="3" id="1616" />
+<TGConnectingPoint num="0" id="1574" />
+<TGConnectingPoint num="1" id="1575" />
+<TGConnectingPoint num="2" id="1576" />
+<TGConnectingPoint num="3" id="1577" />
<extraparam>
<guard value="[ ]" enabled="true"/>
<afterMin value="" enabled="true"/>
@@ -3473,32 +3345,31 @@
<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="1626" index="1" uid="2e61c8bc-771a-4afa-883c-1aac7412efe4" >
-<cdparam x="400" y="240" />
+<CONNECTOR type="5102" id="1587" index="1" uid="09aa030f-da9c-4ca9-934a-f8e4dddab812" >
+<cdparam x="391" y="347" />
<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="1625" />
-<P1 x="400" y="240" id="1654" />
-<P2 x="415" y="335" id="1643" />
+<TGConnectingPoint num="0" id="1586" />
+<P1 x="407" y="316" id="1612" />
+<P2 x="407" y="345" id="1623" />
<AutomaticDrawing data="true" />
<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" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1585" index="12" uid="5ebef96c-c283-4a83-8ab4-b9f768bdc69a" >
+<father id="1587" num="0" />
+<cdparam x="403" y="360" />
+<sizeparam width="10" height="25" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
<new d="false" />
-<TGConnectingPoint num="0" id="1620" />
-<TGConnectingPoint num="1" id="1621" />
-<TGConnectingPoint num="2" id="1622" />
-<TGConnectingPoint num="3" id="1623" />
+<TGConnectingPoint num="0" id="1581" />
+<TGConnectingPoint num="1" id="1582" />
+<TGConnectingPoint num="2" id="1583" />
+<TGConnectingPoint num="3" id="1584" />
<extraparam>
<guard value="[ ]" enabled="true"/>
<afterMin value="" enabled="true"/>
@@ -3512,28 +3383,28 @@
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="1633" index="2" uid="ae7b6eab-db51-44de-90c6-bed005fbd336" >
-<cdparam x="415" y="365" />
+<CONNECTOR type="5102" id="1594" index="2" uid="b0773c14-d673-48ec-8a0d-368a914d7659" >
+<cdparam x="402" y="259" />
<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" />
+<TGConnectingPoint num="0" id="1593" />
+<P1 x="407" y="251" id="1701" />
+<P2 x="407" y="286" id="1611" />
<AutomaticDrawing data="true" />
<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" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1592" index="13" uid="431fe931-d360-4d82-a961-bb06def46164" >
+<father id="1594" num="0" />
+<cdparam x="396" y="288" />
+<sizeparam width="10" height="25" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
<new d="false" />
-<TGConnectingPoint num="0" id="1627" />
-<TGConnectingPoint num="1" id="1628" />
-<TGConnectingPoint num="2" id="1629" />
-<TGConnectingPoint num="3" id="1630" />
+<TGConnectingPoint num="0" id="1588" />
+<TGConnectingPoint num="1" id="1589" />
+<TGConnectingPoint num="2" id="1590" />
+<TGConnectingPoint num="3" id="1591" />
<extraparam>
<guard value="[ ]" enabled="true"/>
<afterMin value="" enabled="true"/>
@@ -3547,28 +3418,65 @@
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="1640" index="3" uid="6b2834ee-e8d2-482c-8aa2-57eb340a4499" >
-<cdparam x="407" y="60" />
+<CONNECTOR type="5102" id="1601" index="3" uid="629a469f-b822-4d82-ad31-fe215694f348" >
+<cdparam x="408" y="157" />
<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" />
+<TGConnectingPoint num="0" id="1600" />
+<P1 x="407" y="146" id="1774" />
+<P2 x="407" y="201" id="1696" />
<AutomaticDrawing data="true" />
<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" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1599" index="14" uid="e83d5fa5-f48e-4fa7-9c57-41477f5d6bf1" >
+<father id="1601" num="0" />
+<cdparam x="423" y="157" />
+<sizeparam width="137" height="32" 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="List of all parameters of an Avatar SMD transition" value="" />
+<new d="false" />
+<TGConnectingPoint num="0" id="1595" />
+<TGConnectingPoint num="1" id="1596" />
+<TGConnectingPoint num="2" id="1597" />
+<TGConnectingPoint num="3" id="1598" />
+<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"/>
+<actions value="m.data = secretData" enabled="true"/>
+<actions value="m1=sencrypt(m, sk)" enabled="true"/>
+</extraparam>
+</SUBCOMPONENT>
+
+<CONNECTOR type="5102" id="1608" index="4" uid="51cfa3c1-b4b3-4f8a-a39e-2ae83a70822c" >
+<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" />
+<TGConnectingPoint num="0" id="1607" />
+<P1 x="407" y="70" id="1841" />
+<P2 x="407" y="96" id="1769" />
+<AutomaticDrawing data="true" />
+<new d="false" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1606" index="15" uid="964e1d86-bec0-4756-93d0-846d9f391f38" >
+<father id="1608" num="0" />
+<cdparam x="407" y="88" />
+<sizeparam width="10" height="25" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
<new d="false" />
-<TGConnectingPoint num="0" id="1634" />
-<TGConnectingPoint num="1" id="1635" />
-<TGConnectingPoint num="2" id="1636" />
-<TGConnectingPoint num="3" id="1637" />
+<TGConnectingPoint num="0" id="1602" />
+<TGConnectingPoint num="1" id="1603" />
+<TGConnectingPoint num="2" id="1604" />
+<TGConnectingPoint num="3" id="1605" />
<extraparam>
<guard value="[ ]" enabled="true"/>
<afterMin value="" enabled="true"/>
@@ -3582,240 +3490,296 @@
</extraparam>
</SUBCOMPONENT>
-<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" />
+<COMPONENT type="5101" id="1610" index="5" uid="f2d509bb-6c90-4fe9-8998-a1f3ee464692" >
+<cdparam x="397" y="432" />
+<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" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="stop state" value="null" />
<new d="false" />
-<TGConnectingPoint num="0" id="1641" />
+<TGConnectingPoint num="0" id="1609" />
</COMPONENT>
-<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" />
+<COMPONENT type="5103" id="1621" index="6" uid="513b9c1b-68e3-45fa-a7c1-e7c652f2d4dc" >
+<cdparam x="370" y="291" />
+<sizeparam width="75" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="Send signal" value="comm(Cipherdata_encrypted)" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="Send signal" value="chout(m1)" />
<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" />
+<TGConnectingPoint num="0" id="1611" />
+<TGConnectingPoint num="1" id="1612" />
+<TGConnectingPoint num="2" id="1613" />
+<TGConnectingPoint num="3" id="1614" />
+<TGConnectingPoint num="4" id="1615" />
+<TGConnectingPoint num="5" id="1616" />
+<TGConnectingPoint num="6" id="1617" />
+<TGConnectingPoint num="7" id="1618" />
+<TGConnectingPoint num="8" id="1619" />
+<TGConnectingPoint num="9" id="1620" />
</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" />
+<COMPONENT type="5106" id="1694" index="7" uid="defb63c1-a401-4179-9076-9386467ff3d2" >
+<cdparam x="341" y="345" />
+<sizeparam width="132" 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="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" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="state1" value="beforeFinish" />
+<new d="false" />
+<TGConnectingPoint num="0" id="1622" />
+<TGConnectingPoint num="1" id="1623" />
+<TGConnectingPoint num="2" id="1624" />
+<TGConnectingPoint num="3" id="1625" />
+<TGConnectingPoint num="4" id="1626" />
+<TGConnectingPoint num="5" id="1627" />
+<TGConnectingPoint num="6" id="1628" />
+<TGConnectingPoint num="7" id="1629" />
+<TGConnectingPoint num="8" id="1630" />
+<TGConnectingPoint num="9" id="1631" />
+<TGConnectingPoint num="10" id="1632" />
+<TGConnectingPoint num="11" id="1633" />
+<TGConnectingPoint num="12" id="1634" />
+<TGConnectingPoint num="13" id="1635" />
+<TGConnectingPoint num="14" id="1636" />
+<TGConnectingPoint num="15" id="1637" />
+<TGConnectingPoint num="16" id="1638" />
+<TGConnectingPoint num="17" id="1639" />
+<TGConnectingPoint num="18" id="1640" />
+<TGConnectingPoint num="19" id="1641" />
+<TGConnectingPoint num="20" id="1642" />
+<TGConnectingPoint num="21" id="1643" />
+<TGConnectingPoint num="22" id="1644" />
+<TGConnectingPoint num="23" id="1645" />
+<TGConnectingPoint num="24" id="1646" />
+<TGConnectingPoint num="25" id="1647" />
+<TGConnectingPoint num="26" id="1648" />
+<TGConnectingPoint num="27" id="1649" />
+<TGConnectingPoint num="28" id="1650" />
+<TGConnectingPoint num="29" id="1651" />
+<TGConnectingPoint num="30" id="1652" />
+<TGConnectingPoint num="31" id="1653" />
+<TGConnectingPoint num="32" id="1654" />
+<TGConnectingPoint num="33" id="1655" />
+<TGConnectingPoint num="34" id="1656" />
+<TGConnectingPoint num="35" id="1657" />
+<TGConnectingPoint num="36" id="1658" />
+<TGConnectingPoint num="37" id="1659" />
+<TGConnectingPoint num="38" id="1660" />
+<TGConnectingPoint num="39" id="1661" />
+<TGConnectingPoint num="40" id="1662" />
+<TGConnectingPoint num="41" id="1663" />
+<TGConnectingPoint num="42" id="1664" />
+<TGConnectingPoint num="43" id="1665" />
+<TGConnectingPoint num="44" id="1666" />
+<TGConnectingPoint num="45" id="1667" />
+<TGConnectingPoint num="46" id="1668" />
+<TGConnectingPoint num="47" id="1669" />
+<TGConnectingPoint num="48" id="1670" />
+<TGConnectingPoint num="49" id="1671" />
+<TGConnectingPoint num="50" id="1672" />
+<TGConnectingPoint num="51" id="1673" />
+<TGConnectingPoint num="52" id="1674" />
+<TGConnectingPoint num="53" id="1675" />
+<TGConnectingPoint num="54" id="1676" />
+<TGConnectingPoint num="55" id="1677" />
+<TGConnectingPoint num="56" id="1678" />
+<TGConnectingPoint num="57" id="1679" />
+<TGConnectingPoint num="58" id="1680" />
+<TGConnectingPoint num="59" id="1681" />
+<TGConnectingPoint num="60" id="1682" />
+<TGConnectingPoint num="61" id="1683" />
+<TGConnectingPoint num="62" id="1684" />
+<TGConnectingPoint num="63" id="1685" />
+<TGConnectingPoint num="64" id="1686" />
+<TGConnectingPoint num="65" id="1687" />
+<TGConnectingPoint num="66" id="1688" />
+<TGConnectingPoint num="67" id="1689" />
+<TGConnectingPoint num="68" id="1690" />
+<TGConnectingPoint num="69" id="1691" />
+<TGConnectingPoint num="70" id="1692" />
+<TGConnectingPoint num="71" id="1693" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5106" id="1767" index="8" uid="e6fa3ceb-038a-48e0-b376-8177f0b14a21" >
+<cdparam x="330" y="201" />
+<sizeparam width="154" 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="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" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<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="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="state0" value="sendingMessage" />
+<new d="false" />
+<TGConnectingPoint num="0" id="1695" />
+<TGConnectingPoint num="1" id="1696" />
+<TGConnectingPoint num="2" id="1697" />
+<TGConnectingPoint num="3" id="1698" />
+<TGConnectingPoint num="4" id="1699" />
+<TGConnectingPoint num="5" id="1700" />
+<TGConnectingPoint num="6" id="1701" />
+<TGConnectingPoint num="7" id="1702" />
+<TGConnectingPoint num="8" id="1703" />
+<TGConnectingPoint num="9" id="1704" />
+<TGConnectingPoint num="10" id="1705" />
+<TGConnectingPoint num="11" id="1706" />
+<TGConnectingPoint num="12" id="1707" />
+<TGConnectingPoint num="13" id="1708" />
+<TGConnectingPoint num="14" id="1709" />
+<TGConnectingPoint num="15" id="1710" />
+<TGConnectingPoint num="16" id="1711" />
+<TGConnectingPoint num="17" id="1712" />
+<TGConnectingPoint num="18" id="1713" />
+<TGConnectingPoint num="19" id="1714" />
+<TGConnectingPoint num="20" id="1715" />
+<TGConnectingPoint num="21" id="1716" />
+<TGConnectingPoint num="22" id="1717" />
+<TGConnectingPoint num="23" id="1718" />
+<TGConnectingPoint num="24" id="1719" />
+<TGConnectingPoint num="25" id="1720" />
+<TGConnectingPoint num="26" id="1721" />
+<TGConnectingPoint num="27" id="1722" />
+<TGConnectingPoint num="28" id="1723" />
+<TGConnectingPoint num="29" id="1724" />
+<TGConnectingPoint num="30" id="1725" />
+<TGConnectingPoint num="31" id="1726" />
+<TGConnectingPoint num="32" id="1727" />
+<TGConnectingPoint num="33" id="1728" />
+<TGConnectingPoint num="34" id="1729" />
+<TGConnectingPoint num="35" id="1730" />
+<TGConnectingPoint num="36" id="1731" />
+<TGConnectingPoint num="37" id="1732" />
+<TGConnectingPoint num="38" id="1733" />
+<TGConnectingPoint num="39" id="1734" />
+<TGConnectingPoint num="40" id="1735" />
+<TGConnectingPoint num="41" id="1736" />
+<TGConnectingPoint num="42" id="1737" />
+<TGConnectingPoint num="43" id="1738" />
+<TGConnectingPoint num="44" id="1739" />
+<TGConnectingPoint num="45" id="1740" />
+<TGConnectingPoint num="46" id="1741" />
+<TGConnectingPoint num="47" id="1742" />
+<TGConnectingPoint num="48" id="1743" />
+<TGConnectingPoint num="49" id="1744" />
+<TGConnectingPoint num="50" id="1745" />
+<TGConnectingPoint num="51" id="1746" />
+<TGConnectingPoint num="52" id="1747" />
+<TGConnectingPoint num="53" id="1748" />
+<TGConnectingPoint num="54" id="1749" />
+<TGConnectingPoint num="55" id="1750" />
+<TGConnectingPoint num="56" id="1751" />
+<TGConnectingPoint num="57" id="1752" />
+<TGConnectingPoint num="58" id="1753" />
+<TGConnectingPoint num="59" id="1754" />
+<TGConnectingPoint num="60" id="1755" />
+<TGConnectingPoint num="61" id="1756" />
+<TGConnectingPoint num="62" id="1757" />
+<TGConnectingPoint num="63" id="1758" />
+<TGConnectingPoint num="64" id="1759" />
+<TGConnectingPoint num="65" id="1760" />
+<TGConnectingPoint num="66" id="1761" />
+<TGConnectingPoint num="67" id="1762" />
+<TGConnectingPoint num="68" id="1763" />
+<TGConnectingPoint num="69" id="1764" />
+<TGConnectingPoint num="70" id="1765" />
+<TGConnectingPoint num="71" id="1766" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5106" id="1840" index="9" uid="8f8dc2f5-b479-4d41-ae02-0324cb91d22e" >
+<cdparam x="336" y="96" />
+<sizeparam width="143" height="50" minWidth="40" minHeight="30" 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="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" >
+<infoparam name="state" value="makingMessage" />
+<new d="false" />
+<TGConnectingPoint num="0" id="1768" />
+<TGConnectingPoint num="1" id="1769" />
+<TGConnectingPoint num="2" id="1770" />
+<TGConnectingPoint num="3" id="1771" />
+<TGConnectingPoint num="4" id="1772" />
+<TGConnectingPoint num="5" id="1773" />
+<TGConnectingPoint num="6" id="1774" />
+<TGConnectingPoint num="7" id="1775" />
+<TGConnectingPoint num="8" id="1776" />
+<TGConnectingPoint num="9" id="1777" />
+<TGConnectingPoint num="10" id="1778" />
+<TGConnectingPoint num="11" id="1779" />
+<TGConnectingPoint num="12" id="1780" />
+<TGConnectingPoint num="13" id="1781" />
+<TGConnectingPoint num="14" id="1782" />
+<TGConnectingPoint num="15" id="1783" />
+<TGConnectingPoint num="16" id="1784" />
+<TGConnectingPoint num="17" id="1785" />
+<TGConnectingPoint num="18" id="1786" />
+<TGConnectingPoint num="19" id="1787" />
+<TGConnectingPoint num="20" id="1788" />
+<TGConnectingPoint num="21" id="1789" />
+<TGConnectingPoint num="22" id="1790" />
+<TGConnectingPoint num="23" id="1791" />
+<TGConnectingPoint num="24" id="1792" />
+<TGConnectingPoint num="25" id="1793" />
+<TGConnectingPoint num="26" id="1794" />
+<TGConnectingPoint num="27" id="1795" />
+<TGConnectingPoint num="28" id="1796" />
+<TGConnectingPoint num="29" id="1797" />
+<TGConnectingPoint num="30" id="1798" />
+<TGConnectingPoint num="31" id="1799" />
+<TGConnectingPoint num="32" id="1800" />
+<TGConnectingPoint num="33" id="1801" />
+<TGConnectingPoint num="34" id="1802" />
+<TGConnectingPoint num="35" id="1803" />
+<TGConnectingPoint num="36" id="1804" />
+<TGConnectingPoint num="37" id="1805" />
+<TGConnectingPoint num="38" id="1806" />
+<TGConnectingPoint num="39" id="1807" />
+<TGConnectingPoint num="40" id="1808" />
+<TGConnectingPoint num="41" id="1809" />
+<TGConnectingPoint num="42" id="1810" />
+<TGConnectingPoint num="43" id="1811" />
+<TGConnectingPoint num="44" id="1812" />
+<TGConnectingPoint num="45" id="1813" />
+<TGConnectingPoint num="46" id="1814" />
+<TGConnectingPoint num="47" id="1815" />
+<TGConnectingPoint num="48" id="1816" />
+<TGConnectingPoint num="49" id="1817" />
+<TGConnectingPoint num="50" id="1818" />
+<TGConnectingPoint num="51" id="1819" />
+<TGConnectingPoint num="52" id="1820" />
+<TGConnectingPoint num="53" id="1821" />
+<TGConnectingPoint num="54" id="1822" />
+<TGConnectingPoint num="55" id="1823" />
+<TGConnectingPoint num="56" id="1824" />
+<TGConnectingPoint num="57" id="1825" />
+<TGConnectingPoint num="58" id="1826" />
+<TGConnectingPoint num="59" id="1827" />
+<TGConnectingPoint num="60" id="1828" />
+<TGConnectingPoint num="61" id="1829" />
+<TGConnectingPoint num="62" id="1830" />
+<TGConnectingPoint num="63" id="1831" />
+<TGConnectingPoint num="64" id="1832" />
+<TGConnectingPoint num="65" id="1833" />
+<TGConnectingPoint num="66" id="1834" />
+<TGConnectingPoint num="67" id="1835" />
+<TGConnectingPoint num="68" id="1836" />
+<TGConnectingPoint num="69" id="1837" />
+<TGConnectingPoint num="70" id="1838" />
+<TGConnectingPoint num="71" id="1839" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5100" id="1842" index="10" uid="713f519e-f87f-489a-834c-8ddc7359e97a" >
<cdparam x="400" y="50" />
-<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="start state" value="null" />
<new d="false" />
-<TGConnectingPoint num="0" id="1804" />
+<TGConnectingPoint num="0" id="1841" />
</COMPONENT>
diff --git a/simulators/c++2/src_simulator/ServerHelpData.h b/simulators/c++2/src_simulator/ServerHelpData.h
index a3f5d5b37a11733252a3de17ea9ee9a1c5765387..96e2a8e070ab75b48f34d6a660aac9bf6eeaf53f 100644
--- a/simulators/c++2/src_simulator/ServerHelpData.h
+++ b/simulators/c++2/src_simulator/ServerHelpData.h
@@ -15,7 +15,7 @@
ul.task-list{list-style: none;} \n\
.display.math{display: block; text-align: center; margin: 0.5rem auto;} \n\
</style> \n\
- <link rel=\"stylesheet\" href=\"/Users/ludovicapvrille/TTool/src/main/resources/help/help.css\" /> \n\
+ <link rel=\"stylesheet\" href=\"help.css\" /> \n\
<!--[if lt IE 9]> \n\
<script src=\"//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv-printshiv.min.js\"></script> \n\
<![endif]--> \n\
diff --git a/src/main/java/tmltranslator/TMLModeling.java b/src/main/java/tmltranslator/TMLModeling.java
index 4156c819c3c3a113c9edfc14bde80954f3863688..5f1ee08f75ff1b852e990c9eac1a5741954a1c86 100755
--- a/src/main/java/tmltranslator/TMLModeling.java
+++ b/src/main/java/tmltranslator/TMLModeling.java
@@ -823,14 +823,16 @@ public class TMLModeling<E> {
invalidate = true;
}
for (TMLPortWithSecurityInformation port : channel.ports) {
- if (port.getCheckConf() && !invalidate) {
- port.setConfStatus(r);
+ if (port.getCheckConf()) {
port.setMappingName(mappingName);
- //Add Result Trace also
- ProVerifResultTrace trace = pvoa.getResults().get(pragma).getTrace();
- if (trace != null && port.isOrigin()) {
- port.setResultTrace(trace);
- port.setPragmaString(pragma.toString());
+ if (!invalidate) {
+ port.setConfStatus(r);
+ //Add Result Trace also
+ ProVerifResultTrace trace = pvoa.getResults().get(pragma).getTrace();
+ if (trace != null && port.isOrigin()) {
+ port.setResultTrace(trace);
+ port.setPragmaString(pragma.toString());
+ }
}
}
}
diff --git a/src/main/java/ui/tmlad/TMLADReadCAMS.java b/src/main/java/ui/tmlad/TMLADReadCAMS.java
index 74c16929a29c68354ab44c1d317ebb009b518a33..7beb88b006c3f3c4c53b5581271126bf48e0f604 100755
--- a/src/main/java/ui/tmlad/TMLADReadCAMS.java
+++ b/src/main/java/ui/tmlad/TMLADReadCAMS.java
@@ -323,13 +323,14 @@ public class TMLADReadCAMS extends TADComponentWithoutSubcomponents/* Issue #69
tab2.labels=labels;
tab2.values = values;
tab2.help = help;
+ tab2.helpButtom = new String[]{null, "cryptographicconfiguration.html", "cryptographicconfiguration.html"};
List<TabInfo> tabs = new ArrayList<>();
tabs.add(tab1);
tabs.add(tab2);
//JDialogTwoString jdts = new JDialogTwoString(frame, "Setting channel's properties", "Channel name", channelName, "Nb of samples", nbOfSamples);
- JDialogMultiStringAndTabs jdmsat = new JDialogMultiStringAndTabs(frame, "Write in channel", tabs);
+ JDialogMultiStringAndTabs jdmsat = new JDialogMultiStringAndTabs(tdp.getMGUI(), frame, "Read from channel", tabs);
//jdms.setSize(600, 300);
GraphicLib.centerOnParent(jdmsat, 600, 300);
jdmsat.setVisible(true); // blocked until dialog has been closed
diff --git a/src/main/java/ui/tmlad/TMLADReadChannel.java b/src/main/java/ui/tmlad/TMLADReadChannel.java
index f65648e776096e2f01bee635668e51a02c6d6acc..7ab0272a2ec2894d318f87fbfaede91817bd3e0b 100755
--- a/src/main/java/ui/tmlad/TMLADReadChannel.java
+++ b/src/main/java/ui/tmlad/TMLADReadChannel.java
@@ -334,13 +334,14 @@ public class TMLADReadChannel extends TADComponentWithoutSubcomponents/* Issue #
tab2.labels=labels;
tab2.values = values;
tab2.help = help;
+ tab2.helpButtom = new String[]{null, "cryptographicconfiguration.html", "cryptographicconfiguration.html"};
List<TabInfo> tabs = new ArrayList<>();
tabs.add(tab1);
tabs.add(tab2);
//JDialogTwoString jdts = new JDialogTwoString(frame, "Setting channel's properties", "Channel name", channelName, "Nb of samples", nbOfSamples);
- JDialogMultiStringAndTabs jdmsat = new JDialogMultiStringAndTabs(frame, "Write in channel", tabs);
+ JDialogMultiStringAndTabs jdmsat = new JDialogMultiStringAndTabs(tdp.getMGUI(), frame, "Read from channel", tabs);
//jdms.setSize(600, 300);
GraphicLib.centerOnParent(jdmsat, 600, 300);
jdmsat.setVisible(true); // blocked until dialog has been closed
diff --git a/src/main/java/ui/tmlad/TMLADWriteCAMS.java b/src/main/java/ui/tmlad/TMLADWriteCAMS.java
index 4d6201e321e891d7eadad6d620b6938839b3b220..7cbec8ee5121fbd93dc6a2a264193ab14f1077d3 100755
--- a/src/main/java/ui/tmlad/TMLADWriteCAMS.java
+++ b/src/main/java/ui/tmlad/TMLADWriteCAMS.java
@@ -344,6 +344,7 @@ public class TMLADWriteCAMS extends TADComponentWithoutSubcomponents/* Issue #69
tab2.labels=labels;
tab2.values = values;
tab2.help = help;
+ tab2.helpButtom = new String[]{null, "cryptographicconfiguration.html", "cryptographicconfiguration.html"};
List<TabInfo> tabs = new ArrayList<>();
tabs.add(tab1);
@@ -351,7 +352,7 @@ public class TMLADWriteCAMS extends TADComponentWithoutSubcomponents/* Issue #69
//JDialogTwoString jdts = new JDialogTwoString(frame, "Setting channel's properties", "Channel name", channelName, "Nb of samples", nbOfSamples);
- JDialogMultiStringAndTabs jdmsat = new JDialogMultiStringAndTabs(frame, "Write in channel", tabs);
+ JDialogMultiStringAndTabs jdmsat = new JDialogMultiStringAndTabs(tdp.getMGUI(), frame, "Write in channel", tabs);
//jdms.setSize(600, 300);
GraphicLib.centerOnParent(jdmsat, 600, 300);
jdmsat.setVisible(true); // blocked until dialog has been closed
diff --git a/src/main/java/ui/tmlad/TMLADWriteChannel.java b/src/main/java/ui/tmlad/TMLADWriteChannel.java
index 2d54ac6e470ffd27678e29d04ee90388fe5f3c53..189e313322602ad2a0634a59b4107a57ab4da782 100755
--- a/src/main/java/ui/tmlad/TMLADWriteChannel.java
+++ b/src/main/java/ui/tmlad/TMLADWriteChannel.java
@@ -347,6 +347,7 @@ public class TMLADWriteChannel extends TADComponentWithoutSubcomponents/* Issue
tab2.labels=labels;
tab2.values = values;
tab2.help = help;
+ tab2.helpButtom = new String[]{null, "cryptographicconfiguration.html", "cryptographicconfiguration.html"};
List<TabInfo> tabs = new ArrayList<>();
tabs.add(tab1);
@@ -354,7 +355,7 @@ public class TMLADWriteChannel extends TADComponentWithoutSubcomponents/* Issue
//JDialogTwoString jdts = new JDialogTwoString(frame, "Setting channel's properties", "Channel name", channelName, "Nb of samples", nbOfSamples);
- JDialogMultiStringAndTabs jdmsat = new JDialogMultiStringAndTabs(frame, "Write in channel", tabs);
+ JDialogMultiStringAndTabs jdmsat = new JDialogMultiStringAndTabs(tdp.getMGUI(), frame, "Write in channel", tabs);
//jdms.setSize(600, 300);
GraphicLib.centerOnParent(jdmsat, 600, 300);
jdmsat.setVisible(true); // blocked until dialog has been closed
diff --git a/src/main/java/ui/window/JDialogMultiStringAndTabs.java b/src/main/java/ui/window/JDialogMultiStringAndTabs.java
index 4dbe671f1c2c7ed0b28e5afbb3eb6bf1873ffd9e..fccb43545f462d2531da7dcfef2e93ceb9a6e7b9 100644
--- a/src/main/java/ui/window/JDialogMultiStringAndTabs.java
+++ b/src/main/java/ui/window/JDialogMultiStringAndTabs.java
@@ -48,6 +48,7 @@ import java.awt.event.ActionListener;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import ui.util.IconManager;
import javax.swing.JButton;
import javax.swing.JComboBox;
@@ -56,6 +57,10 @@ import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.JTabbedPane;
import javax.swing.JTextField;
+import javax.swing.Icon;
+import ui.MainGUI;
+import ui.TGHelpButton;
+import help.HelpManager;
/**
* Class JDialogMultiStringAndTabs
@@ -76,6 +81,8 @@ public class JDialogMultiStringAndTabs extends JDialogBase implements ActionList
private JTextField[] texts;
private JButton inserts[];
private Map<Integer, JComboBox<String>> helps;
+ private MainGUI mgui;
+ public TGHelpButton myButton;
// private List<String[]> possibleValues = null;
@@ -102,6 +109,25 @@ public class JDialogMultiStringAndTabs extends JDialogBase implements ActionList
pack();
}
+ public JDialogMultiStringAndTabs(MainGUI _mgui, Frame f, String title, List<TabInfo> _tabs) {
+
+ super(f, title, true);
+
+ tabs = _tabs;
+ mgui =_mgui;
+
+ totalNbOfStrings = 0;
+ for(TabInfo tab: tabs) {
+ totalNbOfStrings += tab.labels.length;
+ }
+
+ texts = new JTextField[totalNbOfStrings];
+
+ initComponents();
+ //myInitComponents();
+ pack();
+ }
+
// private void myInitComponents() {
// }
@@ -155,13 +181,19 @@ public class JDialogMultiStringAndTabs extends JDialogBase implements ActionList
if (tmp != null) {
helps.put(totalIndex, new JComboBox<>(tmp));
panel1.add(helps.get(totalIndex), c1);
- c1.gridwidth = GridBagConstraints.REMAINDER; //end row
+ if (tab.helpButtom == null || mgui == null || tab.helpButtom[i] == null) {
+ c1.gridwidth = GridBagConstraints.REMAINDER; //end row
+ }
inserts[totalIndex] = new JButton("Use");
inserts[totalIndex].addActionListener(this);
panel1.add(inserts[totalIndex], c1);
}
}
}
+ if (tab.helpButtom != null && mgui != null && tab.helpButtom[i] != null) {
+ c1.gridwidth = GridBagConstraints.REMAINDER; //end row
+ makeEndHelpButton(tab.helpButtom[i], mgui, mgui.getHelpManager(), panel1, c1);
+ }
c1.gridwidth = GridBagConstraints.REMAINDER; //end row
texts[totalIndex] = new JTextField(tab.values[i], 15);
panel1.add(texts[totalIndex], c1);
@@ -245,4 +277,10 @@ public class JDialogMultiStringAndTabs extends JDialogBase implements ActionList
public void cancelDialog() {
dispose();
}
+
+ private void makeEndHelpButton(String helpWord, MainGUI mgui, HelpManager hm, JPanel panel, GridBagConstraints c) {
+ Icon myIcon = IconManager.imgic32;
+ myButton = new TGHelpButton(myIcon, helpWord, mgui, hm);
+ myButton.addToPanel(panel, c);
+ }
}
diff --git a/src/main/java/ui/window/TabInfo.java b/src/main/java/ui/window/TabInfo.java
index c2f65e93c7425a0e8661ec01527c2ff89b97d030..b2131ca913643eb8192f0f7407018fd644aaa680 100644
--- a/src/main/java/ui/window/TabInfo.java
+++ b/src/main/java/ui/window/TabInfo.java
@@ -54,6 +54,7 @@ public class TabInfo {
public String[] labels;
public String[] values;
public List<String[]> help;
+ public String[] helpButtom;
public TabInfo(String _identifier) {
identifier = _identifier;
diff --git a/src/main/resources/help/avatarsafetypragmas.html b/src/main/resources/help/avatarsafetypragmas.html
index 55ac4e027359df3b28a77af59bbce41853f2417f..8634e875bf706e36ed5ce8df887155ea38d843ad 100644
--- a/src/main/resources/help/avatarsafetypragmas.html
+++ b/src/main/resources/help/avatarsafetypragmas.html
@@ -8,51 +8,34 @@
<style>
code{white-space: pre-wrap;}
span.smallcaps{font-variant: small-caps;}
- div.columns{display: flex; gap: min(4vw, 1.5em);}
- div.column{flex: auto; overflow-x: auto;}
+ span.underline{text-decoration: underline;}
+ div.column{display: inline-block; vertical-align: top; width: 50%;}
div.hanging-indent{margin-left: 1.5em; text-indent: -1.5em;}
ul.task-list{list-style: none;}
- ul.task-list li input[type="checkbox"] {
- width: 0.8em;
- margin: 0 0.8em 0.2em -1.6em;
- vertical-align: middle;
- }
- .display.math{display: block; text-align: center; margin: 0.5rem auto;}
</style>
- <link rel="stylesheet" href="/Users/ludovicapvrille/TTool/src/main/resources/help/help.css" />
- <!--[if lt IE 9]>
- <script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv-printshiv.min.js"></script>
- <![endif]-->
+ <link rel="stylesheet" href="help.css" />
</head>
<body>
<h1 id="avatar-safety-pragmas">AVATAR Safety pragmas</h1>
-<p>A safety pragma expresses a property that is expected to be verified
-by the internal model checker or by UPPAAL.</p>
+<p>A safety pragma expresses a property that is expected to be verified by the internal model checker or by UPPAAL.</p>
<p>A safety pragma is as follows, with p and q being properties:</p>
<ul>
<li>[T/F] A/E []/<> p</li>
<li>[T/F] p –> q</li>
</ul>
-<p>Example: T A<> Block1.x > 0 means that the attribute “x†of
-block “Block1†is always strictly positive.</p>
+<p>Example: T A<> Block1.x > 0 means that the attribute “x†of block “Block1†is always strictly positive.</p>
<h2 id="a-p">A[] p</h2>
-<p>“A†means <em>on All paths</em> and “[]†means in <em>all
-states</em>. “A[] p†therefore means that “p†is expected to be
-satisfied in all states of all paths.</p>
+<p>“A†means <em>on All paths</em> and “[]†means in <em>all states</em>. “A[] p†therefore means that “p†is expected to be satisfied in all states of all paths.</p>
<center>
<img src="file:../help/ctlaall_small.png" />
</center>
<h2 id="ap">A<>p</h2>
-<p>“A†means <em>on All paths</em> and “<>†means in <em>at least
-one state</em>. “A<> p†therefore means that “p†is expected to be
-satisfied in at least one state of all paths.</p>
+<p>“A†means <em>on All paths</em> and “<>†means in <em>at least one state</em>. “A<> p†therefore means that “p†is expected to be satisfied in at least one state of all paths.</p>
<center>
<img src="file:../help/ctlaone_small.png" />
</center>
<h2 id="e-properties">E[] properties</h2>
-<p>“E†means <em>on one paths</em> and “[]†means in <em>all
-states</em>. “E[] p†therefore means that “p†is expected to be
-satisfied in all states of at least one path.</p>
+<p>“E†means <em>on one paths</em> and “[]†means in <em>all states</em>. “E[] p†therefore means that “p†is expected to be satisfied in all states of at least one path.</p>
<center>
<img src="file:../help/ctleall_small.png" />
</center>
@@ -61,35 +44,18 @@ satisfied in all states of at least one path.</p>
<img src="file:../help/ctleone_small.png" />
</center>
<h2 id="leads-to-properties">“Leads to†properties</h2>
-<p>“p –> q†means that whenever p is encoutred in a state s, all
-paths starting from state s must have a state in which q is
-satisfied.</p>
+<p>“p –> q†means that whenever p is encoutred in a state s, all paths starting from state s must have a state in which q is satisfied.</p>
<center>
<img src="file:../help/ctlleadsto_small.png" />
</center>
<h2 id="true-false">True / False</h2>
-<p>A pragma may start with “T†or “Fâ€. “T†stands for True and “F†for
-False. T or F precise if the pragma is expected to be true or false
-during verification. - If a pragma starts with a “T†and is satisfied,
-then a green check is added on its left side. - if a pragma starts with
-a “T†and is not satisfied, then a red cross is added on its left side.
-- If a pragma starts with a “F†and is satisfied, then a red cross is
-added on its left side. - if a pragma starts with a “F†and is not
-satisfied, then a green check is added on its left side.</p>
-<p>Adding “T†or “F†before at the beginning of a pragma is
-<strong>optional</strong>. A pragma with no “T†or “F†is assumed to
-start with a “Tâ€.</p>
+<p>A pragma may start with “T†or “Fâ€. “T†stands for True and “F†for False. T or F precise if the pragma is expected to be true or false during verification. - If a pragma starts with a “T†and is satisfied, then a green check is added on its left side. - if a pragma starts with a “T†and is not satisfied, then a red cross is added on its left side. - If a pragma starts with a “F†and is satisfied, then a red cross is added on its left side. - if a pragma starts with a “F†and is not satisfied, then a green check is added on its left side.</p>
+<p>Adding “T†or “F†before at the beginning of a pragma is <strong>optional</strong>. A pragma with no “T†or “F†is assumed to start with a “Tâ€.</p>
<h2 id="p-properties">“p†properties</h2>
-<p>A pragma termines with a property. A property is a boolean
-expression. The following operators can be used between sub-boolean
-expressions: - “&&â€, “||â€</p>
-<p>A boolean expression can: - State that a given state s of a block b
-has been reached: b.s - Use boolean or integer attributes of blocks,
-comparing them with operators such as : “==â€, “<â€, “>â€, “>=â€,
-“<=â€</p>
+<p>A pragma termines with a property. A property is a boolean expression. The following operators can be used between sub-boolean expressions: - “&&â€, “||â€</p>
+<p>A boolean expression can: - State that a given state s of a block b has been reached: b.s - Use boolean or integer attributes of blocks, comparing them with operators such as : “==â€, “<â€, “>â€, “>=â€, “<=â€</p>
<h2 id="examples">Examples</h2>
-<p>The following figures gives the pragmas that are given in the
-CoffeeMachine use case available on the model repository of TTool.</p>
+<p>The following figures gives the pragmas that are given in the CoffeeMachine use case available on the model repository of TTool.</p>
<ul>
<li><p>A[] CoffeeMachine.nbOfCoins<=2</p></li>
<li><p>T E<> CoffeeMachine.nbOfCoins>0</p></li>
@@ -98,23 +64,15 @@ CoffeeMachine use case available on the model repository of TTool.</p>
<li><p>A[] Wallet.nbOfCoins<3</p></li>
<li><p>A[] Wallet.nbOfCoins>=0</p></li>
<li><p>E[] Wallet.nbOfCoins>=1</p></li>
-<li><p>F CoffeeMachine.Beverage –>
-CoffeeMachine.CoffeeDelivered</p></li>
-<li><p>CoffeeMachine.Beverage –> CoffeeMachine.CoffeeDelivered
-&& CoffeeMachine.TeaDelivered</p></li>
-<li><p>CoffeeMachine.Beverage –> CoffeeMachine.CoffeeDelivered ||
-CoffeeMachine.TeaDelivered</p></li>
-<li><p>CoffeeMachine.Beverage –>
-CoffeeMachine.WaitingForFirstCoin</p></li>
-<li><p>F CoffeeMachine.WaitingForFirstCoin –>
-CoffeeMachine.EjectState</p></li>
-<li><p>CoffeeMachine.WaitingForFirstCoin –> CoffeeMachine.EjectState
-|| CoffeeMachine.WaitingForSecondCoin</p></li>
-<li><p>CoffeeMachine.CoffeeDelivered –>
-CoffeeMachine.nbOfCoins<2</p></li>
+<li><p>F CoffeeMachine.Beverage –> CoffeeMachine.CoffeeDelivered</p></li>
+<li><p>CoffeeMachine.Beverage –> CoffeeMachine.CoffeeDelivered && CoffeeMachine.TeaDelivered</p></li>
+<li><p>CoffeeMachine.Beverage –> CoffeeMachine.CoffeeDelivered || CoffeeMachine.TeaDelivered</p></li>
+<li><p>CoffeeMachine.Beverage –> CoffeeMachine.WaitingForFirstCoin</p></li>
+<li><p>F CoffeeMachine.WaitingForFirstCoin –> CoffeeMachine.EjectState</p></li>
+<li><p>CoffeeMachine.WaitingForFirstCoin –> CoffeeMachine.EjectState || CoffeeMachine.WaitingForSecondCoin</p></li>
+<li><p>CoffeeMachine.CoffeeDelivered –> CoffeeMachine.nbOfCoins<2</p></li>
</ul>
-<p>After verifying them with TTool’s internal model checker, we obtain
-the following:</p>
+<p>After verifying them with TTool’s internal model checker, we obtain the following:</p>
<center>
<img src="file:../help/pragmas_cm.png" />
</center>
diff --git a/src/main/resources/help/bus.html b/src/main/resources/help/bus.html
index 1e25069308c29cac7b704e6624dd886305c4b62c..e4f257a2774c9906a5e748dbbf1a7bdfd4848b47 100644
--- a/src/main/resources/help/bus.html
+++ b/src/main/resources/help/bus.html
@@ -12,12 +12,8 @@
div.column{display: inline-block; vertical-align: top; width: 50%;}
div.hanging-indent{margin-left: 1.5em; text-indent: -1.5em;}
ul.task-list{list-style: none;}
- .display.math{display: block; text-align: center; margin: 0.5rem auto;}
</style>
- <link rel="stylesheet" href="/Users/ludovicapvrille/TTool/src/main/resources/help/help.css" />
- <!--[if lt IE 9]>
- <script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv-printshiv.min.js"></script>
- <![endif]-->
+ <link rel="stylesheet" href="help.css" />
</head>
<body>
<h1 id="bus">Bus</h1>
@@ -29,7 +25,7 @@
<li>An arbitration policy capturing how simultaneous trafsre request are handled</li>
<li>A data size in byte.</li>
<li>A pipeline size expressing the number of cycles spent by one transfer in this bus</li>
-<li>A slice time, i.e. the maximum number of cycles a transfer can use before being preempted./ not taken into account, so ponly for documentation. Rather use the ’burst sizeâ€</li>
+<li>A slice time, i.e. the maximum number of cycles a transfer can use before being preempted./ not taken into account, so ponly for documentation. Rather use the ’burst size"</li>
<li>A burst size: this represents the maximum size of a transfer before it is preempted if another request is pending.</li>
<li>A clock divider expresses the relation between the clock of the memory and the main clock of the architecture</li>
<li>A bus privacy. A public bus can be spied at, while a private bus cannot. On a public bus, an attacker can reive messages and inject messages.</li>
diff --git a/src/main/resources/help/cryptographicconfiguration.html b/src/main/resources/help/cryptographicconfiguration.html
new file mode 100644
index 0000000000000000000000000000000000000000..5adca1d2cf2c90658e3e7ebeae662037af771d3e
--- /dev/null
+++ b/src/main/resources/help/cryptographicconfiguration.html
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" lang="" xml:lang="">
+<head>
+ <meta charset="utf-8" />
+ <meta name="generator" content="pandoc" />
+ <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes" />
+ <title>TTool help</title>
+ <style>
+ code{white-space: pre-wrap;}
+ span.smallcaps{font-variant: small-caps;}
+ span.underline{text-decoration: underline;}
+ div.column{display: inline-block; vertical-align: top; width: 50%;}
+ div.hanging-indent{margin-left: 1.5em; text-indent: -1.5em;}
+ ul.task-list{list-style: none;}
+ </style>
+ <link rel="stylesheet" href="help.css" />
+</head>
+<body>
+<h1 id="cryptographic-configuration">Cryptographic configuration</h1>
+<p>A sending or receiving operator can specify a cryptographic configuration. If no cryptographic configuration is used, it means that data sent over the channel are unmodified. If a cryptographic configuration is used, then data sent over the channel are modified according to what is specified in the cryptographic configuration (e.g., data are encrypted, etc.). In case an HSM is used, then data can be sent to the HSM encrypted or unencrypted.</p>
+</body>
+</html>
diff --git a/src/main/resources/help/cryptographicconfiguration.md b/src/main/resources/help/cryptographicconfiguration.md
new file mode 100644
index 0000000000000000000000000000000000000000..d06c06156e765b198dbdf7d0acc88cc21cf474cc
--- /dev/null
+++ b/src/main/resources/help/cryptographicconfiguration.md
@@ -0,0 +1,5 @@
+# Cryptographic configuration
+A sending or receiving operator can specify a cryptographic configuration.
+If no cryptographic configuration is used, it means that data sent over the channel are unmodified.
+If a cryptographic configuration is used, then data sent over the channel are modified according to what is specified in the cryptographic configuration (e.g., data are encrypted, etc.).
+In case an HSM is used, then data can be sent to the HSM encrypted or unencrypted.
\ No newline at end of file
diff --git a/src/main/resources/help/diplodocussimulator.html b/src/main/resources/help/diplodocussimulator.html
index b0744018791abd358b1be586a067812a30f32d41..52e1cf1b1c9e0ad580939a7b48a0fab6eae4067d 100644
--- a/src/main/resources/help/diplodocussimulator.html
+++ b/src/main/resources/help/diplodocussimulator.html
@@ -12,19 +12,15 @@
div.column{display: inline-block; vertical-align: top; width: 50%;}
div.hanging-indent{margin-left: 1.5em; text-indent: -1.5em;}
ul.task-list{list-style: none;}
- .display.math{display: block; text-align: center; margin: 0.5rem auto;}
</style>
- <link rel="stylesheet" href="/Users/ludovicapvrille/TTool/src/main/resources/help/help.css" />
- <!--[if lt IE 9]>
- <script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv-printshiv.min.js"></script>
- <![endif]-->
+ <link rel="stylesheet" href="help.css" />
</head>
<body>
<h1 id="diplodocus-simulator">Diplodocus Simulator</h1>
<h2 id="objective">Objective</h2>
<p>The simulator of DIPLODOCUS intends to simulate a DIPLODOCUS mapping, taking into account functional tasks, the system architectures (CPU, buses, etc.) and the allocations of tasks and their communucations to the system architecture</p>
<h2 id="generating-simulation-code-and-commiling-it">Generating simulation code and commiling it?</h2>
-<p>The first step is to create a DIPLODOCUS mapping. Once the mapping model has been checked against syntax errors <img src="file:../ui/util/checkmodel.gif" alt="syntax checking icon" />, it is possible to generate a C++ code <img src="file:../ui/util/gensystc.gif" alt="simulation code generation icon" /> that represents the mapping model. If you are using a model in TTool, then the code is generated by default in TTool/simulators/c++2 for models. If your model has been made in a project, then the code is generated into the “c++_code†subdirectory of your project.</p>
+<p>The first step is to create a DIPLODOCUS mapping. Once the mapping model has been checked against syntax errors <img src="file:../ui/util/checkmodel.gif" alt="syntax checking icon" />, it is possible to generate a C++ code <img src="file:../ui/util/gensystc.gif" alt="simulation code generation icon" /> that represents the mapping model. If you are using a model in TTool, then the code is generated by default in TTool/simulators/c++2 for models. If your model has been made in a project, then the code is generated into the "c++_code" subdirectory of your project.</p>
<p>The second step is to compile the code. You can directly do it from TTool with the code generation window, second tab. Another option is to open a terminal, and to enter the following command:</p>
<pre><code>$ make</code></pre>
<h2 id="using-the-simulator-from-ttool">Using the simulator from TTool</h2>
diff --git a/src/main/resources/help/helpTable.txt b/src/main/resources/help/helpTable.txt
index dcc986cdc9b289f56ef3ea8ea63b4231763a7747..790edc5e79229861aeb1fb8701a88a30346e6af6 100644
--- a/src/main/resources/help/helpTable.txt
+++ b/src/main/resources/help/helpTable.txt
@@ -46,5 +46,6 @@
--- invariants invariant invariant petri net mutual exclusion safety verification
--- avatarsimulation avatar_simulation interactive statistics
---- avatarstatistics avatar_statistics simulation avatar interactive statistics
+---- cryptographicconfiguration cryptographic cryptographic_configuration channel security
diff --git a/src/main/resources/help/invariants.html b/src/main/resources/help/invariants.html
index 114c3e2ed2eeeafeca1445fcf409110073f41319..9d444a7ca46ca9f7edf304f7b68df4d75d93caa3 100644
--- a/src/main/resources/help/invariants.html
+++ b/src/main/resources/help/invariants.html
@@ -12,12 +12,8 @@
div.column{display: inline-block; vertical-align: top; width: 50%;}
div.hanging-indent{margin-left: 1.5em; text-indent: -1.5em;}
ul.task-list{list-style: none;}
- .display.math{display: block; text-align: center; margin: 0.5rem auto;}
</style>
- <link rel="stylesheet" href="/Users/ludovicapvrille/TTool/src/main/resources/help/help.css" />
- <!--[if lt IE 9]>
- <script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv-printshiv.min.js"></script>
- <![endif]-->
+ <link rel="stylesheet" href="help.css" />
</head>
<body>
<h1 id="invariants">Invariants</h1>
diff --git a/src/main/resources/help/plan.html b/src/main/resources/help/plan.html
index 3646b1883ad27a77935a17d3a169c0f1d3724a0b..b10756403584d92a3341b48dfc62b484aa86a366 100644
--- a/src/main/resources/help/plan.html
+++ b/src/main/resources/help/plan.html
@@ -12,19 +12,15 @@
div.column{display: inline-block; vertical-align: top; width: 50%;}
div.hanging-indent{margin-left: 1.5em; text-indent: -1.5em;}
ul.task-list{list-style: none;}
- .display.math{display: block; text-align: center; margin: 0.5rem auto;}
</style>
- <link rel="stylesheet" href="/Users/ludovicapvrille/TTool/src/main/resources/help/help.css" />
- <!--[if lt IE 9]>
- <script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv-printshiv.min.js"></script>
- <![endif]-->
+ <link rel="stylesheet" href="help.css" />
</head>
<body>
<h1 id="plan---precise-latency-analysis">PLAN - Precise Latency ANalysis</h1>
<h2 id="objective">Objective</h2>
<p>The simulator of PLAN is to analyze transactions of a simulation trace obtained with the <a href="file://diplodocussimulator.html">DIPLODOCUS simulator</a>.</p>
<h2 id="generating-a-simulation-trace">Generating a simulation trace</h2>
-<p>The first step is to create a DIPLODOCUS mapping. Once the mapping model has been checked against syntax errors <img src="file:../ui/util/checkmodel.gif" alt="syntax checking icon" />, it is possible to generate a C++ code <img src="file:../ui/util/gensystc.gif" alt="simulation code generation icon" /> that represents the mapping model. If you are using a model in TTool, then the code is generated by default in TTool/simulators/c++2 for models. If your model has been made in a project, then the code is generated into the “c++_code†subdirectory of your project.</p>
+<p>The first step is to create a DIPLODOCUS mapping. Once the mapping model has been checked against syntax errors <img src="file:../ui/util/checkmodel.gif" alt="syntax checking icon" />, it is possible to generate a C++ code <img src="file:../ui/util/gensystc.gif" alt="simulation code generation icon" /> that represents the mapping model. If you are using a model in TTool, then the code is generated by default in TTool/simulators/c++2 for models. If your model has been made in a project, then the code is generated into the "c++_code" subdirectory of your project.</p>
<p>The second step is to compile the code. You can directly do it from TTool with the code generation window, second tab. Another option is to open a terminal, and to enter the following command:</p>
<pre><code>$ make</code></pre>
<h2 id="using-the-simulator-from-ttool">Using the simulator from TTool</h2>
diff --git a/src/main/resources/help/reachabilitygraph.html b/src/main/resources/help/reachabilitygraph.html
index 793da0318df4f68dd7eb21817eb846e9cb1d59c5..0229b8d2dcf1325c7c5e6f548a60b99f73bc2608 100644
--- a/src/main/resources/help/reachabilitygraph.html
+++ b/src/main/resources/help/reachabilitygraph.html
@@ -8,125 +8,47 @@
<style>
code{white-space: pre-wrap;}
span.smallcaps{font-variant: small-caps;}
- div.columns{display: flex; gap: min(4vw, 1.5em);}
- div.column{flex: auto; overflow-x: auto;}
+ span.underline{text-decoration: underline;}
+ div.column{display: inline-block; vertical-align: top; width: 50%;}
div.hanging-indent{margin-left: 1.5em; text-indent: -1.5em;}
ul.task-list{list-style: none;}
- ul.task-list li input[type="checkbox"] {
- width: 0.8em;
- margin: 0 0.8em 0.2em -1.6em;
- vertical-align: middle;
- }
- .display.math{display: block; text-align: center; margin: 0.5rem auto;}
</style>
- <link rel="stylesheet" href="/Users/ludovicapvrille/TTool/src/main/resources/help/help.css" />
- <!--[if lt IE 9]>
- <script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv-printshiv.min.js"></script>
- <![endif]-->
+ <link rel="stylesheet" href="help.css" />
</head>
<body>
<h1 id="reachability-graphs">Reachability graphs</h1>
<h2 id="what-is-a-reachability-graph">What is a reachability graph?</h2>
-<p>A reachability graph (RG) represents all possible execution paths and
-states of a system. Here, a reachability graph is produced from an
-Avatar design. To be generated, the graph generator considers all
-possible transitions from states of states machine, independently from
-the probabilities attached to transitions between the states of state
-machines. Said differently, the graph generator considers all possible
-transitions between states of states machines. So, even transitions with
-low probability are in the RG.</p>
-<h2 id="how-to-generate-a-reachability-graph">How to generate a
-reachability graph?</h2>
-<p>Reachability Graphs can be created by using the internal
-model-checker of TTool. This video on formal verification details the
-steps to generate a RG: https://www.youtube.com/watch?v=8IYJ1UDUbvQ</p>
+<p>A reachability graph (RG) represents all possible execution paths and states of a system. Here, a reachability graph is produced from an Avatar design. To be generated, the graph generator considers all possible transitions from states of states machine, independently from the probabilities attached to transitions between the states of state machines. Said differently, the graph generator considers all possible transitions between states of states machines. So, even transitions with low probability are in the RG.</p>
+<h2 id="how-to-generate-a-reachability-graph">How to generate a reachability graph?</h2>
+<p>Reachability Graphs can be created by using the internal model-checker of TTool. This video on formal verification details the steps to generate a RG: https://www.youtube.com/watch?v=8IYJ1UDUbvQ</p>
<h2 id="model-checking-dialog-window">Model-checking: dialog window</h2>
-<p>Once the dialog window for model-checking has been opened, the
-following options are available:</p>
+<p>Once the dialog window for model-checking has been opened, the following options are available:</p>
<h3 id="general-options">General options</h3>
<ul>
-<li><strong>Empty transitions</strong> can be ignored, i.e., there are
-not displayed in the R.G. as internal actions</li>
-<li>The <strong>search type</strong> can be selected between “BFS†and
-“DFSâ€. BFS means “Breadth-First Searchâ€. It consists in exploring
-concurrent branches. In Depth-First search, each branch is first
-explored to the end and then concurrent branches are explored. Depending
-on the system, it can better to use BFS or DFS. It one technique takes
-for a given pragma, do try the other one.</li>
-<li>The <strong>word size</strong> states the length of an integer. this
-impacts the memory used to store the states of the R.G.</li>
-<li>The <strong>maximum number of threads</strong> makes it possible to
-limit the load on a machine making it more responsive during the
-generation of a R.G. By default, TTool uses the maximum number of
-concurrent threads allowed by your system architecture.</li>
-<li><strong>Ignore concurrency between internal actions</strong> refers
-to the fact that, when two actions a1 and a2 are possible between two
-blocks, the model-checker tries to execute a1 and then a2, but also a2
-then a1. In case this option is selected, only one out of the two
-possibilities is analyzed by the model-checker.</li>
-<li><strong>Limit number of states</strong> makes it possible to specify
-a number of states after which the R.G. generation stops. Beware, in
-that case, the graph could be incomplete.</li>
-<li><strong>Time constraint for RG generation</strong> puts a timeout on
-the graph generation after which the generation is stopped. Beware, in
-that case, the graph could be incomplete.</li>
+<li><strong>Empty transitions</strong> can be ignored, i.e., there are not displayed in the R.G. as internal actions</li>
+<li>The <strong>search type</strong> can be selected between “BFS†and “DFSâ€. BFS means “Breadth-First Searchâ€. It consists in exploring concurrent branches. In Depth-First search, each branch is first explored to the end and then concurrent branches are explored. Depending on the system, it can better to use BFS or DFS. It one technique takes for a given pragma, do try the other one.</li>
+<li>The <strong>word size</strong> states the length of an integer. this impacts the memory used to store the states of the R.G.</li>
+<li>The <strong>maximum number of threads</strong> makes it possible to limit the load on a machine making it more responsive during the generation of a R.G. By default, TTool uses the maximum number of concurrent threads allowed by your system architecture.</li>
+<li><strong>Ignore concurrency between internal actions</strong> refers to the fact that, when two actions a1 and a2 are possible between two blocks, the model-checker tries to execute a1 and then a2, but also a2 then a1. In case this option is selected, only one out of the two possibilities is analyzed by the model-checker.</li>
+<li><strong>Limit number of states</strong> makes it possible to specify a number of states after which the R.G. generation stops. Beware, in that case, the graph could be incomplete.</li>
+<li><strong>Time constraint for RG generation</strong> puts a timeout on the graph generation after which the generation is stopped. Beware, in that case, the graph could be incomplete.</li>
</ul>
<h3 id="basic-properties">Basic properties</h3>
-<p>Basic properties refer to deadlocks, reinitialization, loops of
-internal actions, reachability of states in state machines, and liveness
-of states in state machines. - <strong>Deadlocks</strong> refers to the
-fact that from at least on state of the RG, there is no output
-transition to another state. - <strong>Reinitialization</strong> means
-that from any state of the RG, it is possible to go back to the initial
-state of the R. - <strong>Internal action loops</strong> means that
-there exists at least one loop in the graph with only internal actions.
-- <strong>Reachability</strong> studies, if selected, either for
-selected states of states machines or for all states of states machines,
-whether there exists at least one path for each of these states from the
-initial state of the RG. - <strong>Liveness</strong> means that, for
-each considered states of state machines, all paths from the initial
-state must reach each of them.</p>
+<p>Basic properties refer to deadlocks, reinitialization, loops of internal actions, reachability of states in state machines, and liveness of states in state machines. - <strong>Deadlocks</strong> refers to the fact that from at least on state of the RG, there is no output transition to another state. - <strong>Reinitialization</strong> means that from any state of the RG, it is possible to go back to the initial state of the R. - <strong>Internal action loops</strong> means that there exists at least one loop in the graph with only internal actions. - <strong>Reachability</strong> studies, if selected, either for selected states of states machines or for all states of states machines, whether there exists at least one path for each of these states from the initial state of the RG. - <strong>Liveness</strong> means that, for each considered states of state machines, all paths from the initial state must reach each of them.</p>
<h3 id="advanced-properties">Advanced properties</h3>
-<p>Advanced properties refer to <a
-href="file://avatarsafetypragmas.html">Safety pragmas</a>. Safety
-pragmas can be selected for being verified individually.</p>
-<p>It is also possible to generate traces proving either that there are
-satisfied or non satisfied. These traces can be obtained as a graph
-(“Generate trace (graph format)â€) or as a text file (“Generate trace
-(TXT format)â€) which contains more information than the graph. Traces
-are generated in the default directory, and the text area at the bottom
-of the dialog window informs users about which trace files have been
-generated.</p>
-<p>Traces are generated in the following cases, independently from T/F
-being at the top of the pragma: - A[]: if the property is not satisfied
-- A<>: if the property is not satisfied - E[]: if the property is
-satisfied - E<>: if the property is satisfied - “–>â€: if the
-property is not satisfied</p>
-<p>Once generated, traces in graph format are listed in the left tree,
-“R. graphs†section.</p>
+<p>Advanced properties refer to <a href="file://avatarsafetypragmas.html">Safety pragmas</a>. Safety pragmas can be selected for being verified individually.</p>
+<p>It is also possible to generate traces proving either that there are satisfied or non satisfied. These traces can be obtained as a graph (“Generate trace (graph format)â€) or as a text file (“Generate trace (TXT format)â€) which contains more information than the graph. Traces are generated in the default directory, and the text area at the bottom of the dialog window informs users about which trace files have been generated.</p>
+<p>Traces are generated in the following cases, independently from T/F being at the top of the pragma: - A[]: if the property is not satisfied - A<>: if the property is not satisfied - E[]: if the property is satisfied - E<>: if the property is satisfied - “–>â€: if the property is not satisfied</p>
+<p>Once generated, traces in graph format are listed in the left tree, “R. graphs†section.</p>
<h3 id="generating-the-rg">Generating the RG</h3>
-<p>It is possible to select if the RG is generated, or not, where it is
-generated, and if it is also saved in dotty format. Once generated, RG
-are available in the left tree, “R. graphs†section.</p>
+<p>It is possible to select if the RG is generated, or not, where it is generated, and if it is also saved in dotty format. Once generated, RG are available in the left tree, “R. graphs†section.</p>
<h3 id="starting-the-model-checker">Starting the model-checker</h3>
-<p>Just click on the “start†button. This button is activated only if at
-least one basic property as been selected, or one pragma has been
-selected, or the RG generation has been selected.</p>
+<p>Just click on the “start†button. This button is activated only if at least one basic property as been selected, or one pragma has been selected, or the RG generation has been selected.</p>
<h2 id="working-with-rgs">Working with RGs</h2>
-<p>Once an RG has been generated, it is listed in the left tree, section
-“R. graphsâ€. A right click on a RG (or on a trace) offers several
-options: - Getting statistics on the graph - Displaying the graph -
-Minimizing the graph</p>
+<p>Once an RG has been generated, it is listed in the left tree, section “R. graphsâ€. A right click on a RG (or on a trace) offers several options: - Getting statistics on the graph - Displaying the graph - Minimizing the graph</p>
<h2 id="displaying-the-graph">Displaying the graph</h2>
-<p>An RG is displayed with an external library called “GraphStreamâ€
-provided with TTool. A RG can displayed only if its number of states and
-transitions is of reasonable size. Usually, more than 500 states or
-transitions will make the displaying slow and useless.</p>
-<p>The displaying of graphs can be customized using a CSS specification
-added to the configuration file of TTool. Below is provided an example
-of such a specification. All the CSS directives given in
-https://graphstream-project.org/doc/Advanced-Concepts/GraphStream-CSS-Reference/
-can be used in this definition.</p>
+<p>An RG is displayed with an external library called “GraphStream†provided with TTool. A RG can displayed only if its number of states and transitions is of reasonable size. Usually, more than 500 states or transitions will make the displaying slow and useless.</p>
+<p>The displaying of graphs can be customized using a CSS specification added to the configuration file of TTool. Below is provided an example of such a specification. All the CSS directives given in https://graphstream-project.org/doc/Advanced-Concepts/GraphStream-CSS-Reference/ can be used in this definition.</p>
<pre><code><RGStyleSheet data="
node {fill-color: #B1CAF1; text-color: black; size: 20px, 20px; text-size:14;}
node.deadlock {fill-color: red; text-color: white; size: 20px, 20px; text-size:16;}
@@ -135,17 +57,12 @@ edge {text-color: black; shape: cubic-curve; text-size:10;}
edge.defaultedge {text-size:10; text-color:black;}
edge.external {text-color:blue; text-size:14; text-offset: -20, -20; text-alignment: along;}" /></code></pre>
<ul>
-<li><em>node.init</em> corresponds to the first node of the graph. Here,
-it is colored in green</li>
-<li><em>node.deadlock</em> corresponds to nodes with no output
-transitions. They are colored in red.</li>
-<li><em>node</em> corresponds to other nodes. They are colors with RGB
-color “B1CAF1â€</li>
+<li><em>node.init</em> corresponds to the first node of the graph. Here, it is colored in green</li>
+<li><em>node.deadlock</em> corresponds to nodes with no output transitions. They are colored in red.</li>
+<li><em>node</em> corresponds to other nodes. They are colors with RGB color “B1CAF1â€</li>
<li><em>edge</em> defines the characteristics of the normal edges.</li>
-<li>*edge.defaultedge defines the specification of edges with internal
-actions, i.e. with no communication action</li>
-<li><em>edge.external</em> refers to edges used for communications
-between blocks.</li>
+<li>*edge.defaultedge defines the specification of edges with internal actions, i.e. with no communication action</li>
+<li><em>edge.external</em> refers to edges used for communications between blocks.</li>
</ul>
</body>
</html>
diff --git a/src/main/resources/help/requirements.html b/src/main/resources/help/requirements.html
index 2858487857621b278cf252cb1b13cb80f7f7247c..54e2b03c6a0495b6c5f4e0cb238ce154b2b686cf 100644
--- a/src/main/resources/help/requirements.html
+++ b/src/main/resources/help/requirements.html
@@ -12,12 +12,8 @@
div.column{display: inline-block; vertical-align: top; width: 50%;}
div.hanging-indent{margin-left: 1.5em; text-indent: -1.5em;}
ul.task-list{list-style: none;}
- .display.math{display: block; text-align: center; margin: 0.5rem auto;}
</style>
- <link rel="stylesheet" href="/Users/ludovicapvrille/TTool/src/main/resources/help/help.css" />
- <!--[if lt IE 9]>
- <script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv-printshiv.min.js"></script>
- <![endif]-->
+ <link rel="stylesheet" href="help.css" />
</head>
<body>
<h1 id="requirements">Requirements</h1>
diff --git a/src/main/resources/help/securityverification.html b/src/main/resources/help/securityverification.html
index c58a9a7b51f812b3792e2a689783ce5c19e31ae9..89c389591bdceadff61193c89a5ef0fe4c5d7f22 100644
--- a/src/main/resources/help/securityverification.html
+++ b/src/main/resources/help/securityverification.html
@@ -8,65 +8,32 @@
<style>
code{white-space: pre-wrap;}
span.smallcaps{font-variant: small-caps;}
- div.columns{display: flex; gap: min(4vw, 1.5em);}
- div.column{flex: auto; overflow-x: auto;}
+ span.underline{text-decoration: underline;}
+ div.column{display: inline-block; vertical-align: top; width: 50%;}
div.hanging-indent{margin-left: 1.5em; text-indent: -1.5em;}
ul.task-list{list-style: none;}
- ul.task-list li input[type="checkbox"] {
- width: 0.8em;
- margin: 0 0.8em 0.2em -1.6em;
- vertical-align: middle;
- }
- .display.math{display: block; text-align: center; margin: 0.5rem auto;}
</style>
- <link rel="stylesheet" href="/Users/ludovicapvrille/TTool/src/main/resources/help/help.css" />
- <!--[if lt IE 9]>
- <script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv-printshiv.min.js"></script>
- <![endif]-->
+ <link rel="stylesheet" href="help.css" />
</head>
<body>
<h1 id="security-verification">Security verification</h1>
<h2 id="main-principle">Main principle</h2>
-<p>Security verification can be performed either from <a
-href="file://mapping.html">DIPLODOCUS mapping diagrams</a> or from <a
-href="file://avatarsoftwaredesign.html">AVATAR design diagrams</a>.</p>
-<p>The security verification consists in transforming a diagram and its
-security properties into a ProVerif specification, and then colling
-ProVerif to check for the satisfaction of security properties. while
-ProVerif runs, TTool indicates which properties could be proved and
-backtraces the results to diagrams, using locks next to perperties or
-elements involved in these properties. A green lock indicates a
-satisfied property, a greay lock indicates that the property could not
-be proved, and a red lock indicates that the property could be proved as
-violated.</p>
+<p>Security verification can be performed either from <a href="file://mapping.html">DIPLODOCUS mapping diagrams</a> or from <a href="file://avatarsoftwaredesign.html">AVATAR design diagrams</a>.</p>
+<p>The security verification consists in transforming a diagram and its security properties into a ProVerif specification, and then colling ProVerif to check for the satisfaction of security properties. while ProVerif runs, TTool indicates which properties could be proved and backtraces the results to diagrams, using locks next to perperties or elements involved in these properties. A green lock indicates a satisfied property, a greay lock indicates that the property could not be proved, and a red lock indicates that the property could be proved as violated.</p>
<h2 id="attacker-model">Attacker model</h2>
-<p>An important point to note: the assumed attacker model is Dolev-Yao,
-that is a, attacker can retreive messages from public channel, rework
-messages according to his/her knowledge and inject messages. We also
-assume that the attack knows about all cryptographic primitives
-available in TTool. Thus, an attacker can use symetric cryptography,
-asymetric cryptography, MAC, hash, etc.</p>
-<p><strong>Private channels</strong> cypher data with symetric
-encryption, i.e., they ensure condifentiality and integrity (also known
-as weak authenticity), but not (strong) authenticity.</p>
-<h2 id="proverif-installation-and-configuration">ProVerif installation
-and configuration</h2>
-<p>We advice to install the latest version of ProVerif on your computer.
-We usually install ProVerif using <em>opam</em>:</p>
+<p>An important point to note: the assumed attacker model is Dolev-Yao, that is a, attacker can retreive messages from public channel, rework messages according to his/her knowledge and inject messages. We also assume that the attack knows about all cryptographic primitives available in TTool. Thus, an attacker can use symetric cryptography, asymetric cryptography, MAC, hash, etc.</p>
+<p><strong>Private channels</strong> cypher data with symetric encryption, i.e., they ensure condifentiality and integrity (also known as weak authenticity), but not (strong) authenticity.</p>
+<h2 id="proverif-installation-and-configuration">ProVerif installation and configuration</h2>
+<p>We advice to install the latest version of ProVerif on your computer. We usually install ProVerif using <em>opam</em>:</p>
<pre><code>$ opam install proverif</code></pre>
-<p>Once proverif has been installed, TTool must be configured. TTool
-relies on a .xml configuration file (by default: config.xml). Open this
-configuration file and configure:</p>
-<p>The directory in which TTool generated ProVerif specifications. For
-instance:</p>
+<p>Once proverif has been installed, TTool must be configured. TTool relies on a .xml configuration file (by default: config.xml). Open this configuration file and configure:</p>
+<p>The directory in which TTool generated ProVerif specifications. For instance:</p>
<pre><code><ProVerifCodeDirectory data="/home/foo/TTool/proverif/" /></code></pre>
<p>The path to the ProVerif executable. For instance:</p>
<pre><code><ProVerifVerifierPath data="/home/foo/bin/proverif" /></code></pre>
<h2 id="security-properties">Security properties</h2>
-<p>Three security properties can be investigated: - Confidentiality -
-Integrity (or weak authenticity) - (Strong) authenticity</p>
-<h2 id="investigating-verification-results">Investigating verification
-results</h2>
+<p>Three security properties can be investigated: - Confidentiality - Integrity (or weak authenticity) - (Strong) authenticity</p>
+<h2 id="investigating-verification-results">Investigating verification results</h2>
<h2 id="advanced-concepts">Advanced concepts</h2>
</body>
</html>