diff --git a/src/main/java/tmltranslator/TMLActivity.java b/src/main/java/tmltranslator/TMLActivity.java index 3e3dd772d4f9dc0482cbd9549f2b47367ea92170..7f2495a9df6a8c582d142678e9b396564fdb2ceb 100755 --- a/src/main/java/tmltranslator/TMLActivity.java +++ b/src/main/java/tmltranslator/TMLActivity.java @@ -874,14 +874,12 @@ public class TMLActivity extends TMLElement { if (!(o instanceof TMLActivity)) return false; if(!super.equalSpec(o)) return false; TMLActivity tmlActivity = (TMLActivity) o; - TMLComparingMethod comp = new TMLComparingMethod(); if (first != null) { - if (!first.equalSpec(tmlActivity.getFirst())) return false; + return first.equalSpec(tmlActivity.getFirst()); } else { - if (tmlActivity.getFirst() != null) return false; + return tmlActivity.getFirst() == null; } - return comp.isTMLActivityEltListEquals(elements, tmlActivity.getElements()); } public void nullifyDelayOperators(boolean execOp, boolean timeOp) { diff --git a/src/main/java/tmltranslator/TMLActivityElement.java b/src/main/java/tmltranslator/TMLActivityElement.java index 7059a425937f45be3194df91f92e6755301dfa45..9b06395c1081490e4b055361f7cbf5a1516f1d37 100755 --- a/src/main/java/tmltranslator/TMLActivityElement.java +++ b/src/main/java/tmltranslator/TMLActivityElement.java @@ -157,8 +157,9 @@ public abstract class TMLActivityElement extends TMLElement { public abstract String customExtraToXML(); public boolean equalSpec(Object o) { - if (!(o instanceof TMLActivityElement)) return false; - if(!super.equalSpec(o)) return false; + if (o == null || getClass() != o.getClass()) return false; + if (this == o) return true; + TMLActivityElement tmlActEtls = (TMLActivityElement) o; TMLComparingMethod comp = new TMLComparingMethod(); return Objects.equals(value,tmlActEtls.getValue()) && diff --git a/src/main/java/tmltranslator/TMLActivityElementChannel.java b/src/main/java/tmltranslator/TMLActivityElementChannel.java index bc0f37b20fa65445d68d0f97e8ce5c14c230cbe1..2bf1606e999f22eae15b9ff13197334d9fe036cc 100755 --- a/src/main/java/tmltranslator/TMLActivityElementChannel.java +++ b/src/main/java/tmltranslator/TMLActivityElementChannel.java @@ -125,13 +125,25 @@ public abstract class TMLActivityElementChannel extends TMLActivityElement { return s; } + @Override public boolean equalSpec(Object o) { if (!(o instanceof TMLActivityElementChannel)) return false; if (!super.equalSpec(o)) return false; TMLActivityElementChannel tmlActEltChannel = (TMLActivityElementChannel) o; - return Objects.equals(nbOfSamples, ((TMLActivityElementChannel) o).getNbOfSamples()) && - isAttacker == tmlActEltChannel.isAttacker()/* && - isEncForm == tmlActEltChannel.getEncForm() */; + + // Check if the two TMLActivityElementChannel have the same channels list. + for (TMLChannel ch : channels) { + boolean isEqualChan = false; + for (TMLChannel ch2 : tmlActEltChannel.channels) { + if (ch.equalSpec(ch2)) { + isEqualChan = true; + break; + } + } + if (!isEqualChan) return false; + } + return Objects.equals(nbOfSamples, tmlActEltChannel.getNbOfSamples()) && + isAttacker == tmlActEltChannel.isAttacker(); } diff --git a/src/main/java/tmltranslator/TMLActivityElementEvent.java b/src/main/java/tmltranslator/TMLActivityElementEvent.java index c4a7a49278b39ef30636ec5523698441352e3614..a2d0024aad13fa40f38b72355177718d13e9ae2b 100755 --- a/src/main/java/tmltranslator/TMLActivityElementEvent.java +++ b/src/main/java/tmltranslator/TMLActivityElementEvent.java @@ -144,11 +144,23 @@ public abstract class TMLActivityElementEvent extends TMLActivityElement { return datas; } + @Override public boolean equalSpec(Object o) { if (!(o instanceof TMLActivityElementEvent)) return false; if (!super.equalSpec(o)) return false; TMLActivityElementEvent tmlActivityElementEvent = (TMLActivityElementEvent) o; - + // Check if the two TMLActivityElementEvent have the same events list. + for (TMLEvent evt1 : events) { + boolean isEqualEvt = false; + for (TMLEvent evt2 : tmlActivityElementEvent.getEvents()) { + if (evt1.equalSpec(evt2)) { + isEqualEvt = true; + break; + } + } + if (!isEqualEvt) return false; + } + if (!event.equalSpec(tmlActivityElementEvent.getEvent())) return false; return (new HashSet<>(datas)).equals(new HashSet<>(tmlActivityElementEvent.getDatas())) && Objects.equals(variable, tmlActivityElementEvent.getVariable()); } diff --git a/src/main/java/tmltranslator/TMLActivityElementWithAction.java b/src/main/java/tmltranslator/TMLActivityElementWithAction.java index 5e2fad559e09082f1bff8ec42d6d1e2e1a7f1141..c2511b743134b8a69ac8720294e7ed73c4accb47 100755 --- a/src/main/java/tmltranslator/TMLActivityElementWithAction.java +++ b/src/main/java/tmltranslator/TMLActivityElementWithAction.java @@ -78,6 +78,7 @@ public abstract class TMLActivityElementWithAction extends TMLActivityElement { return s; } + @Override public boolean equalSpec(Object o) { if (!(o instanceof TMLActivityElementWithAction)) return false; if (!super.equalSpec(o)) return false; diff --git a/src/main/java/tmltranslator/TMLActivityElementWithIntervalAction.java b/src/main/java/tmltranslator/TMLActivityElementWithIntervalAction.java index c375f24a57b28ba5c3346e90b33a5b6d26554373..2fcae175312a7158f619f5784bb070fc9e402744 100755 --- a/src/main/java/tmltranslator/TMLActivityElementWithIntervalAction.java +++ b/src/main/java/tmltranslator/TMLActivityElementWithIntervalAction.java @@ -82,6 +82,8 @@ public abstract class TMLActivityElementWithIntervalAction extends TMLActivityEl public void setActiveDelay(boolean _b){ isActiveDelay = _b;} public boolean getActiveDelay(){return isActiveDelay;} + + @Override public boolean equalSpec(Object o) { if (!(o instanceof TMLActivityElementWithIntervalAction)) return false; if (!super.equalSpec(o)) return false; diff --git a/src/main/java/tmltranslator/TMLChannel.java b/src/main/java/tmltranslator/TMLChannel.java index b6c31d366fa613c0f80a4271c3e2544bb97d1c2a..060f7528edbc3dd43bf4080cccccbaa56084d5a7 100755 --- a/src/main/java/tmltranslator/TMLChannel.java +++ b/src/main/java/tmltranslator/TMLChannel.java @@ -54,6 +54,8 @@ import java.util.List; */ public class TMLChannel extends TMLCommunicationElement { + public static final int DEFAULT_PRIORITY = 5; + public static final int BRBW = 0; public static final int BRNBW = 1; public static final int NBRNBW = 2; @@ -78,7 +80,7 @@ public class TMLChannel extends TMLCommunicationElement { private String TAB2 = "\t\t"; private String CR = "\n"; private String SP = " "; - private int priority; + private int priority = DEFAULT_PRIORITY; private int vc = 0; //Security diff --git a/src/main/java/tmltranslator/TMLChoice.java b/src/main/java/tmltranslator/TMLChoice.java index 45d9543ee5205ff0afebb12163c195b1190d79b9..84147db3d165dc02407123c2358d8d9977434dd0 100755 --- a/src/main/java/tmltranslator/TMLChoice.java +++ b/src/main/java/tmltranslator/TMLChoice.java @@ -350,6 +350,8 @@ public class TMLChoice extends TMLActivityElement{ private List<String> getGuards () { return guards; } + + @Override public boolean equalSpec(Object o) { if (!(o instanceof TMLChoice)) return false; if (!super.equalSpec(o)) return false; diff --git a/src/main/java/tmltranslator/TMLComparingMethod.java b/src/main/java/tmltranslator/TMLComparingMethod.java index 29f4c3154dbd3b8580f7e8e5ad756e82e93858cb..636f4d4d21950366fd71c24ff3b8ded661c41359 100644 --- a/src/main/java/tmltranslator/TMLComparingMethod.java +++ b/src/main/java/tmltranslator/TMLComparingMethod.java @@ -179,7 +179,7 @@ public class TMLComparingMethod { return true; } - public boolean isSecurityPatternMapEquals(Map<SecurityPattern, List<HwMemory>> map1, Map<SecurityPattern, List<HwMemory>> map2) { + public boolean isKeyMappingEquals(Map<SecurityPattern, List<HwMemory>> map1, Map<SecurityPattern, List<HwMemory>> map2) { if (map1 == null && map2 == null) { return true; @@ -200,6 +200,7 @@ public class TMLComparingMethod { break; } } + return false; } return true; @@ -246,34 +247,12 @@ public class TMLComparingMethod { return false; } - //copying to avoid rearranging original lists - list1 = new ArrayList<>(list1); - list2 = new ArrayList<>(list2); - - Collections.sort(list1, Comparator.comparing(TMLActivityElement::getName)); - Collections.sort(list2, Comparator.comparing(TMLActivityElement::getName)); - boolean test; - for (TMLActivityElement tmlActivityElement : list1) { - test = tmlActivityElement.equalSpec(list2.get(0)); - if (test) { - list2.remove(0); - } else if (list2.size() > 1) { - int comp = 1; - while (tmlActivityElement.getName().equals(list2.get(comp).getName())) { - test = tmlActivityElement.equalSpec(list2.get(comp)); - if (test) { - list2.remove(comp); - break; - } else { - comp += 1; - } - } - } + for (int i = 0; i< list1.size(); i++) { + test = list1.get(i).equalSpec(list2.get(i)); if (!test) return false; } - return true; } diff --git a/src/main/java/tmltranslator/TMLDelay.java b/src/main/java/tmltranslator/TMLDelay.java index 5572d77ba17f59fb8dca3744555c3b3b190e39eb..7ae1a4103171c7f58a45e5eb85e9e244d6999fd3 100755 --- a/src/main/java/tmltranslator/TMLDelay.java +++ b/src/main/java/tmltranslator/TMLDelay.java @@ -93,6 +93,7 @@ public class TMLDelay extends TMLActivityElementWithIntervalAction { return ""; } + @Override public boolean equalSpec(Object o) { if (! (o instanceof TMLDelay)) return false; if (!super.equalSpec(o)) return false; diff --git a/src/main/java/tmltranslator/TMLExecC.java b/src/main/java/tmltranslator/TMLExecC.java index 79d323cb05b362af1a1fd8621c93f13fa9467efb..b736434d6defef019daf0ab6f2195bb125245844 100755 --- a/src/main/java/tmltranslator/TMLExecC.java +++ b/src/main/java/tmltranslator/TMLExecC.java @@ -44,6 +44,8 @@ package tmltranslator; import translator.CheckingError; +import java.util.Objects; + /** * Class TMLExecC * Creation: 21/05/2008 @@ -70,6 +72,14 @@ public class TMLExecC extends TMLActivityElementWithAction { } } + @Override + public boolean equalSpec(Object o) { + if (!(o instanceof TMLExecC)) return false; + if (!super.equalSpec(o)) return false; + TMLExecC tmlExecC = (TMLExecC) o; + return Objects.equals(isDecryptionProcess, tmlExecC.isDecryptionProcess()); + } + public TMLExecC deepClone(TMLModeling tmlm) throws TMLCheckingError { TMLExecC newElt = new TMLExecC(getName(), getReferenceObject()); fillValues(newElt, tmlm); diff --git a/src/main/java/tmltranslator/TMLForLoop.java b/src/main/java/tmltranslator/TMLForLoop.java index b7d2e9b0b65bada6384f033615cd392d54b9cb15..8c0ea888b0fdfb88f30f8a800c1251e0de2b8c85 100755 --- a/src/main/java/tmltranslator/TMLForLoop.java +++ b/src/main/java/tmltranslator/TMLForLoop.java @@ -83,6 +83,7 @@ public class TMLForLoop extends TMLActivityElement { return " init=\"" + Conversion.transformToXMLString(init) + "\" condition=\"" + Conversion.transformToXMLString(condition) + "\" increment=\"" + Conversion.transformToXMLString(increment) + "\" isInfinite=\"" + isInfinite + "\" "; } + @Override public boolean equalSpec(Object o) { if (!(o instanceof TMLForLoop)) return false; if(!super.equalSpec(o)) return false; diff --git a/src/main/java/tmltranslator/TMLMapping.java b/src/main/java/tmltranslator/TMLMapping.java index 8a2d3490412dd6663c1e1c69b151aa7d08d67edd..8f830bd6eb1cc90ed19f68749166f8029745dd75 100755 --- a/src/main/java/tmltranslator/TMLMapping.java +++ b/src/main/java/tmltranslator/TMLMapping.java @@ -53,7 +53,6 @@ import tmltranslator.toproverif.TML2ProVerif; import translator.CheckingError; import java.util.*; -import java.util.stream.Collectors; /** * Class TMLMapping Creation: 05/09/2007 @@ -1950,7 +1949,7 @@ public class TMLMapping<E> { //TraceManager.addDev("Testing mapped secu"); - if (!comp.isSecurityPatternMapEquals(mappedSecurity, that.mappedSecurity)) + if (!comp.isKeyMappingEquals(mappedSecurity, that.mappedSecurity)) return false; return tmlm.equalSpec(that.tmlm) && tmla.equalSpec(that.tmla) && firewall == that.firewall; @@ -2022,7 +2021,7 @@ public class TMLMapping<E> { return mappedSecurity.get(_sp); } - public void NullifyAutomata() { + public void resetMinimalMapping() { aut = null; nodesToStates = null; commNodes = null; diff --git a/src/main/java/tmltranslator/TMLRandom.java b/src/main/java/tmltranslator/TMLRandom.java index c59f805276a70b834c3c16c7c50180564d2c1f97..0a5c1dc8641158c05518407ad568b4ef98e3014f 100755 --- a/src/main/java/tmltranslator/TMLRandom.java +++ b/src/main/java/tmltranslator/TMLRandom.java @@ -74,6 +74,7 @@ public class TMLRandom extends TMLActivityElement { return " politics=\"" + functionId + "\" variable=\"" + variable + "\" minValue=\"" + minValue + "\" maxValue=\"" + maxValue + "\" "; } + @Override public boolean equalSpec(Object o) { if (!(o instanceof TMLRandom)) return false; if (!super.equalSpec(o)) return false; diff --git a/src/main/java/tmltranslator/TMLRandomSequence.java b/src/main/java/tmltranslator/TMLRandomSequence.java index 9b049db9e08068c8d253c962e9453ade7c4cc549..07741656c533fc54d6de4f576a774c888a69b20e 100755 --- a/src/main/java/tmltranslator/TMLRandomSequence.java +++ b/src/main/java/tmltranslator/TMLRandomSequence.java @@ -106,6 +106,7 @@ public class TMLRandomSequence extends TMLActivityElement { return indexes; } + @Override public boolean equalSpec(Object o) { if (!(o instanceof TMLRandomSequence)) return false; if (!super.equalSpec(o)) return false; diff --git a/src/main/java/tmltranslator/TMLSendRequest.java b/src/main/java/tmltranslator/TMLSendRequest.java index 8941997de17173e7e80abcae6b1b7116d4dc6301..77de3b26ac0bc5a18c0519858767412f84c9ee04 100755 --- a/src/main/java/tmltranslator/TMLSendRequest.java +++ b/src/main/java/tmltranslator/TMLSendRequest.java @@ -123,11 +123,13 @@ public class TMLSendRequest extends TMLActivityElement { return datas; } + @Override public boolean equalSpec(Object o) { if (!(o instanceof TMLSendRequest)) return false; if (!super.equalSpec(o)) return false; TMLSendRequest tmlSendRequest = (TMLSendRequest) o; + if (!request.equalSpec(tmlSendRequest.getRequest())) return false; return (new HashSet<>(datas)).equals(new HashSet<>(tmlSendRequest.getDatas())); } diff --git a/src/main/java/tmltranslator/TMLSequence.java b/src/main/java/tmltranslator/TMLSequence.java index acb205ad48e26f129ad854bd24f3e1e4f2377d72..8f50cdc68d575894c92414b3c1f9b8abbc934df4 100755 --- a/src/main/java/tmltranslator/TMLSequence.java +++ b/src/main/java/tmltranslator/TMLSequence.java @@ -101,6 +101,7 @@ public class TMLSequence extends TMLActivityElement { return indexes; } + @Override public boolean equalSpec(Object o) { if (!(o instanceof TMLSequence)) return false; if (!super.equalSpec(o)) return false; diff --git a/src/main/java/tmltranslator/TMLTask.java b/src/main/java/tmltranslator/TMLTask.java index 6517fd4f09c3e1859718d8a024878b7d6c863673..1fdc66ec15886b2942c08dc3739b127c54359e7d 100755 --- a/src/main/java/tmltranslator/TMLTask.java +++ b/src/main/java/tmltranslator/TMLTask.java @@ -51,12 +51,14 @@ import java.util.*; * @version 1.0 17/11/2005 */ public class TMLTask extends TMLElement { + public static final int DEFAULT_PRIORITY = 5; + protected TMLActivity activity; private boolean isRequested = false; private TMLRequest request; private List<TMLAttribute> attributes; private boolean mustExit = false; - private int priority; + private int priority = DEFAULT_PRIORITY; private Set<TMLChannel> channelsList; private Set<TMLChannel> readTMLChannelsList; private Set<TMLChannel> writeTMLChannelsList; diff --git a/src/main/java/ui/DrawerTMAPModeling.java b/src/main/java/ui/DrawerTMAPModeling.java index 93d5dec7c0eb54873f75f417d218264dfa258bdb..f4b084612e00670bf07ab59608c3b97b85a44d68 100644 --- a/src/main/java/ui/DrawerTMAPModeling.java +++ b/src/main/java/ui/DrawerTMAPModeling.java @@ -101,7 +101,7 @@ public class DrawerTMAPModeling { return; } - tmap.NullifyAutomata(); + tmap.resetMinimalMapping(); TMLSyntaxChecking syntax = new TMLSyntaxChecking(tmap); syntax.checkSyntax(); if (syntax.hasErrors() > 0) { diff --git a/src/main/java/ui/tmldd/TMLArchiArtifact.java b/src/main/java/ui/tmldd/TMLArchiArtifact.java index b1333ce06cb074a079e827145289e8c468b1229c..42808f9ca6b609613cd32407d2e03fb23d0f9389 100755 --- a/src/main/java/ui/tmldd/TMLArchiArtifact.java +++ b/src/main/java/ui/tmldd/TMLArchiArtifact.java @@ -42,6 +42,7 @@ import myutil.GraphicLib; import org.w3c.dom.Element; import org.w3c.dom.Node; import org.w3c.dom.NodeList; +import tmltranslator.TMLTask; import tmltranslator.modelcompiler.*; import ui.*; import ui.util.IconManager; @@ -78,7 +79,7 @@ public class TMLArchiArtifact extends TGCWithoutInternalComponent implements Swa protected String oldValue = ""; protected String referenceTaskName = "referenceToTask"; protected String taskName = "name"; - protected int priority = 0; // Between 0 and 10 + protected int priority = TMLTask.DEFAULT_PRIORITY; // Between 0 and 10 //protected String operation = ""; protected String operationMEC = "VOID"; private ArchUnitMEC fatherArchUnitMECType = new CpuMEC(); diff --git a/src/main/java/ui/tmldd/TMLArchiCommunicationArtifact.java b/src/main/java/ui/tmldd/TMLArchiCommunicationArtifact.java index 024ef4ee6a8c69bc2205d2335d256fec517e19bf..11ab005c5fbee573790272f2121b74f3332d9f37 100755 --- a/src/main/java/ui/tmldd/TMLArchiCommunicationArtifact.java +++ b/src/main/java/ui/tmldd/TMLArchiCommunicationArtifact.java @@ -43,6 +43,7 @@ import myutil.TraceManager; import org.w3c.dom.Element; import org.w3c.dom.Node; import org.w3c.dom.NodeList; +import tmltranslator.TMLChannel; import ui.*; import ui.util.IconManager; import ui.window.JDialogCommunicationArtifact; @@ -73,7 +74,7 @@ public class TMLArchiCommunicationArtifact extends TGCWithoutInternalComponent i protected String referenceCommunicationName = "TMLCommunication"; protected String communicationName = "name"; protected String typeName = "channel"; - protected int priority = 0; // Between 0 and 10 + protected int priority = TMLChannel.DEFAULT_PRIORITY; // Between 0 and 10 protected ArrayList<String> mappedElements = new ArrayList<>(); public TMLArchiCommunicationArtifact(int _x, int _y, int _minX, int _maxX, int _minY, int _maxY, boolean _pos, TGComponent _father, diff --git a/src/main/java/ui/tmldd/TMLArchiEventArtifact.java b/src/main/java/ui/tmldd/TMLArchiEventArtifact.java index c052fbe474cb533b57a72793f7639e3ebcceedf0..0b4063956674688e741f6479ff707c10a2b7eabb 100755 --- a/src/main/java/ui/tmldd/TMLArchiEventArtifact.java +++ b/src/main/java/ui/tmldd/TMLArchiEventArtifact.java @@ -43,6 +43,7 @@ import myutil.GraphicLib; import org.w3c.dom.Element; import org.w3c.dom.Node; import org.w3c.dom.NodeList; +import tmltranslator.TMLChannel; import ui.*; import ui.util.IconManager; import ui.window.JDialogEventArtifact; @@ -69,7 +70,7 @@ public class TMLArchiEventArtifact extends TGCWithoutInternalComponent implement protected String referenceEventName = "TMLEvent"; protected String eventName = "name"; protected String typeName = "event"; - protected int priority = 0; // Between 0 and 10 + protected int priority = 5; // Between 0 and 10 public TMLArchiEventArtifact( int _x, int _y, int _minX, int _maxX, int _minY, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp) { diff --git a/src/main/java/ui/tmldd/TMLArchiKey.java b/src/main/java/ui/tmldd/TMLArchiKey.java index 66304079015e697e73d805efe4d4d882267450d3..df0b12822cbd74551d1eb9b997a6559ac6144244 100755 --- a/src/main/java/ui/tmldd/TMLArchiKey.java +++ b/src/main/java/ui/tmldd/TMLArchiKey.java @@ -74,7 +74,7 @@ public class TMLArchiKey extends TGCWithoutInternalComponent implements Swallowe protected String oldValue = ""; protected String referenceKey = "TMLKey"; protected String typeName = "key"; - protected int priority = 0; // Between 0 and 10 + protected int priority = 5; // Between 0 and 10 public TMLArchiKey(int _x, int _y, int _minX, int _maxX, int _minY, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp) { super(_x, _y, _minX, _maxX, _minY, _maxY, _pos, _father, _tdp); diff --git a/src/main/java/ui/tmldd/TMLArchiPortArtifact.java b/src/main/java/ui/tmldd/TMLArchiPortArtifact.java index b7d0d73292b3ef17913b5aab758938c15a07b3ed..43bd1bca032e06ec2fd3472c4cd995e3534a07bf 100644 --- a/src/main/java/ui/tmldd/TMLArchiPortArtifact.java +++ b/src/main/java/ui/tmldd/TMLArchiPortArtifact.java @@ -54,6 +54,7 @@ import org.w3c.dom.Node; import org.w3c.dom.NodeList; import myutil.GraphicLib; +import tmltranslator.TMLChannel; import tmltranslator.modelcompiler.AdaifBuffer; import tmltranslator.modelcompiler.Buffer; import tmltranslator.modelcompiler.FepBuffer; @@ -104,7 +105,7 @@ public class TMLArchiPortArtifact extends TGCWithoutInternalComponent implements protected String endAddress = ""; protected List<String> bufferParameters = new ArrayList<String>(); protected String bufferType = "noBuffer"; - protected int priority = 0; // Between 0 and 10 + protected int priority = 5; // Between 0 and 10 public TMLArchiPortArtifact(int _x, int _y, int _minX, int _maxX, int _minY, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp) { super(_x, _y, _minX, _maxX, _minY, _maxY, _pos, _father, _tdp); diff --git a/ttool/src/test/java/tmltranslator/AutoSecurityGenerationDiplodocusTest.java b/ttool/src/test/java/tmltranslator/AutoSecurityGenerationDiplodocusTest.java index 9c75bcb2c3f1408c989ba8bc394ab2f232afc965..c2daff4055b30df536b0a9c1cb63d78401d3f282 100644 --- a/ttool/src/test/java/tmltranslator/AutoSecurityGenerationDiplodocusTest.java +++ b/ttool/src/test/java/tmltranslator/AutoSecurityGenerationDiplodocusTest.java @@ -169,7 +169,7 @@ public class AutoSecurityGenerationDiplodocusTest extends AbstractTest { tmap = secgen.autoMapKeys(); } - tmap.NullifyAutomata(); + tmap.resetMinimalMapping(); TraceManager.addDev("Checking syntax of generated model " + tab); // Checking syntax TMLSyntaxChecking syntaxGenerated = new TMLSyntaxChecking(tmap); diff --git a/ttool/src/test/java/tmltranslator/TMLComparingMethodTest.java b/ttool/src/test/java/tmltranslator/TMLComparingMethodTest.java index 834366493dfa5243f729ae6bfe9f747e2f20862e..3b2440feeef29f61eec94f03ed84e170d5e96d32 100644 --- a/ttool/src/test/java/tmltranslator/TMLComparingMethodTest.java +++ b/ttool/src/test/java/tmltranslator/TMLComparingMethodTest.java @@ -42,7 +42,6 @@ package tmltranslator; import org.junit.Before; import org.junit.Test; import test.AbstractTest; -import ui.AbstractUITest; import java.util.*; @@ -1068,15 +1067,13 @@ public class TMLComparingMethodTest extends AbstractTest { @Test public void isSecurityPatternMapEquals() { - assertFalse("two lists have same context but difference element order" + - "",comparing.isSecurityPatternMapEquals(securityMap1,securityMap2)); + assertFalse("two lists have same context but difference element order", comparing.isKeyMappingEquals(securityMap1,securityMap2)); - assertFalse("two lists have same size but difference context" + - "",comparing.isSecurityPatternMapEquals(securityMap1,securityMap3)); + assertFalse("two lists have same size but difference context", comparing.isKeyMappingEquals(securityMap1,securityMap3)); - assertTrue("two empty lists", comparing.isSecurityPatternMapEquals(securityMap4,securityMap5)); + assertTrue("two empty lists", comparing.isKeyMappingEquals(securityMap4,securityMap5)); - assertFalse("two lists have difference size",comparing.isSecurityPatternMapEquals(securityMap1,securityMap6)); + assertFalse("two lists have difference size",comparing.isKeyMappingEquals(securityMap1,securityMap6)); } diff --git a/ttool/src/test/resources/tmltranslator/AutoSecGenDiplodocusTest/Models/modelWithMultiChannels/CaseWithoutHSM/golden/spec.tmap b/ttool/src/test/resources/tmltranslator/AutoSecGenDiplodocusTest/Models/modelWithMultiChannels/CaseWithoutHSM/golden/spec.tmap index 4936ef9f46e8aef40858ab2c262b072d24d8cd23..62f3307939cd96c41cdd0a1343b52fef3180011f 100644 --- a/ttool/src/test/resources/tmltranslator/AutoSecGenDiplodocusTest/Models/modelWithMultiChannels/CaseWithoutHSM/golden/spec.tmap +++ b/ttool/src/test/resources/tmltranslator/AutoSecGenDiplodocusTest/Models/modelWithMultiChannels/CaseWithoutHSM/golden/spec.tmap @@ -8,65 +8,65 @@ ENDTMLARCHI TMLMAPPING MAP CPUAlice autoSec__Alice - SET autoSec__Alice priority 0 + SET autoSec__Alice priority 5 MAP CPUBob autoSec__Bob - SET autoSec__Bob priority 0 + SET autoSec__Bob priority 5 MAP ExternalMemory autoSec__comm4 - SET autoSec__comm4 priority 0 + SET autoSec__comm4 priority 5 MAP BusBob autoSec__comm4 - SET autoSec__comm4 priority 0 + SET autoSec__comm4 priority 5 MAP BusAlice autoSec__comm4 - SET autoSec__comm4 priority 0 + SET autoSec__comm4 priority 5 MAP ExternalBus autoSec__comm4 - SET autoSec__comm4 priority 0 + SET autoSec__comm4 priority 5 MAP ExternalMemory autoSec__comm3 - SET autoSec__comm3 priority 0 + SET autoSec__comm3 priority 5 MAP BusBob autoSec__comm3 - SET autoSec__comm3 priority 0 + SET autoSec__comm3 priority 5 MAP BusAlice autoSec__comm3 - SET autoSec__comm3 priority 0 + SET autoSec__comm3 priority 5 MAP ExternalBus autoSec__comm3 - SET autoSec__comm3 priority 0 + SET autoSec__comm3 priority 5 MAP ExternalMemory autoSec__comm2 - SET autoSec__comm2 priority 0 + SET autoSec__comm2 priority 5 MAP ExternalBus autoSec__comm2 - SET autoSec__comm2 priority 0 + SET autoSec__comm2 priority 5 MAP BusBob autoSec__comm2 - SET autoSec__comm2 priority 0 + SET autoSec__comm2 priority 5 MAP BusAlice autoSec__comm2 - SET autoSec__comm2 priority 0 + SET autoSec__comm2 priority 5 MAP ExternalMemory autoSec__comm - SET autoSec__comm priority 0 + SET autoSec__comm priority 5 MAP ExternalBus autoSec__comm - SET autoSec__comm priority 0 + SET autoSec__comm priority 5 MAP BusAlice autoSec__comm - SET autoSec__comm priority 0 + SET autoSec__comm priority 5 MAP BusBob autoSec__comm - SET autoSec__comm priority 0 + SET autoSec__comm priority 5 MAP ExternalMemory autoSec__comm1 - SET autoSec__comm1 priority 0 + SET autoSec__comm1 priority 5 MAP BusBob autoSec__comm1 - SET autoSec__comm1 priority 0 + SET autoSec__comm1 priority 5 MAP BusAlice autoSec__comm1 - SET autoSec__comm1 priority 0 + SET autoSec__comm1 priority 5 MAP ExternalBus autoSec__comm1 - SET autoSec__comm1 priority 0 + SET autoSec__comm1 priority 5 MAP ExternalMemory autoSec__nonceChBob_Alice_comm2 - SET autoSec__nonceChBob_Alice_comm2 priority 0 + SET autoSec__nonceChBob_Alice_comm2 priority 5 MAP ExternalBus autoSec__nonceChBob_Alice_comm2 - SET autoSec__nonceChBob_Alice_comm2 priority 0 + SET autoSec__nonceChBob_Alice_comm2 priority 5 MAP BusBob autoSec__nonceChBob_Alice_comm2 - SET autoSec__nonceChBob_Alice_comm2 priority 0 + SET autoSec__nonceChBob_Alice_comm2 priority 5 MAP BusAlice autoSec__nonceChBob_Alice_comm2 - SET autoSec__nonceChBob_Alice_comm2 priority 0 + SET autoSec__nonceChBob_Alice_comm2 priority 5 MAP ExternalMemory autoSec__nonceChBob_Alice_comm4 - SET autoSec__nonceChBob_Alice_comm4 priority 0 + SET autoSec__nonceChBob_Alice_comm4 priority 5 MAP BusBob autoSec__nonceChBob_Alice_comm4 - SET autoSec__nonceChBob_Alice_comm4 priority 0 + SET autoSec__nonceChBob_Alice_comm4 priority 5 MAP BusAlice autoSec__nonceChBob_Alice_comm4 - SET autoSec__nonceChBob_Alice_comm4 priority 0 + SET autoSec__nonceChBob_Alice_comm4 priority 5 MAP ExternalBus autoSec__nonceChBob_Alice_comm4 - SET autoSec__nonceChBob_Alice_comm4 priority 0 + SET autoSec__nonceChBob_Alice_comm4 priority 5 MAPSEC MemoryAlice se_comm1 MAPSEC MemoryBob se_comm1 MAPSEC MemoryAlice mac_comm3 diff --git a/ttool/src/test/resources/tmltranslator/AutoSecGenDiplodocusTest/Models/modelWithMultiChannels/CasesWithDirectConnectHSMs/CaseWithHSMAlice/golden/spec.tmap b/ttool/src/test/resources/tmltranslator/AutoSecGenDiplodocusTest/Models/modelWithMultiChannels/CasesWithDirectConnectHSMs/CaseWithHSMAlice/golden/spec.tmap index a9bca64408f3db595ff242a6b54be22dacd51747..abe2b748730600fac3c3be45ccbb276f3b724e8f 100644 --- a/ttool/src/test/resources/tmltranslator/AutoSecGenDiplodocusTest/Models/modelWithMultiChannels/CasesWithDirectConnectHSMs/CaseWithHSMAlice/golden/spec.tmap +++ b/ttool/src/test/resources/tmltranslator/AutoSecGenDiplodocusTest/Models/modelWithMultiChannels/CasesWithDirectConnectHSMs/CaseWithHSMAlice/golden/spec.tmap @@ -8,119 +8,119 @@ ENDTMLARCHI TMLMAPPING MAP CPUAlice autoSec__Alice - SET autoSec__Alice priority 0 + SET autoSec__Alice priority 5 MAP CPUBob autoSec__Bob - SET autoSec__Bob priority 0 + SET autoSec__Bob priority 5 MAP HwA_HSM_Alice_Encrypt_comm2 autoSec__HSM_Alice_Encrypt_comm2 - SET autoSec__HSM_Alice_Encrypt_comm2 priority 0 + SET autoSec__HSM_Alice_Encrypt_comm2 priority 5 MAP HwA_HSM_Alice_Encrypt_comm3 autoSec__HSM_Alice_Encrypt_comm3 - SET autoSec__HSM_Alice_Encrypt_comm3 priority 0 + SET autoSec__HSM_Alice_Encrypt_comm3 priority 5 MAP HwA_HSM_Alice_Encrypt_comm4 autoSec__HSM_Alice_Encrypt_comm4 - SET autoSec__HSM_Alice_Encrypt_comm4 priority 0 + SET autoSec__HSM_Alice_Encrypt_comm4 priority 5 MAP HwA_HSM_Alice_Encrypt_comm autoSec__HSM_Alice_Encrypt_comm - SET autoSec__HSM_Alice_Encrypt_comm priority 0 + SET autoSec__HSM_Alice_Encrypt_comm priority 5 MAP HwA_HSM_Alice_Encrypt_comm1 autoSec__HSM_Alice_Encrypt_comm1 - SET autoSec__HSM_Alice_Encrypt_comm1 priority 0 + SET autoSec__HSM_Alice_Encrypt_comm1 priority 5 MAP MemoryAlice autoSec__dataCh_Alice_comm3 - SET autoSec__dataCh_Alice_comm3 priority 0 + SET autoSec__dataCh_Alice_comm3 priority 5 MAP Bus_HSM_Alice autoSec__dataCh_Alice_comm3 - SET autoSec__dataCh_Alice_comm3 priority 0 + SET autoSec__dataCh_Alice_comm3 priority 5 MAP BusAlice autoSec__dataCh_Alice_comm3 - SET autoSec__dataCh_Alice_comm3 priority 0 + SET autoSec__dataCh_Alice_comm3 priority 5 MAP MemoryAlice autoSec__dataCh_Alice_comm4 - SET autoSec__dataCh_Alice_comm4 priority 0 + SET autoSec__dataCh_Alice_comm4 priority 5 MAP Bus_HSM_Alice autoSec__dataCh_Alice_comm4 - SET autoSec__dataCh_Alice_comm4 priority 0 + SET autoSec__dataCh_Alice_comm4 priority 5 MAP BusAlice autoSec__dataCh_Alice_comm4 - SET autoSec__dataCh_Alice_comm4 priority 0 + SET autoSec__dataCh_Alice_comm4 priority 5 MAP MemoryAlice autoSec__dataCh_Alice_comm - SET autoSec__dataCh_Alice_comm priority 0 + SET autoSec__dataCh_Alice_comm priority 5 MAP Bus_HSM_Alice autoSec__dataCh_Alice_comm - SET autoSec__dataCh_Alice_comm priority 0 + SET autoSec__dataCh_Alice_comm priority 5 MAP BusAlice autoSec__dataCh_Alice_comm - SET autoSec__dataCh_Alice_comm priority 0 + SET autoSec__dataCh_Alice_comm priority 5 MAP MemoryAlice autoSec__dataCh_Alice_comm1 - SET autoSec__dataCh_Alice_comm1 priority 0 + SET autoSec__dataCh_Alice_comm1 priority 5 MAP Bus_HSM_Alice autoSec__dataCh_Alice_comm1 - SET autoSec__dataCh_Alice_comm1 priority 0 + SET autoSec__dataCh_Alice_comm1 priority 5 MAP BusAlice autoSec__dataCh_Alice_comm1 - SET autoSec__dataCh_Alice_comm1 priority 0 + SET autoSec__dataCh_Alice_comm1 priority 5 MAP MemoryAlice autoSec__dataCh_Alice_comm2 - SET autoSec__dataCh_Alice_comm2 priority 0 + SET autoSec__dataCh_Alice_comm2 priority 5 MAP Bus_HSM_Alice autoSec__dataCh_Alice_comm2 - SET autoSec__dataCh_Alice_comm2 priority 0 + SET autoSec__dataCh_Alice_comm2 priority 5 MAP BusAlice autoSec__dataCh_Alice_comm2 - SET autoSec__dataCh_Alice_comm2 priority 0 + SET autoSec__dataCh_Alice_comm2 priority 5 MAP MemoryBob autoSec__nonceChBob_Alice_comm4 - SET autoSec__nonceChBob_Alice_comm4 priority 0 + SET autoSec__nonceChBob_Alice_comm4 priority 5 MAP BusBob autoSec__nonceChBob_Alice_comm4 - SET autoSec__nonceChBob_Alice_comm4 priority 0 + SET autoSec__nonceChBob_Alice_comm4 priority 5 MAP ExternalBus autoSec__nonceChBob_Alice_comm4 - SET autoSec__nonceChBob_Alice_comm4 priority 0 + SET autoSec__nonceChBob_Alice_comm4 priority 5 MAP Bus_HSM_Alice autoSec__nonceChBob_Alice_comm4 - SET autoSec__nonceChBob_Alice_comm4 priority 0 + SET autoSec__nonceChBob_Alice_comm4 priority 5 MAP BusAlice autoSec__nonceChBob_Alice_comm4 - SET autoSec__nonceChBob_Alice_comm4 priority 0 + SET autoSec__nonceChBob_Alice_comm4 priority 5 MAP MemoryBob autoSec__nonceChBob_Alice_comm2 - SET autoSec__nonceChBob_Alice_comm2 priority 0 + SET autoSec__nonceChBob_Alice_comm2 priority 5 MAP BusBob autoSec__nonceChBob_Alice_comm2 - SET autoSec__nonceChBob_Alice_comm2 priority 0 + SET autoSec__nonceChBob_Alice_comm2 priority 5 MAP ExternalBus autoSec__nonceChBob_Alice_comm2 - SET autoSec__nonceChBob_Alice_comm2 priority 0 + SET autoSec__nonceChBob_Alice_comm2 priority 5 MAP Bus_HSM_Alice autoSec__nonceChBob_Alice_comm2 - SET autoSec__nonceChBob_Alice_comm2 priority 0 + SET autoSec__nonceChBob_Alice_comm2 priority 5 MAP BusAlice autoSec__nonceChBob_Alice_comm2 - SET autoSec__nonceChBob_Alice_comm2 priority 0 + SET autoSec__nonceChBob_Alice_comm2 priority 5 MAP Memory_HSM_Alice autoSec__retDataCh_Bob_comm3 - SET autoSec__retDataCh_Bob_comm3 priority 0 + SET autoSec__retDataCh_Bob_comm3 priority 5 MAP BusBob autoSec__retDataCh_Bob_comm3 - SET autoSec__retDataCh_Bob_comm3 priority 0 + SET autoSec__retDataCh_Bob_comm3 priority 5 MAP ExternalBus autoSec__retDataCh_Bob_comm3 - SET autoSec__retDataCh_Bob_comm3 priority 0 + SET autoSec__retDataCh_Bob_comm3 priority 5 MAP Bus_HSM_Alice autoSec__retDataCh_Bob_comm3 - SET autoSec__retDataCh_Bob_comm3 priority 0 + SET autoSec__retDataCh_Bob_comm3 priority 5 MAP BusAlice autoSec__retDataCh_Bob_comm3 - SET autoSec__retDataCh_Bob_comm3 priority 0 + SET autoSec__retDataCh_Bob_comm3 priority 5 MAP Memory_HSM_Alice autoSec__retDataCh_Bob_comm4 - SET autoSec__retDataCh_Bob_comm4 priority 0 + SET autoSec__retDataCh_Bob_comm4 priority 5 MAP BusBob autoSec__retDataCh_Bob_comm4 - SET autoSec__retDataCh_Bob_comm4 priority 0 + SET autoSec__retDataCh_Bob_comm4 priority 5 MAP ExternalBus autoSec__retDataCh_Bob_comm4 - SET autoSec__retDataCh_Bob_comm4 priority 0 + SET autoSec__retDataCh_Bob_comm4 priority 5 MAP Bus_HSM_Alice autoSec__retDataCh_Bob_comm4 - SET autoSec__retDataCh_Bob_comm4 priority 0 + SET autoSec__retDataCh_Bob_comm4 priority 5 MAP BusAlice autoSec__retDataCh_Bob_comm4 - SET autoSec__retDataCh_Bob_comm4 priority 0 + SET autoSec__retDataCh_Bob_comm4 priority 5 MAP Memory_HSM_Alice autoSec__retDataCh_Bob_comm - SET autoSec__retDataCh_Bob_comm priority 0 + SET autoSec__retDataCh_Bob_comm priority 5 MAP BusBob autoSec__retDataCh_Bob_comm - SET autoSec__retDataCh_Bob_comm priority 0 + SET autoSec__retDataCh_Bob_comm priority 5 MAP ExternalBus autoSec__retDataCh_Bob_comm - SET autoSec__retDataCh_Bob_comm priority 0 + SET autoSec__retDataCh_Bob_comm priority 5 MAP Bus_HSM_Alice autoSec__retDataCh_Bob_comm - SET autoSec__retDataCh_Bob_comm priority 0 + SET autoSec__retDataCh_Bob_comm priority 5 MAP BusAlice autoSec__retDataCh_Bob_comm - SET autoSec__retDataCh_Bob_comm priority 0 + SET autoSec__retDataCh_Bob_comm priority 5 MAP Memory_HSM_Alice autoSec__retDataCh_Bob_comm1 - SET autoSec__retDataCh_Bob_comm1 priority 0 + SET autoSec__retDataCh_Bob_comm1 priority 5 MAP BusBob autoSec__retDataCh_Bob_comm1 - SET autoSec__retDataCh_Bob_comm1 priority 0 + SET autoSec__retDataCh_Bob_comm1 priority 5 MAP ExternalBus autoSec__retDataCh_Bob_comm1 - SET autoSec__retDataCh_Bob_comm1 priority 0 + SET autoSec__retDataCh_Bob_comm1 priority 5 MAP Bus_HSM_Alice autoSec__retDataCh_Bob_comm1 - SET autoSec__retDataCh_Bob_comm1 priority 0 + SET autoSec__retDataCh_Bob_comm1 priority 5 MAP BusAlice autoSec__retDataCh_Bob_comm1 - SET autoSec__retDataCh_Bob_comm1 priority 0 + SET autoSec__retDataCh_Bob_comm1 priority 5 MAP Memory_HSM_Alice autoSec__retDataCh_Bob_comm2 - SET autoSec__retDataCh_Bob_comm2 priority 0 + SET autoSec__retDataCh_Bob_comm2 priority 5 MAP BusBob autoSec__retDataCh_Bob_comm2 - SET autoSec__retDataCh_Bob_comm2 priority 0 + SET autoSec__retDataCh_Bob_comm2 priority 5 MAP ExternalBus autoSec__retDataCh_Bob_comm2 - SET autoSec__retDataCh_Bob_comm2 priority 0 + SET autoSec__retDataCh_Bob_comm2 priority 5 MAP Bus_HSM_Alice autoSec__retDataCh_Bob_comm2 - SET autoSec__retDataCh_Bob_comm2 priority 0 + SET autoSec__retDataCh_Bob_comm2 priority 5 MAP BusAlice autoSec__retDataCh_Bob_comm2 - SET autoSec__retDataCh_Bob_comm2 priority 0 + SET autoSec__retDataCh_Bob_comm2 priority 5 MAPSEC MemoryBob se_comm2 MAPSEC Memory_HSM_Alice se_comm2 MAPSEC MemoryBob se_comm1 diff --git a/ttool/src/test/resources/tmltranslator/AutoSecGenDiplodocusTest/Models/modelWithMultiChannels/CasesWithDirectConnectHSMs/CaseWithHSMAliceBob/golden/spec.tmap b/ttool/src/test/resources/tmltranslator/AutoSecGenDiplodocusTest/Models/modelWithMultiChannels/CasesWithDirectConnectHSMs/CaseWithHSMAliceBob/golden/spec.tmap index 0c44de75747d3b0efec75dcf418e757d6a216378..c3f11dd6d1b410a310734531ee417a41e783f0e6 100644 --- a/ttool/src/test/resources/tmltranslator/AutoSecGenDiplodocusTest/Models/modelWithMultiChannels/CasesWithDirectConnectHSMs/CaseWithHSMAliceBob/golden/spec.tmap +++ b/ttool/src/test/resources/tmltranslator/AutoSecGenDiplodocusTest/Models/modelWithMultiChannels/CasesWithDirectConnectHSMs/CaseWithHSMAliceBob/golden/spec.tmap @@ -8,173 +8,173 @@ ENDTMLARCHI TMLMAPPING MAP CPUAlice autoSec__Alice - SET autoSec__Alice priority 0 + SET autoSec__Alice priority 5 MAP CPUBob autoSec__Bob - SET autoSec__Bob priority 0 + SET autoSec__Bob priority 5 MAP HwA_HSM_Alice_Encrypt_comm4 autoSec__HSM_Alice_Encrypt_comm4 - SET autoSec__HSM_Alice_Encrypt_comm4 priority 0 + SET autoSec__HSM_Alice_Encrypt_comm4 priority 5 MAP HwA_HSM_Bob_Decrypt_comm4 autoSec__HSM_Bob_Decrypt_comm4 - SET autoSec__HSM_Bob_Decrypt_comm4 priority 0 + SET autoSec__HSM_Bob_Decrypt_comm4 priority 5 MAP HwA_HSM_Alice_Encrypt_comm1 autoSec__HSM_Alice_Encrypt_comm1 - SET autoSec__HSM_Alice_Encrypt_comm1 priority 0 + SET autoSec__HSM_Alice_Encrypt_comm1 priority 5 MAP HwA_HSM_Alice_Encrypt_comm3 autoSec__HSM_Alice_Encrypt_comm3 - SET autoSec__HSM_Alice_Encrypt_comm3 priority 0 + SET autoSec__HSM_Alice_Encrypt_comm3 priority 5 MAP HwA_HSM_Bob_Decrypt_comm autoSec__HSM_Bob_Decrypt_comm - SET autoSec__HSM_Bob_Decrypt_comm priority 0 + SET autoSec__HSM_Bob_Decrypt_comm priority 5 MAP HwA_HSM_Bob_Decrypt_comm2 autoSec__HSM_Bob_Decrypt_comm2 - SET autoSec__HSM_Bob_Decrypt_comm2 priority 0 + SET autoSec__HSM_Bob_Decrypt_comm2 priority 5 MAP HwA_HSM_Bob_Decrypt_comm3 autoSec__HSM_Bob_Decrypt_comm3 - SET autoSec__HSM_Bob_Decrypt_comm3 priority 0 + SET autoSec__HSM_Bob_Decrypt_comm3 priority 5 MAP HwA_HSM_Bob_Decrypt_comm1 autoSec__HSM_Bob_Decrypt_comm1 - SET autoSec__HSM_Bob_Decrypt_comm1 priority 0 + SET autoSec__HSM_Bob_Decrypt_comm1 priority 5 MAP HwA_HSM_Alice_Encrypt_comm2 autoSec__HSM_Alice_Encrypt_comm2 - SET autoSec__HSM_Alice_Encrypt_comm2 priority 0 + SET autoSec__HSM_Alice_Encrypt_comm2 priority 5 MAP HwA_HSM_Alice_Encrypt_comm autoSec__HSM_Alice_Encrypt_comm - SET autoSec__HSM_Alice_Encrypt_comm priority 0 + SET autoSec__HSM_Alice_Encrypt_comm priority 5 MAP MemoryAlice autoSec__dataCh_Alice_comm3 - SET autoSec__dataCh_Alice_comm3 priority 0 + SET autoSec__dataCh_Alice_comm3 priority 5 MAP BusAlice autoSec__dataCh_Alice_comm3 - SET autoSec__dataCh_Alice_comm3 priority 0 + SET autoSec__dataCh_Alice_comm3 priority 5 MAP Bus_HSM_Alice autoSec__dataCh_Alice_comm3 - SET autoSec__dataCh_Alice_comm3 priority 0 + SET autoSec__dataCh_Alice_comm3 priority 5 MAP MemoryAlice autoSec__dataCh_Alice_comm4 - SET autoSec__dataCh_Alice_comm4 priority 0 + SET autoSec__dataCh_Alice_comm4 priority 5 MAP BusAlice autoSec__dataCh_Alice_comm4 - SET autoSec__dataCh_Alice_comm4 priority 0 + SET autoSec__dataCh_Alice_comm4 priority 5 MAP Bus_HSM_Alice autoSec__dataCh_Alice_comm4 - SET autoSec__dataCh_Alice_comm4 priority 0 + SET autoSec__dataCh_Alice_comm4 priority 5 MAP MemoryAlice autoSec__dataCh_Alice_comm - SET autoSec__dataCh_Alice_comm priority 0 + SET autoSec__dataCh_Alice_comm priority 5 MAP BusAlice autoSec__dataCh_Alice_comm - SET autoSec__dataCh_Alice_comm priority 0 + SET autoSec__dataCh_Alice_comm priority 5 MAP Bus_HSM_Alice autoSec__dataCh_Alice_comm - SET autoSec__dataCh_Alice_comm priority 0 + SET autoSec__dataCh_Alice_comm priority 5 MAP MemoryAlice autoSec__dataCh_Alice_comm1 - SET autoSec__dataCh_Alice_comm1 priority 0 + SET autoSec__dataCh_Alice_comm1 priority 5 MAP BusAlice autoSec__dataCh_Alice_comm1 - SET autoSec__dataCh_Alice_comm1 priority 0 + SET autoSec__dataCh_Alice_comm1 priority 5 MAP Bus_HSM_Alice autoSec__dataCh_Alice_comm1 - SET autoSec__dataCh_Alice_comm1 priority 0 + SET autoSec__dataCh_Alice_comm1 priority 5 MAP MemoryAlice autoSec__dataCh_Alice_comm2 - SET autoSec__dataCh_Alice_comm2 priority 0 + SET autoSec__dataCh_Alice_comm2 priority 5 MAP BusAlice autoSec__dataCh_Alice_comm2 - SET autoSec__dataCh_Alice_comm2 priority 0 + SET autoSec__dataCh_Alice_comm2 priority 5 MAP Bus_HSM_Alice autoSec__dataCh_Alice_comm2 - SET autoSec__dataCh_Alice_comm2 priority 0 + SET autoSec__dataCh_Alice_comm2 priority 5 MAP Memory_HSM_Alice autoSec__dataCh_HSM_Alice_Encrypt_comm3_comm3 - SET autoSec__dataCh_HSM_Alice_Encrypt_comm3_comm3 priority 0 + SET autoSec__dataCh_HSM_Alice_Encrypt_comm3_comm3 priority 5 MAP BusAlice autoSec__dataCh_HSM_Alice_Encrypt_comm3_comm3 - SET autoSec__dataCh_HSM_Alice_Encrypt_comm3_comm3 priority 0 + SET autoSec__dataCh_HSM_Alice_Encrypt_comm3_comm3 priority 5 MAP Bus_HSM_Alice autoSec__dataCh_HSM_Alice_Encrypt_comm3_comm3 - SET autoSec__dataCh_HSM_Alice_Encrypt_comm3_comm3 priority 0 + SET autoSec__dataCh_HSM_Alice_Encrypt_comm3_comm3 priority 5 MAP BusBob autoSec__dataCh_HSM_Alice_Encrypt_comm3_comm3 - SET autoSec__dataCh_HSM_Alice_Encrypt_comm3_comm3 priority 0 + SET autoSec__dataCh_HSM_Alice_Encrypt_comm3_comm3 priority 5 MAP Bus_HSM_Bob autoSec__dataCh_HSM_Alice_Encrypt_comm3_comm3 - SET autoSec__dataCh_HSM_Alice_Encrypt_comm3_comm3 priority 0 + SET autoSec__dataCh_HSM_Alice_Encrypt_comm3_comm3 priority 5 MAP ExternalBus autoSec__dataCh_HSM_Alice_Encrypt_comm3_comm3 - SET autoSec__dataCh_HSM_Alice_Encrypt_comm3_comm3 priority 0 + SET autoSec__dataCh_HSM_Alice_Encrypt_comm3_comm3 priority 5 MAP Memory_HSM_Alice autoSec__dataCh_HSM_Alice_Encrypt_comm4_comm4 - SET autoSec__dataCh_HSM_Alice_Encrypt_comm4_comm4 priority 0 + SET autoSec__dataCh_HSM_Alice_Encrypt_comm4_comm4 priority 5 MAP BusAlice autoSec__dataCh_HSM_Alice_Encrypt_comm4_comm4 - SET autoSec__dataCh_HSM_Alice_Encrypt_comm4_comm4 priority 0 + SET autoSec__dataCh_HSM_Alice_Encrypt_comm4_comm4 priority 5 MAP Bus_HSM_Alice autoSec__dataCh_HSM_Alice_Encrypt_comm4_comm4 - SET autoSec__dataCh_HSM_Alice_Encrypt_comm4_comm4 priority 0 + SET autoSec__dataCh_HSM_Alice_Encrypt_comm4_comm4 priority 5 MAP BusBob autoSec__dataCh_HSM_Alice_Encrypt_comm4_comm4 - SET autoSec__dataCh_HSM_Alice_Encrypt_comm4_comm4 priority 0 + SET autoSec__dataCh_HSM_Alice_Encrypt_comm4_comm4 priority 5 MAP Bus_HSM_Bob autoSec__dataCh_HSM_Alice_Encrypt_comm4_comm4 - SET autoSec__dataCh_HSM_Alice_Encrypt_comm4_comm4 priority 0 + SET autoSec__dataCh_HSM_Alice_Encrypt_comm4_comm4 priority 5 MAP ExternalBus autoSec__dataCh_HSM_Alice_Encrypt_comm4_comm4 - SET autoSec__dataCh_HSM_Alice_Encrypt_comm4_comm4 priority 0 + SET autoSec__dataCh_HSM_Alice_Encrypt_comm4_comm4 priority 5 MAP Memory_HSM_Alice autoSec__dataCh_HSM_Alice_Encrypt_comm_comm - SET autoSec__dataCh_HSM_Alice_Encrypt_comm_comm priority 0 + SET autoSec__dataCh_HSM_Alice_Encrypt_comm_comm priority 5 MAP BusAlice autoSec__dataCh_HSM_Alice_Encrypt_comm_comm - SET autoSec__dataCh_HSM_Alice_Encrypt_comm_comm priority 0 + SET autoSec__dataCh_HSM_Alice_Encrypt_comm_comm priority 5 MAP Bus_HSM_Alice autoSec__dataCh_HSM_Alice_Encrypt_comm_comm - SET autoSec__dataCh_HSM_Alice_Encrypt_comm_comm priority 0 + SET autoSec__dataCh_HSM_Alice_Encrypt_comm_comm priority 5 MAP BusBob autoSec__dataCh_HSM_Alice_Encrypt_comm_comm - SET autoSec__dataCh_HSM_Alice_Encrypt_comm_comm priority 0 + SET autoSec__dataCh_HSM_Alice_Encrypt_comm_comm priority 5 MAP Bus_HSM_Bob autoSec__dataCh_HSM_Alice_Encrypt_comm_comm - SET autoSec__dataCh_HSM_Alice_Encrypt_comm_comm priority 0 + SET autoSec__dataCh_HSM_Alice_Encrypt_comm_comm priority 5 MAP ExternalBus autoSec__dataCh_HSM_Alice_Encrypt_comm_comm - SET autoSec__dataCh_HSM_Alice_Encrypt_comm_comm priority 0 + SET autoSec__dataCh_HSM_Alice_Encrypt_comm_comm priority 5 MAP Memory_HSM_Alice autoSec__dataCh_HSM_Alice_Encrypt_comm1_comm1 - SET autoSec__dataCh_HSM_Alice_Encrypt_comm1_comm1 priority 0 + SET autoSec__dataCh_HSM_Alice_Encrypt_comm1_comm1 priority 5 MAP BusAlice autoSec__dataCh_HSM_Alice_Encrypt_comm1_comm1 - SET autoSec__dataCh_HSM_Alice_Encrypt_comm1_comm1 priority 0 + SET autoSec__dataCh_HSM_Alice_Encrypt_comm1_comm1 priority 5 MAP Bus_HSM_Alice autoSec__dataCh_HSM_Alice_Encrypt_comm1_comm1 - SET autoSec__dataCh_HSM_Alice_Encrypt_comm1_comm1 priority 0 + SET autoSec__dataCh_HSM_Alice_Encrypt_comm1_comm1 priority 5 MAP BusBob autoSec__dataCh_HSM_Alice_Encrypt_comm1_comm1 - SET autoSec__dataCh_HSM_Alice_Encrypt_comm1_comm1 priority 0 + SET autoSec__dataCh_HSM_Alice_Encrypt_comm1_comm1 priority 5 MAP Bus_HSM_Bob autoSec__dataCh_HSM_Alice_Encrypt_comm1_comm1 - SET autoSec__dataCh_HSM_Alice_Encrypt_comm1_comm1 priority 0 + SET autoSec__dataCh_HSM_Alice_Encrypt_comm1_comm1 priority 5 MAP ExternalBus autoSec__dataCh_HSM_Alice_Encrypt_comm1_comm1 - SET autoSec__dataCh_HSM_Alice_Encrypt_comm1_comm1 priority 0 + SET autoSec__dataCh_HSM_Alice_Encrypt_comm1_comm1 priority 5 MAP Memory_HSM_Alice autoSec__dataCh_HSM_Alice_Encrypt_comm2_comm2 - SET autoSec__dataCh_HSM_Alice_Encrypt_comm2_comm2 priority 0 + SET autoSec__dataCh_HSM_Alice_Encrypt_comm2_comm2 priority 5 MAP BusAlice autoSec__dataCh_HSM_Alice_Encrypt_comm2_comm2 - SET autoSec__dataCh_HSM_Alice_Encrypt_comm2_comm2 priority 0 + SET autoSec__dataCh_HSM_Alice_Encrypt_comm2_comm2 priority 5 MAP Bus_HSM_Alice autoSec__dataCh_HSM_Alice_Encrypt_comm2_comm2 - SET autoSec__dataCh_HSM_Alice_Encrypt_comm2_comm2 priority 0 + SET autoSec__dataCh_HSM_Alice_Encrypt_comm2_comm2 priority 5 MAP BusBob autoSec__dataCh_HSM_Alice_Encrypt_comm2_comm2 - SET autoSec__dataCh_HSM_Alice_Encrypt_comm2_comm2 priority 0 + SET autoSec__dataCh_HSM_Alice_Encrypt_comm2_comm2 priority 5 MAP Bus_HSM_Bob autoSec__dataCh_HSM_Alice_Encrypt_comm2_comm2 - SET autoSec__dataCh_HSM_Alice_Encrypt_comm2_comm2 priority 0 + SET autoSec__dataCh_HSM_Alice_Encrypt_comm2_comm2 priority 5 MAP ExternalBus autoSec__dataCh_HSM_Alice_Encrypt_comm2_comm2 - SET autoSec__dataCh_HSM_Alice_Encrypt_comm2_comm2 priority 0 + SET autoSec__dataCh_HSM_Alice_Encrypt_comm2_comm2 priority 5 MAP Memory_HSM_Bob autoSec__retDataCh_Bob_comm3 - SET autoSec__retDataCh_Bob_comm3 priority 0 + SET autoSec__retDataCh_Bob_comm3 priority 5 MAP BusBob autoSec__retDataCh_Bob_comm3 - SET autoSec__retDataCh_Bob_comm3 priority 0 + SET autoSec__retDataCh_Bob_comm3 priority 5 MAP Bus_HSM_Bob autoSec__retDataCh_Bob_comm3 - SET autoSec__retDataCh_Bob_comm3 priority 0 + SET autoSec__retDataCh_Bob_comm3 priority 5 MAP Memory_HSM_Bob autoSec__nonceChBob_Alice_comm4 - SET autoSec__nonceChBob_Alice_comm4 priority 0 + SET autoSec__nonceChBob_Alice_comm4 priority 5 MAP BusAlice autoSec__nonceChBob_Alice_comm4 - SET autoSec__nonceChBob_Alice_comm4 priority 0 + SET autoSec__nonceChBob_Alice_comm4 priority 5 MAP Bus_HSM_Alice autoSec__nonceChBob_Alice_comm4 - SET autoSec__nonceChBob_Alice_comm4 priority 0 + SET autoSec__nonceChBob_Alice_comm4 priority 5 MAP BusBob autoSec__nonceChBob_Alice_comm4 - SET autoSec__nonceChBob_Alice_comm4 priority 0 + SET autoSec__nonceChBob_Alice_comm4 priority 5 MAP Bus_HSM_Bob autoSec__nonceChBob_Alice_comm4 - SET autoSec__nonceChBob_Alice_comm4 priority 0 + SET autoSec__nonceChBob_Alice_comm4 priority 5 MAP ExternalBus autoSec__nonceChBob_Alice_comm4 - SET autoSec__nonceChBob_Alice_comm4 priority 0 + SET autoSec__nonceChBob_Alice_comm4 priority 5 MAP Memory_HSM_Bob autoSec__retDataCh_Bob_comm4 - SET autoSec__retDataCh_Bob_comm4 priority 0 + SET autoSec__retDataCh_Bob_comm4 priority 5 MAP BusBob autoSec__retDataCh_Bob_comm4 - SET autoSec__retDataCh_Bob_comm4 priority 0 + SET autoSec__retDataCh_Bob_comm4 priority 5 MAP Bus_HSM_Bob autoSec__retDataCh_Bob_comm4 - SET autoSec__retDataCh_Bob_comm4 priority 0 + SET autoSec__retDataCh_Bob_comm4 priority 5 MAP Memory_HSM_Bob autoSec__retDataCh_Bob_comm - SET autoSec__retDataCh_Bob_comm priority 0 + SET autoSec__retDataCh_Bob_comm priority 5 MAP BusBob autoSec__retDataCh_Bob_comm - SET autoSec__retDataCh_Bob_comm priority 0 + SET autoSec__retDataCh_Bob_comm priority 5 MAP Bus_HSM_Bob autoSec__retDataCh_Bob_comm - SET autoSec__retDataCh_Bob_comm priority 0 + SET autoSec__retDataCh_Bob_comm priority 5 MAP Memory_HSM_Bob autoSec__retDataCh_Bob_comm1 - SET autoSec__retDataCh_Bob_comm1 priority 0 + SET autoSec__retDataCh_Bob_comm1 priority 5 MAP BusBob autoSec__retDataCh_Bob_comm1 - SET autoSec__retDataCh_Bob_comm1 priority 0 + SET autoSec__retDataCh_Bob_comm1 priority 5 MAP Bus_HSM_Bob autoSec__retDataCh_Bob_comm1 - SET autoSec__retDataCh_Bob_comm1 priority 0 + SET autoSec__retDataCh_Bob_comm1 priority 5 MAP Memory_HSM_Bob autoSec__nonceChBob_Alice_comm2 - SET autoSec__nonceChBob_Alice_comm2 priority 0 + SET autoSec__nonceChBob_Alice_comm2 priority 5 MAP BusAlice autoSec__nonceChBob_Alice_comm2 - SET autoSec__nonceChBob_Alice_comm2 priority 0 + SET autoSec__nonceChBob_Alice_comm2 priority 5 MAP Bus_HSM_Alice autoSec__nonceChBob_Alice_comm2 - SET autoSec__nonceChBob_Alice_comm2 priority 0 + SET autoSec__nonceChBob_Alice_comm2 priority 5 MAP BusBob autoSec__nonceChBob_Alice_comm2 - SET autoSec__nonceChBob_Alice_comm2 priority 0 + SET autoSec__nonceChBob_Alice_comm2 priority 5 MAP Bus_HSM_Bob autoSec__nonceChBob_Alice_comm2 - SET autoSec__nonceChBob_Alice_comm2 priority 0 + SET autoSec__nonceChBob_Alice_comm2 priority 5 MAP ExternalBus autoSec__nonceChBob_Alice_comm2 - SET autoSec__nonceChBob_Alice_comm2 priority 0 + SET autoSec__nonceChBob_Alice_comm2 priority 5 MAP Memory_HSM_Bob autoSec__retDataCh_Bob_comm2 - SET autoSec__retDataCh_Bob_comm2 priority 0 + SET autoSec__retDataCh_Bob_comm2 priority 5 MAP BusBob autoSec__retDataCh_Bob_comm2 - SET autoSec__retDataCh_Bob_comm2 priority 0 + SET autoSec__retDataCh_Bob_comm2 priority 5 MAP Bus_HSM_Bob autoSec__retDataCh_Bob_comm2 - SET autoSec__retDataCh_Bob_comm2 priority 0 + SET autoSec__retDataCh_Bob_comm2 priority 5 MAPSEC Memory_HSM_Alice mac_comm3 MAPSEC Memory_HSM_Bob mac_comm3 MAPSEC Memory_HSM_Alice se_comm2 diff --git a/ttool/src/test/resources/tmltranslator/AutoSecGenDiplodocusTest/Models/modelWithMultiChannels/CasesWithDirectConnectHSMs/CaseWithHSMBob/golden/spec.tmap b/ttool/src/test/resources/tmltranslator/AutoSecGenDiplodocusTest/Models/modelWithMultiChannels/CasesWithDirectConnectHSMs/CaseWithHSMBob/golden/spec.tmap index f19d8053da8e00b632c533227738c944ab74dcb6..bc520d5cbd69c9f460fa8cf85a468e2026f01b34 100644 --- a/ttool/src/test/resources/tmltranslator/AutoSecGenDiplodocusTest/Models/modelWithMultiChannels/CasesWithDirectConnectHSMs/CaseWithHSMBob/golden/spec.tmap +++ b/ttool/src/test/resources/tmltranslator/AutoSecGenDiplodocusTest/Models/modelWithMultiChannels/CasesWithDirectConnectHSMs/CaseWithHSMBob/golden/spec.tmap @@ -8,119 +8,119 @@ ENDTMLARCHI TMLMAPPING MAP CPUAlice autoSec__Alice - SET autoSec__Alice priority 0 + SET autoSec__Alice priority 5 MAP CPUBob autoSec__Bob - SET autoSec__Bob priority 0 + SET autoSec__Bob priority 5 MAP HwA_HSM_Bob_Decrypt_comm3 autoSec__HSM_Bob_Decrypt_comm3 - SET autoSec__HSM_Bob_Decrypt_comm3 priority 0 + SET autoSec__HSM_Bob_Decrypt_comm3 priority 5 MAP HwA_HSM_Bob_Decrypt_comm4 autoSec__HSM_Bob_Decrypt_comm4 - SET autoSec__HSM_Bob_Decrypt_comm4 priority 0 + SET autoSec__HSM_Bob_Decrypt_comm4 priority 5 MAP HwA_HSM_Bob_Decrypt_comm autoSec__HSM_Bob_Decrypt_comm - SET autoSec__HSM_Bob_Decrypt_comm priority 0 + SET autoSec__HSM_Bob_Decrypt_comm priority 5 MAP HwA_HSM_Bob_Decrypt_comm2 autoSec__HSM_Bob_Decrypt_comm2 - SET autoSec__HSM_Bob_Decrypt_comm2 priority 0 + SET autoSec__HSM_Bob_Decrypt_comm2 priority 5 MAP HwA_HSM_Bob_Decrypt_comm1 autoSec__HSM_Bob_Decrypt_comm1 - SET autoSec__HSM_Bob_Decrypt_comm1 priority 0 + SET autoSec__HSM_Bob_Decrypt_comm1 priority 5 MAP MemoryAlice autoSec__dataCh_Alice_comm3 - SET autoSec__dataCh_Alice_comm3 priority 0 + SET autoSec__dataCh_Alice_comm3 priority 5 MAP ExternalBus autoSec__dataCh_Alice_comm3 - SET autoSec__dataCh_Alice_comm3 priority 0 + SET autoSec__dataCh_Alice_comm3 priority 5 MAP BusBob autoSec__dataCh_Alice_comm3 - SET autoSec__dataCh_Alice_comm3 priority 0 + SET autoSec__dataCh_Alice_comm3 priority 5 MAP Bus_HSM_Bob autoSec__dataCh_Alice_comm3 - SET autoSec__dataCh_Alice_comm3 priority 0 + SET autoSec__dataCh_Alice_comm3 priority 5 MAP BusAlice autoSec__dataCh_Alice_comm3 - SET autoSec__dataCh_Alice_comm3 priority 0 + SET autoSec__dataCh_Alice_comm3 priority 5 MAP MemoryAlice autoSec__dataCh_Alice_comm4 - SET autoSec__dataCh_Alice_comm4 priority 0 + SET autoSec__dataCh_Alice_comm4 priority 5 MAP ExternalBus autoSec__dataCh_Alice_comm4 - SET autoSec__dataCh_Alice_comm4 priority 0 + SET autoSec__dataCh_Alice_comm4 priority 5 MAP BusBob autoSec__dataCh_Alice_comm4 - SET autoSec__dataCh_Alice_comm4 priority 0 + SET autoSec__dataCh_Alice_comm4 priority 5 MAP Bus_HSM_Bob autoSec__dataCh_Alice_comm4 - SET autoSec__dataCh_Alice_comm4 priority 0 + SET autoSec__dataCh_Alice_comm4 priority 5 MAP BusAlice autoSec__dataCh_Alice_comm4 - SET autoSec__dataCh_Alice_comm4 priority 0 + SET autoSec__dataCh_Alice_comm4 priority 5 MAP MemoryAlice autoSec__dataCh_Alice_comm1 - SET autoSec__dataCh_Alice_comm1 priority 0 + SET autoSec__dataCh_Alice_comm1 priority 5 MAP ExternalBus autoSec__dataCh_Alice_comm1 - SET autoSec__dataCh_Alice_comm1 priority 0 + SET autoSec__dataCh_Alice_comm1 priority 5 MAP BusBob autoSec__dataCh_Alice_comm1 - SET autoSec__dataCh_Alice_comm1 priority 0 + SET autoSec__dataCh_Alice_comm1 priority 5 MAP Bus_HSM_Bob autoSec__dataCh_Alice_comm1 - SET autoSec__dataCh_Alice_comm1 priority 0 + SET autoSec__dataCh_Alice_comm1 priority 5 MAP BusAlice autoSec__dataCh_Alice_comm1 - SET autoSec__dataCh_Alice_comm1 priority 0 + SET autoSec__dataCh_Alice_comm1 priority 5 MAP MemoryAlice autoSec__dataCh_Alice_comm - SET autoSec__dataCh_Alice_comm priority 0 + SET autoSec__dataCh_Alice_comm priority 5 MAP ExternalBus autoSec__dataCh_Alice_comm - SET autoSec__dataCh_Alice_comm priority 0 + SET autoSec__dataCh_Alice_comm priority 5 MAP BusBob autoSec__dataCh_Alice_comm - SET autoSec__dataCh_Alice_comm priority 0 + SET autoSec__dataCh_Alice_comm priority 5 MAP Bus_HSM_Bob autoSec__dataCh_Alice_comm - SET autoSec__dataCh_Alice_comm priority 0 + SET autoSec__dataCh_Alice_comm priority 5 MAP BusAlice autoSec__dataCh_Alice_comm - SET autoSec__dataCh_Alice_comm priority 0 + SET autoSec__dataCh_Alice_comm priority 5 MAP MemoryAlice autoSec__dataCh_Alice_comm2 - SET autoSec__dataCh_Alice_comm2 priority 0 + SET autoSec__dataCh_Alice_comm2 priority 5 MAP ExternalBus autoSec__dataCh_Alice_comm2 - SET autoSec__dataCh_Alice_comm2 priority 0 + SET autoSec__dataCh_Alice_comm2 priority 5 MAP BusBob autoSec__dataCh_Alice_comm2 - SET autoSec__dataCh_Alice_comm2 priority 0 + SET autoSec__dataCh_Alice_comm2 priority 5 MAP Bus_HSM_Bob autoSec__dataCh_Alice_comm2 - SET autoSec__dataCh_Alice_comm2 priority 0 + SET autoSec__dataCh_Alice_comm2 priority 5 MAP BusAlice autoSec__dataCh_Alice_comm2 - SET autoSec__dataCh_Alice_comm2 priority 0 + SET autoSec__dataCh_Alice_comm2 priority 5 MAP Memory_HSM_Bob autoSec__retDataCh_Bob_comm3 - SET autoSec__retDataCh_Bob_comm3 priority 0 + SET autoSec__retDataCh_Bob_comm3 priority 5 MAP BusBob autoSec__retDataCh_Bob_comm3 - SET autoSec__retDataCh_Bob_comm3 priority 0 + SET autoSec__retDataCh_Bob_comm3 priority 5 MAP Bus_HSM_Bob autoSec__retDataCh_Bob_comm3 - SET autoSec__retDataCh_Bob_comm3 priority 0 + SET autoSec__retDataCh_Bob_comm3 priority 5 MAP Memory_HSM_Bob autoSec__nonceChBob_Alice_comm4 - SET autoSec__nonceChBob_Alice_comm4 priority 0 + SET autoSec__nonceChBob_Alice_comm4 priority 5 MAP ExternalBus autoSec__nonceChBob_Alice_comm4 - SET autoSec__nonceChBob_Alice_comm4 priority 0 + SET autoSec__nonceChBob_Alice_comm4 priority 5 MAP BusBob autoSec__nonceChBob_Alice_comm4 - SET autoSec__nonceChBob_Alice_comm4 priority 0 + SET autoSec__nonceChBob_Alice_comm4 priority 5 MAP Bus_HSM_Bob autoSec__nonceChBob_Alice_comm4 - SET autoSec__nonceChBob_Alice_comm4 priority 0 + SET autoSec__nonceChBob_Alice_comm4 priority 5 MAP BusAlice autoSec__nonceChBob_Alice_comm4 - SET autoSec__nonceChBob_Alice_comm4 priority 0 + SET autoSec__nonceChBob_Alice_comm4 priority 5 MAP Memory_HSM_Bob autoSec__retDataCh_Bob_comm4 - SET autoSec__retDataCh_Bob_comm4 priority 0 + SET autoSec__retDataCh_Bob_comm4 priority 5 MAP BusBob autoSec__retDataCh_Bob_comm4 - SET autoSec__retDataCh_Bob_comm4 priority 0 + SET autoSec__retDataCh_Bob_comm4 priority 5 MAP Bus_HSM_Bob autoSec__retDataCh_Bob_comm4 - SET autoSec__retDataCh_Bob_comm4 priority 0 + SET autoSec__retDataCh_Bob_comm4 priority 5 MAP Memory_HSM_Bob autoSec__retDataCh_Bob_comm1 - SET autoSec__retDataCh_Bob_comm1 priority 0 + SET autoSec__retDataCh_Bob_comm1 priority 5 MAP BusBob autoSec__retDataCh_Bob_comm1 - SET autoSec__retDataCh_Bob_comm1 priority 0 + SET autoSec__retDataCh_Bob_comm1 priority 5 MAP Bus_HSM_Bob autoSec__retDataCh_Bob_comm1 - SET autoSec__retDataCh_Bob_comm1 priority 0 + SET autoSec__retDataCh_Bob_comm1 priority 5 MAP Memory_HSM_Bob autoSec__retDataCh_Bob_comm - SET autoSec__retDataCh_Bob_comm priority 0 + SET autoSec__retDataCh_Bob_comm priority 5 MAP BusBob autoSec__retDataCh_Bob_comm - SET autoSec__retDataCh_Bob_comm priority 0 + SET autoSec__retDataCh_Bob_comm priority 5 MAP Bus_HSM_Bob autoSec__retDataCh_Bob_comm - SET autoSec__retDataCh_Bob_comm priority 0 + SET autoSec__retDataCh_Bob_comm priority 5 MAP Memory_HSM_Bob autoSec__retDataCh_Bob_comm2 - SET autoSec__retDataCh_Bob_comm2 priority 0 + SET autoSec__retDataCh_Bob_comm2 priority 5 MAP BusBob autoSec__retDataCh_Bob_comm2 - SET autoSec__retDataCh_Bob_comm2 priority 0 + SET autoSec__retDataCh_Bob_comm2 priority 5 MAP Bus_HSM_Bob autoSec__retDataCh_Bob_comm2 - SET autoSec__retDataCh_Bob_comm2 priority 0 + SET autoSec__retDataCh_Bob_comm2 priority 5 MAP Memory_HSM_Bob autoSec__nonceChBob_Alice_comm2 - SET autoSec__nonceChBob_Alice_comm2 priority 0 + SET autoSec__nonceChBob_Alice_comm2 priority 5 MAP ExternalBus autoSec__nonceChBob_Alice_comm2 - SET autoSec__nonceChBob_Alice_comm2 priority 0 + SET autoSec__nonceChBob_Alice_comm2 priority 5 MAP BusBob autoSec__nonceChBob_Alice_comm2 - SET autoSec__nonceChBob_Alice_comm2 priority 0 + SET autoSec__nonceChBob_Alice_comm2 priority 5 MAP Bus_HSM_Bob autoSec__nonceChBob_Alice_comm2 - SET autoSec__nonceChBob_Alice_comm2 priority 0 + SET autoSec__nonceChBob_Alice_comm2 priority 5 MAP BusAlice autoSec__nonceChBob_Alice_comm2 - SET autoSec__nonceChBob_Alice_comm2 priority 0 + SET autoSec__nonceChBob_Alice_comm2 priority 5 MAPSEC MemoryAlice se_comm1 MAPSEC Memory_HSM_Bob se_comm1 MAPSEC MemoryAlice mac_comm4 diff --git a/ttool/src/test/resources/tmltranslator/AutoSecGenDiplodocusTest/Models/modelWithMultiChannels/CasesWithPrivateHSMs/CaseWithHSMAlice/golden/spec.tmap b/ttool/src/test/resources/tmltranslator/AutoSecGenDiplodocusTest/Models/modelWithMultiChannels/CasesWithPrivateHSMs/CaseWithHSMAlice/golden/spec.tmap index 0a10b4ecbb529039d7acfcf0c1842f28970b5aa6..278a66018c987648b0e6f8438f28607bde38d802 100644 --- a/ttool/src/test/resources/tmltranslator/AutoSecGenDiplodocusTest/Models/modelWithMultiChannels/CasesWithPrivateHSMs/CaseWithHSMAlice/golden/spec.tmap +++ b/ttool/src/test/resources/tmltranslator/AutoSecGenDiplodocusTest/Models/modelWithMultiChannels/CasesWithPrivateHSMs/CaseWithHSMAlice/golden/spec.tmap @@ -8,147 +8,147 @@ ENDTMLARCHI TMLMAPPING MAP CPUAlice autoSec__Alice - SET autoSec__Alice priority 0 + SET autoSec__Alice priority 5 MAP CPUBob autoSec__Bob - SET autoSec__Bob priority 0 + SET autoSec__Bob priority 5 MAP HwA_HSM_Alice_Encrypt_comm1 autoSec__HSM_Alice_Encrypt_comm1 - SET autoSec__HSM_Alice_Encrypt_comm1 priority 0 + SET autoSec__HSM_Alice_Encrypt_comm1 priority 5 MAP HwA_HSM_Alice_Encrypt_comm2 autoSec__HSM_Alice_Encrypt_comm2 - SET autoSec__HSM_Alice_Encrypt_comm2 priority 0 + SET autoSec__HSM_Alice_Encrypt_comm2 priority 5 MAP HwA_HSM_Alice_Encrypt_comm4 autoSec__HSM_Alice_Encrypt_comm4 - SET autoSec__HSM_Alice_Encrypt_comm4 priority 0 + SET autoSec__HSM_Alice_Encrypt_comm4 priority 5 MAP HwA_HSM_Alice_Encrypt_comm autoSec__HSM_Alice_Encrypt_comm - SET autoSec__HSM_Alice_Encrypt_comm priority 0 + SET autoSec__HSM_Alice_Encrypt_comm priority 5 MAP HwA_HSM_Alice_Encrypt_comm3 autoSec__HSM_Alice_Encrypt_comm3 - SET autoSec__HSM_Alice_Encrypt_comm3 priority 0 + SET autoSec__HSM_Alice_Encrypt_comm3 priority 5 MAP ExternalMemory autoSec__nonceChBob_Alice_comm4 - SET autoSec__nonceChBob_Alice_comm4 priority 0 + SET autoSec__nonceChBob_Alice_comm4 priority 5 MAP BusBob autoSec__nonceChBob_Alice_comm4 - SET autoSec__nonceChBob_Alice_comm4 priority 0 + SET autoSec__nonceChBob_Alice_comm4 priority 5 MAP BusAlice autoSec__nonceChBob_Alice_comm4 - SET autoSec__nonceChBob_Alice_comm4 priority 0 + SET autoSec__nonceChBob_Alice_comm4 priority 5 MAP ExternalBus autoSec__nonceChBob_Alice_comm4 - SET autoSec__nonceChBob_Alice_comm4 priority 0 + SET autoSec__nonceChBob_Alice_comm4 priority 5 MAP ExternalMemory autoSec__nonceChBob_Alice_comm2 - SET autoSec__nonceChBob_Alice_comm2 priority 0 + SET autoSec__nonceChBob_Alice_comm2 priority 5 MAP ExternalBus autoSec__nonceChBob_Alice_comm2 - SET autoSec__nonceChBob_Alice_comm2 priority 0 + SET autoSec__nonceChBob_Alice_comm2 priority 5 MAP BusBob autoSec__nonceChBob_Alice_comm2 - SET autoSec__nonceChBob_Alice_comm2 priority 0 + SET autoSec__nonceChBob_Alice_comm2 priority 5 MAP BusAlice autoSec__nonceChBob_Alice_comm2 - SET autoSec__nonceChBob_Alice_comm2 priority 0 + SET autoSec__nonceChBob_Alice_comm2 priority 5 MAP ExternalMemory autoSec__comm1 - SET autoSec__comm1 priority 0 + SET autoSec__comm1 priority 5 MAP BusBob autoSec__comm1 - SET autoSec__comm1 priority 0 + SET autoSec__comm1 priority 5 MAP BusAlice autoSec__comm1 - SET autoSec__comm1 priority 0 + SET autoSec__comm1 priority 5 MAP ExternalBus autoSec__comm1 - SET autoSec__comm1 priority 0 + SET autoSec__comm1 priority 5 MAP ExternalMemory autoSec__comm - SET autoSec__comm priority 0 + SET autoSec__comm priority 5 MAP ExternalBus autoSec__comm - SET autoSec__comm priority 0 + SET autoSec__comm priority 5 MAP BusAlice autoSec__comm - SET autoSec__comm priority 0 + SET autoSec__comm priority 5 MAP BusBob autoSec__comm - SET autoSec__comm priority 0 + SET autoSec__comm priority 5 MAP ExternalMemory autoSec__comm2 - SET autoSec__comm2 priority 0 + SET autoSec__comm2 priority 5 MAP ExternalBus autoSec__comm2 - SET autoSec__comm2 priority 0 + SET autoSec__comm2 priority 5 MAP BusBob autoSec__comm2 - SET autoSec__comm2 priority 0 + SET autoSec__comm2 priority 5 MAP BusAlice autoSec__comm2 - SET autoSec__comm2 priority 0 + SET autoSec__comm2 priority 5 MAP ExternalMemory autoSec__comm3 - SET autoSec__comm3 priority 0 + SET autoSec__comm3 priority 5 MAP BusBob autoSec__comm3 - SET autoSec__comm3 priority 0 + SET autoSec__comm3 priority 5 MAP BusAlice autoSec__comm3 - SET autoSec__comm3 priority 0 + SET autoSec__comm3 priority 5 MAP ExternalBus autoSec__comm3 - SET autoSec__comm3 priority 0 + SET autoSec__comm3 priority 5 MAP ExternalMemory autoSec__comm4 - SET autoSec__comm4 priority 0 + SET autoSec__comm4 priority 5 MAP BusBob autoSec__comm4 - SET autoSec__comm4 priority 0 + SET autoSec__comm4 priority 5 MAP BusAlice autoSec__comm4 - SET autoSec__comm4 priority 0 + SET autoSec__comm4 priority 5 MAP ExternalBus autoSec__comm4 - SET autoSec__comm4 priority 0 + SET autoSec__comm4 priority 5 MAP MemoryAlice autoSec__dataCh_Alice_comm3 - SET autoSec__dataCh_Alice_comm3 priority 0 + SET autoSec__dataCh_Alice_comm3 priority 5 MAP Bus_HSM_Alice autoSec__dataCh_Alice_comm3 - SET autoSec__dataCh_Alice_comm3 priority 0 + SET autoSec__dataCh_Alice_comm3 priority 5 MAP BusAlice autoSec__dataCh_Alice_comm3 - SET autoSec__dataCh_Alice_comm3 priority 0 + SET autoSec__dataCh_Alice_comm3 priority 5 MAP MemoryAlice autoSec__dataNonceChAlice_Bob0 - SET autoSec__dataNonceChAlice_Bob0 priority 0 + SET autoSec__dataNonceChAlice_Bob0 priority 5 MAP Bus_HSM_Alice autoSec__dataNonceChAlice_Bob0 - SET autoSec__dataNonceChAlice_Bob0 priority 0 + SET autoSec__dataNonceChAlice_Bob0 priority 5 MAP BusAlice autoSec__dataNonceChAlice_Bob0 - SET autoSec__dataNonceChAlice_Bob0 priority 0 + SET autoSec__dataNonceChAlice_Bob0 priority 5 MAP MemoryAlice autoSec__dataCh_Alice_comm4 - SET autoSec__dataCh_Alice_comm4 priority 0 + SET autoSec__dataCh_Alice_comm4 priority 5 MAP Bus_HSM_Alice autoSec__dataCh_Alice_comm4 - SET autoSec__dataCh_Alice_comm4 priority 0 + SET autoSec__dataCh_Alice_comm4 priority 5 MAP BusAlice autoSec__dataCh_Alice_comm4 - SET autoSec__dataCh_Alice_comm4 priority 0 + SET autoSec__dataCh_Alice_comm4 priority 5 MAP MemoryAlice autoSec__dataCh_Alice_comm - SET autoSec__dataCh_Alice_comm priority 0 + SET autoSec__dataCh_Alice_comm priority 5 MAP Bus_HSM_Alice autoSec__dataCh_Alice_comm - SET autoSec__dataCh_Alice_comm priority 0 + SET autoSec__dataCh_Alice_comm priority 5 MAP BusAlice autoSec__dataCh_Alice_comm - SET autoSec__dataCh_Alice_comm priority 0 + SET autoSec__dataCh_Alice_comm priority 5 MAP MemoryAlice autoSec__dataCh_Alice_comm1 - SET autoSec__dataCh_Alice_comm1 priority 0 + SET autoSec__dataCh_Alice_comm1 priority 5 MAP Bus_HSM_Alice autoSec__dataCh_Alice_comm1 - SET autoSec__dataCh_Alice_comm1 priority 0 + SET autoSec__dataCh_Alice_comm1 priority 5 MAP BusAlice autoSec__dataCh_Alice_comm1 - SET autoSec__dataCh_Alice_comm1 priority 0 + SET autoSec__dataCh_Alice_comm1 priority 5 MAP MemoryAlice autoSec__dataNonceChAlice_Bob - SET autoSec__dataNonceChAlice_Bob priority 0 + SET autoSec__dataNonceChAlice_Bob priority 5 MAP Bus_HSM_Alice autoSec__dataNonceChAlice_Bob - SET autoSec__dataNonceChAlice_Bob priority 0 + SET autoSec__dataNonceChAlice_Bob priority 5 MAP BusAlice autoSec__dataNonceChAlice_Bob - SET autoSec__dataNonceChAlice_Bob priority 0 + SET autoSec__dataNonceChAlice_Bob priority 5 MAP MemoryAlice autoSec__dataCh_Alice_comm2 - SET autoSec__dataCh_Alice_comm2 priority 0 + SET autoSec__dataCh_Alice_comm2 priority 5 MAP Bus_HSM_Alice autoSec__dataCh_Alice_comm2 - SET autoSec__dataCh_Alice_comm2 priority 0 + SET autoSec__dataCh_Alice_comm2 priority 5 MAP BusAlice autoSec__dataCh_Alice_comm2 - SET autoSec__dataCh_Alice_comm2 priority 0 + SET autoSec__dataCh_Alice_comm2 priority 5 MAP Memory_HSM_Alice autoSec__retDataCh_Alice_comm3 - SET autoSec__retDataCh_Alice_comm3 priority 0 + SET autoSec__retDataCh_Alice_comm3 priority 5 MAP Bus_HSM_Alice autoSec__retDataCh_Alice_comm3 - SET autoSec__retDataCh_Alice_comm3 priority 0 + SET autoSec__retDataCh_Alice_comm3 priority 5 MAP BusAlice autoSec__retDataCh_Alice_comm3 - SET autoSec__retDataCh_Alice_comm3 priority 0 + SET autoSec__retDataCh_Alice_comm3 priority 5 MAP Memory_HSM_Alice autoSec__retDataCh_Alice_comm4 - SET autoSec__retDataCh_Alice_comm4 priority 0 + SET autoSec__retDataCh_Alice_comm4 priority 5 MAP Bus_HSM_Alice autoSec__retDataCh_Alice_comm4 - SET autoSec__retDataCh_Alice_comm4 priority 0 + SET autoSec__retDataCh_Alice_comm4 priority 5 MAP BusAlice autoSec__retDataCh_Alice_comm4 - SET autoSec__retDataCh_Alice_comm4 priority 0 + SET autoSec__retDataCh_Alice_comm4 priority 5 MAP Memory_HSM_Alice autoSec__retDataCh_Alice_comm - SET autoSec__retDataCh_Alice_comm priority 0 + SET autoSec__retDataCh_Alice_comm priority 5 MAP Bus_HSM_Alice autoSec__retDataCh_Alice_comm - SET autoSec__retDataCh_Alice_comm priority 0 + SET autoSec__retDataCh_Alice_comm priority 5 MAP BusAlice autoSec__retDataCh_Alice_comm - SET autoSec__retDataCh_Alice_comm priority 0 + SET autoSec__retDataCh_Alice_comm priority 5 MAP Memory_HSM_Alice autoSec__retDataCh_Alice_comm1 - SET autoSec__retDataCh_Alice_comm1 priority 0 + SET autoSec__retDataCh_Alice_comm1 priority 5 MAP Bus_HSM_Alice autoSec__retDataCh_Alice_comm1 - SET autoSec__retDataCh_Alice_comm1 priority 0 + SET autoSec__retDataCh_Alice_comm1 priority 5 MAP BusAlice autoSec__retDataCh_Alice_comm1 - SET autoSec__retDataCh_Alice_comm1 priority 0 + SET autoSec__retDataCh_Alice_comm1 priority 5 MAP Memory_HSM_Alice autoSec__retDataCh_Alice_comm2 - SET autoSec__retDataCh_Alice_comm2 priority 0 + SET autoSec__retDataCh_Alice_comm2 priority 5 MAP Bus_HSM_Alice autoSec__retDataCh_Alice_comm2 - SET autoSec__retDataCh_Alice_comm2 priority 0 + SET autoSec__retDataCh_Alice_comm2 priority 5 MAP BusAlice autoSec__retDataCh_Alice_comm2 - SET autoSec__retDataCh_Alice_comm2 priority 0 + SET autoSec__retDataCh_Alice_comm2 priority 5 MAPSEC MemoryBob se_comm1 MAPSEC Memory_HSM_Alice se_comm1 MAPSEC MemoryBob mac_comm4 diff --git a/ttool/src/test/resources/tmltranslator/AutoSecGenDiplodocusTest/Models/modelWithMultiChannels/CasesWithPrivateHSMs/CaseWithHSMAliceBob/golden/spec.tmap b/ttool/src/test/resources/tmltranslator/AutoSecGenDiplodocusTest/Models/modelWithMultiChannels/CasesWithPrivateHSMs/CaseWithHSMAliceBob/golden/spec.tmap index b3b1f9efb3a0b97b03bd0044661416dddb18d24b..8f1c0678d4794ff291931f84ad42ce19fc389019 100644 --- a/ttool/src/test/resources/tmltranslator/AutoSecGenDiplodocusTest/Models/modelWithMultiChannels/CasesWithPrivateHSMs/CaseWithHSMAliceBob/golden/spec.tmap +++ b/ttool/src/test/resources/tmltranslator/AutoSecGenDiplodocusTest/Models/modelWithMultiChannels/CasesWithPrivateHSMs/CaseWithHSMAliceBob/golden/spec.tmap @@ -8,229 +8,229 @@ ENDTMLARCHI TMLMAPPING MAP CPUAlice autoSec__Alice - SET autoSec__Alice priority 0 + SET autoSec__Alice priority 5 MAP CPUBob autoSec__Bob - SET autoSec__Bob priority 0 + SET autoSec__Bob priority 5 MAP HwA_HSM_Alice_Encrypt_comm3 autoSec__HSM_Alice_Encrypt_comm3 - SET autoSec__HSM_Alice_Encrypt_comm3 priority 0 + SET autoSec__HSM_Alice_Encrypt_comm3 priority 5 MAP HwA_HSM_Bob_Decrypt_comm autoSec__HSM_Bob_Decrypt_comm - SET autoSec__HSM_Bob_Decrypt_comm priority 0 + SET autoSec__HSM_Bob_Decrypt_comm priority 5 MAP HwA_HSM_Bob_Decrypt_comm3 autoSec__HSM_Bob_Decrypt_comm3 - SET autoSec__HSM_Bob_Decrypt_comm3 priority 0 + SET autoSec__HSM_Bob_Decrypt_comm3 priority 5 MAP HwA_HSM_Bob_Decrypt_comm2 autoSec__HSM_Bob_Decrypt_comm2 - SET autoSec__HSM_Bob_Decrypt_comm2 priority 0 + SET autoSec__HSM_Bob_Decrypt_comm2 priority 5 MAP HwA_HSM_Alice_Encrypt_comm1 autoSec__HSM_Alice_Encrypt_comm1 - SET autoSec__HSM_Alice_Encrypt_comm1 priority 0 + SET autoSec__HSM_Alice_Encrypt_comm1 priority 5 MAP HwA_HSM_Alice_Encrypt_comm2 autoSec__HSM_Alice_Encrypt_comm2 - SET autoSec__HSM_Alice_Encrypt_comm2 priority 0 + SET autoSec__HSM_Alice_Encrypt_comm2 priority 5 MAP HwA_HSM_Bob_Decrypt_comm4 autoSec__HSM_Bob_Decrypt_comm4 - SET autoSec__HSM_Bob_Decrypt_comm4 priority 0 + SET autoSec__HSM_Bob_Decrypt_comm4 priority 5 MAP HwA_HSM_Alice_Encrypt_comm autoSec__HSM_Alice_Encrypt_comm - SET autoSec__HSM_Alice_Encrypt_comm priority 0 + SET autoSec__HSM_Alice_Encrypt_comm priority 5 MAP HwA_HSM_Bob_Decrypt_comm1 autoSec__HSM_Bob_Decrypt_comm1 - SET autoSec__HSM_Bob_Decrypt_comm1 priority 0 + SET autoSec__HSM_Bob_Decrypt_comm1 priority 5 MAP HwA_HSM_Alice_Encrypt_comm4 autoSec__HSM_Alice_Encrypt_comm4 - SET autoSec__HSM_Alice_Encrypt_comm4 priority 0 + SET autoSec__HSM_Alice_Encrypt_comm4 priority 5 MAP ExternalMemory autoSec__nonceChBob_Alice_comm4 - SET autoSec__nonceChBob_Alice_comm4 priority 0 + SET autoSec__nonceChBob_Alice_comm4 priority 5 MAP BusBob autoSec__nonceChBob_Alice_comm4 - SET autoSec__nonceChBob_Alice_comm4 priority 0 + SET autoSec__nonceChBob_Alice_comm4 priority 5 MAP BusAlice autoSec__nonceChBob_Alice_comm4 - SET autoSec__nonceChBob_Alice_comm4 priority 0 + SET autoSec__nonceChBob_Alice_comm4 priority 5 MAP ExternalBus autoSec__nonceChBob_Alice_comm4 - SET autoSec__nonceChBob_Alice_comm4 priority 0 + SET autoSec__nonceChBob_Alice_comm4 priority 5 MAP ExternalMemory autoSec__nonceChBob_Alice_comm2 - SET autoSec__nonceChBob_Alice_comm2 priority 0 + SET autoSec__nonceChBob_Alice_comm2 priority 5 MAP ExternalBus autoSec__nonceChBob_Alice_comm2 - SET autoSec__nonceChBob_Alice_comm2 priority 0 + SET autoSec__nonceChBob_Alice_comm2 priority 5 MAP BusBob autoSec__nonceChBob_Alice_comm2 - SET autoSec__nonceChBob_Alice_comm2 priority 0 + SET autoSec__nonceChBob_Alice_comm2 priority 5 MAP BusAlice autoSec__nonceChBob_Alice_comm2 - SET autoSec__nonceChBob_Alice_comm2 priority 0 + SET autoSec__nonceChBob_Alice_comm2 priority 5 MAP ExternalMemory autoSec__comm1 - SET autoSec__comm1 priority 0 + SET autoSec__comm1 priority 5 MAP BusBob autoSec__comm1 - SET autoSec__comm1 priority 0 + SET autoSec__comm1 priority 5 MAP BusAlice autoSec__comm1 - SET autoSec__comm1 priority 0 + SET autoSec__comm1 priority 5 MAP ExternalBus autoSec__comm1 - SET autoSec__comm1 priority 0 + SET autoSec__comm1 priority 5 MAP ExternalMemory autoSec__comm - SET autoSec__comm priority 0 + SET autoSec__comm priority 5 MAP ExternalBus autoSec__comm - SET autoSec__comm priority 0 + SET autoSec__comm priority 5 MAP BusAlice autoSec__comm - SET autoSec__comm priority 0 + SET autoSec__comm priority 5 MAP BusBob autoSec__comm - SET autoSec__comm priority 0 + SET autoSec__comm priority 5 MAP ExternalMemory autoSec__comm2 - SET autoSec__comm2 priority 0 + SET autoSec__comm2 priority 5 MAP ExternalBus autoSec__comm2 - SET autoSec__comm2 priority 0 + SET autoSec__comm2 priority 5 MAP BusBob autoSec__comm2 - SET autoSec__comm2 priority 0 + SET autoSec__comm2 priority 5 MAP BusAlice autoSec__comm2 - SET autoSec__comm2 priority 0 + SET autoSec__comm2 priority 5 MAP ExternalMemory autoSec__comm3 - SET autoSec__comm3 priority 0 + SET autoSec__comm3 priority 5 MAP BusBob autoSec__comm3 - SET autoSec__comm3 priority 0 + SET autoSec__comm3 priority 5 MAP BusAlice autoSec__comm3 - SET autoSec__comm3 priority 0 + SET autoSec__comm3 priority 5 MAP ExternalBus autoSec__comm3 - SET autoSec__comm3 priority 0 + SET autoSec__comm3 priority 5 MAP ExternalMemory autoSec__comm4 - SET autoSec__comm4 priority 0 + SET autoSec__comm4 priority 5 MAP BusBob autoSec__comm4 - SET autoSec__comm4 priority 0 + SET autoSec__comm4 priority 5 MAP BusAlice autoSec__comm4 - SET autoSec__comm4 priority 0 + SET autoSec__comm4 priority 5 MAP ExternalBus autoSec__comm4 - SET autoSec__comm4 priority 0 + SET autoSec__comm4 priority 5 MAP MemoryAlice autoSec__dataCh_Alice_comm3 - SET autoSec__dataCh_Alice_comm3 priority 0 + SET autoSec__dataCh_Alice_comm3 priority 5 MAP BusAlice autoSec__dataCh_Alice_comm3 - SET autoSec__dataCh_Alice_comm3 priority 0 + SET autoSec__dataCh_Alice_comm3 priority 5 MAP Bus_HSM_Alice autoSec__dataCh_Alice_comm3 - SET autoSec__dataCh_Alice_comm3 priority 0 + SET autoSec__dataCh_Alice_comm3 priority 5 MAP MemoryAlice autoSec__dataNonceChAlice_Bob0 - SET autoSec__dataNonceChAlice_Bob0 priority 0 + SET autoSec__dataNonceChAlice_Bob0 priority 5 MAP BusAlice autoSec__dataNonceChAlice_Bob0 - SET autoSec__dataNonceChAlice_Bob0 priority 0 + SET autoSec__dataNonceChAlice_Bob0 priority 5 MAP Bus_HSM_Alice autoSec__dataNonceChAlice_Bob0 - SET autoSec__dataNonceChAlice_Bob0 priority 0 + SET autoSec__dataNonceChAlice_Bob0 priority 5 MAP MemoryAlice autoSec__dataCh_Alice_comm4 - SET autoSec__dataCh_Alice_comm4 priority 0 + SET autoSec__dataCh_Alice_comm4 priority 5 MAP BusAlice autoSec__dataCh_Alice_comm4 - SET autoSec__dataCh_Alice_comm4 priority 0 + SET autoSec__dataCh_Alice_comm4 priority 5 MAP Bus_HSM_Alice autoSec__dataCh_Alice_comm4 - SET autoSec__dataCh_Alice_comm4 priority 0 + SET autoSec__dataCh_Alice_comm4 priority 5 MAP MemoryAlice autoSec__dataCh_Alice_comm1 - SET autoSec__dataCh_Alice_comm1 priority 0 + SET autoSec__dataCh_Alice_comm1 priority 5 MAP BusAlice autoSec__dataCh_Alice_comm1 - SET autoSec__dataCh_Alice_comm1 priority 0 + SET autoSec__dataCh_Alice_comm1 priority 5 MAP Bus_HSM_Alice autoSec__dataCh_Alice_comm1 - SET autoSec__dataCh_Alice_comm1 priority 0 + SET autoSec__dataCh_Alice_comm1 priority 5 MAP MemoryAlice autoSec__dataCh_Alice_comm - SET autoSec__dataCh_Alice_comm priority 0 + SET autoSec__dataCh_Alice_comm priority 5 MAP BusAlice autoSec__dataCh_Alice_comm - SET autoSec__dataCh_Alice_comm priority 0 + SET autoSec__dataCh_Alice_comm priority 5 MAP Bus_HSM_Alice autoSec__dataCh_Alice_comm - SET autoSec__dataCh_Alice_comm priority 0 + SET autoSec__dataCh_Alice_comm priority 5 MAP MemoryAlice autoSec__dataNonceChAlice_Bob - SET autoSec__dataNonceChAlice_Bob priority 0 + SET autoSec__dataNonceChAlice_Bob priority 5 MAP BusAlice autoSec__dataNonceChAlice_Bob - SET autoSec__dataNonceChAlice_Bob priority 0 + SET autoSec__dataNonceChAlice_Bob priority 5 MAP Bus_HSM_Alice autoSec__dataNonceChAlice_Bob - SET autoSec__dataNonceChAlice_Bob priority 0 + SET autoSec__dataNonceChAlice_Bob priority 5 MAP MemoryAlice autoSec__dataCh_Alice_comm2 - SET autoSec__dataCh_Alice_comm2 priority 0 + SET autoSec__dataCh_Alice_comm2 priority 5 MAP BusAlice autoSec__dataCh_Alice_comm2 - SET autoSec__dataCh_Alice_comm2 priority 0 + SET autoSec__dataCh_Alice_comm2 priority 5 MAP Bus_HSM_Alice autoSec__dataCh_Alice_comm2 - SET autoSec__dataCh_Alice_comm2 priority 0 + SET autoSec__dataCh_Alice_comm2 priority 5 MAP MemoryBob autoSec__dataCh_Bob_comm3 - SET autoSec__dataCh_Bob_comm3 priority 0 + SET autoSec__dataCh_Bob_comm3 priority 5 MAP BusBob autoSec__dataCh_Bob_comm3 - SET autoSec__dataCh_Bob_comm3 priority 0 + SET autoSec__dataCh_Bob_comm3 priority 5 MAP Bus_HSM_Bob autoSec__dataCh_Bob_comm3 - SET autoSec__dataCh_Bob_comm3 priority 0 + SET autoSec__dataCh_Bob_comm3 priority 5 MAP MemoryBob autoSec__dataCh_Bob_comm4 - SET autoSec__dataCh_Bob_comm4 priority 0 + SET autoSec__dataCh_Bob_comm4 priority 5 MAP BusBob autoSec__dataCh_Bob_comm4 - SET autoSec__dataCh_Bob_comm4 priority 0 + SET autoSec__dataCh_Bob_comm4 priority 5 MAP Bus_HSM_Bob autoSec__dataCh_Bob_comm4 - SET autoSec__dataCh_Bob_comm4 priority 0 + SET autoSec__dataCh_Bob_comm4 priority 5 MAP MemoryBob autoSec__dataCh_Bob_comm1 - SET autoSec__dataCh_Bob_comm1 priority 0 + SET autoSec__dataCh_Bob_comm1 priority 5 MAP BusBob autoSec__dataCh_Bob_comm1 - SET autoSec__dataCh_Bob_comm1 priority 0 + SET autoSec__dataCh_Bob_comm1 priority 5 MAP Bus_HSM_Bob autoSec__dataCh_Bob_comm1 - SET autoSec__dataCh_Bob_comm1 priority 0 + SET autoSec__dataCh_Bob_comm1 priority 5 MAP MemoryBob autoSec__dataCh_Bob_comm - SET autoSec__dataCh_Bob_comm priority 0 + SET autoSec__dataCh_Bob_comm priority 5 MAP BusBob autoSec__dataCh_Bob_comm - SET autoSec__dataCh_Bob_comm priority 0 + SET autoSec__dataCh_Bob_comm priority 5 MAP Bus_HSM_Bob autoSec__dataCh_Bob_comm - SET autoSec__dataCh_Bob_comm priority 0 + SET autoSec__dataCh_Bob_comm priority 5 MAP MemoryBob autoSec__dataCh_Bob_comm2 - SET autoSec__dataCh_Bob_comm2 priority 0 + SET autoSec__dataCh_Bob_comm2 priority 5 MAP BusBob autoSec__dataCh_Bob_comm2 - SET autoSec__dataCh_Bob_comm2 priority 0 + SET autoSec__dataCh_Bob_comm2 priority 5 MAP Bus_HSM_Bob autoSec__dataCh_Bob_comm2 - SET autoSec__dataCh_Bob_comm2 priority 0 + SET autoSec__dataCh_Bob_comm2 priority 5 MAP Memory_HSM_Alice autoSec__retDataCh_Alice_comm3 - SET autoSec__retDataCh_Alice_comm3 priority 0 + SET autoSec__retDataCh_Alice_comm3 priority 5 MAP BusAlice autoSec__retDataCh_Alice_comm3 - SET autoSec__retDataCh_Alice_comm3 priority 0 + SET autoSec__retDataCh_Alice_comm3 priority 5 MAP Bus_HSM_Alice autoSec__retDataCh_Alice_comm3 - SET autoSec__retDataCh_Alice_comm3 priority 0 + SET autoSec__retDataCh_Alice_comm3 priority 5 MAP Memory_HSM_Alice autoSec__retDataCh_Alice_comm4 - SET autoSec__retDataCh_Alice_comm4 priority 0 + SET autoSec__retDataCh_Alice_comm4 priority 5 MAP BusAlice autoSec__retDataCh_Alice_comm4 - SET autoSec__retDataCh_Alice_comm4 priority 0 + SET autoSec__retDataCh_Alice_comm4 priority 5 MAP Bus_HSM_Alice autoSec__retDataCh_Alice_comm4 - SET autoSec__retDataCh_Alice_comm4 priority 0 + SET autoSec__retDataCh_Alice_comm4 priority 5 MAP Memory_HSM_Alice autoSec__retDataCh_Alice_comm1 - SET autoSec__retDataCh_Alice_comm1 priority 0 + SET autoSec__retDataCh_Alice_comm1 priority 5 MAP BusAlice autoSec__retDataCh_Alice_comm1 - SET autoSec__retDataCh_Alice_comm1 priority 0 + SET autoSec__retDataCh_Alice_comm1 priority 5 MAP Bus_HSM_Alice autoSec__retDataCh_Alice_comm1 - SET autoSec__retDataCh_Alice_comm1 priority 0 + SET autoSec__retDataCh_Alice_comm1 priority 5 MAP Memory_HSM_Alice autoSec__retDataCh_Alice_comm - SET autoSec__retDataCh_Alice_comm priority 0 + SET autoSec__retDataCh_Alice_comm priority 5 MAP BusAlice autoSec__retDataCh_Alice_comm - SET autoSec__retDataCh_Alice_comm priority 0 + SET autoSec__retDataCh_Alice_comm priority 5 MAP Bus_HSM_Alice autoSec__retDataCh_Alice_comm - SET autoSec__retDataCh_Alice_comm priority 0 + SET autoSec__retDataCh_Alice_comm priority 5 MAP Memory_HSM_Alice autoSec__retDataCh_Alice_comm2 - SET autoSec__retDataCh_Alice_comm2 priority 0 + SET autoSec__retDataCh_Alice_comm2 priority 5 MAP BusAlice autoSec__retDataCh_Alice_comm2 - SET autoSec__retDataCh_Alice_comm2 priority 0 + SET autoSec__retDataCh_Alice_comm2 priority 5 MAP Bus_HSM_Alice autoSec__retDataCh_Alice_comm2 - SET autoSec__retDataCh_Alice_comm2 priority 0 + SET autoSec__retDataCh_Alice_comm2 priority 5 MAP Memory_HSM_Bob autoSec__retDataCh_Bob_comm3 - SET autoSec__retDataCh_Bob_comm3 priority 0 + SET autoSec__retDataCh_Bob_comm3 priority 5 MAP BusBob autoSec__retDataCh_Bob_comm3 - SET autoSec__retDataCh_Bob_comm3 priority 0 + SET autoSec__retDataCh_Bob_comm3 priority 5 MAP Bus_HSM_Bob autoSec__retDataCh_Bob_comm3 - SET autoSec__retDataCh_Bob_comm3 priority 0 + SET autoSec__retDataCh_Bob_comm3 priority 5 MAP Memory_HSM_Bob autoSec__retDataCh_Bob_comm4 - SET autoSec__retDataCh_Bob_comm4 priority 0 + SET autoSec__retDataCh_Bob_comm4 priority 5 MAP BusBob autoSec__retDataCh_Bob_comm4 - SET autoSec__retDataCh_Bob_comm4 priority 0 + SET autoSec__retDataCh_Bob_comm4 priority 5 MAP Bus_HSM_Bob autoSec__retDataCh_Bob_comm4 - SET autoSec__retDataCh_Bob_comm4 priority 0 + SET autoSec__retDataCh_Bob_comm4 priority 5 MAP Memory_HSM_Bob autoSec__retDataNonceChAlice_Bob0 - SET autoSec__retDataNonceChAlice_Bob0 priority 0 + SET autoSec__retDataNonceChAlice_Bob0 priority 5 MAP BusBob autoSec__retDataNonceChAlice_Bob0 - SET autoSec__retDataNonceChAlice_Bob0 priority 0 + SET autoSec__retDataNonceChAlice_Bob0 priority 5 MAP Bus_HSM_Bob autoSec__retDataNonceChAlice_Bob0 - SET autoSec__retDataNonceChAlice_Bob0 priority 0 + SET autoSec__retDataNonceChAlice_Bob0 priority 5 MAP Memory_HSM_Bob autoSec__retDataCh_Bob_comm1 - SET autoSec__retDataCh_Bob_comm1 priority 0 + SET autoSec__retDataCh_Bob_comm1 priority 5 MAP BusBob autoSec__retDataCh_Bob_comm1 - SET autoSec__retDataCh_Bob_comm1 priority 0 + SET autoSec__retDataCh_Bob_comm1 priority 5 MAP Bus_HSM_Bob autoSec__retDataCh_Bob_comm1 - SET autoSec__retDataCh_Bob_comm1 priority 0 + SET autoSec__retDataCh_Bob_comm1 priority 5 MAP Memory_HSM_Bob autoSec__retDataCh_Bob_comm - SET autoSec__retDataCh_Bob_comm priority 0 + SET autoSec__retDataCh_Bob_comm priority 5 MAP BusBob autoSec__retDataCh_Bob_comm - SET autoSec__retDataCh_Bob_comm priority 0 + SET autoSec__retDataCh_Bob_comm priority 5 MAP Bus_HSM_Bob autoSec__retDataCh_Bob_comm - SET autoSec__retDataCh_Bob_comm priority 0 + SET autoSec__retDataCh_Bob_comm priority 5 MAP Memory_HSM_Bob autoSec__retDataCh_Bob_comm2 - SET autoSec__retDataCh_Bob_comm2 priority 0 + SET autoSec__retDataCh_Bob_comm2 priority 5 MAP BusBob autoSec__retDataCh_Bob_comm2 - SET autoSec__retDataCh_Bob_comm2 priority 0 + SET autoSec__retDataCh_Bob_comm2 priority 5 MAP Bus_HSM_Bob autoSec__retDataCh_Bob_comm2 - SET autoSec__retDataCh_Bob_comm2 priority 0 + SET autoSec__retDataCh_Bob_comm2 priority 5 MAP Memory_HSM_Bob autoSec__retDataNonceChAlice_Bob - SET autoSec__retDataNonceChAlice_Bob priority 0 + SET autoSec__retDataNonceChAlice_Bob priority 5 MAP BusBob autoSec__retDataNonceChAlice_Bob - SET autoSec__retDataNonceChAlice_Bob priority 0 + SET autoSec__retDataNonceChAlice_Bob priority 5 MAP Bus_HSM_Bob autoSec__retDataNonceChAlice_Bob - SET autoSec__retDataNonceChAlice_Bob priority 0 + SET autoSec__retDataNonceChAlice_Bob priority 5 MAPSEC Memory_HSM_Alice se_comm2 MAPSEC Memory_HSM_Bob se_comm2 MAPSEC Memory_HSM_Alice mac_comm3 diff --git a/ttool/src/test/resources/tmltranslator/AutoSecGenDiplodocusTest/Models/modelWithMultiChannels/CasesWithPrivateHSMs/CaseWithHSMBob/golden/spec.tmap b/ttool/src/test/resources/tmltranslator/AutoSecGenDiplodocusTest/Models/modelWithMultiChannels/CasesWithPrivateHSMs/CaseWithHSMBob/golden/spec.tmap index d9ba439d69dc9db05f1b6e7feb78ffe65c619a2f..c273a708cd94b1ed99d755549b018b848b88061a 100644 --- a/ttool/src/test/resources/tmltranslator/AutoSecGenDiplodocusTest/Models/modelWithMultiChannels/CasesWithPrivateHSMs/CaseWithHSMBob/golden/spec.tmap +++ b/ttool/src/test/resources/tmltranslator/AutoSecGenDiplodocusTest/Models/modelWithMultiChannels/CasesWithPrivateHSMs/CaseWithHSMBob/golden/spec.tmap @@ -8,147 +8,147 @@ ENDTMLARCHI TMLMAPPING MAP CPUAlice autoSec__Alice - SET autoSec__Alice priority 0 + SET autoSec__Alice priority 5 MAP CPUBob autoSec__Bob - SET autoSec__Bob priority 0 + SET autoSec__Bob priority 5 MAP HwA_HSM_Bob_Decrypt_comm2 autoSec__HSM_Bob_Decrypt_comm2 - SET autoSec__HSM_Bob_Decrypt_comm2 priority 0 + SET autoSec__HSM_Bob_Decrypt_comm2 priority 5 MAP HwA_HSM_Bob_Decrypt_comm4 autoSec__HSM_Bob_Decrypt_comm4 - SET autoSec__HSM_Bob_Decrypt_comm4 priority 0 + SET autoSec__HSM_Bob_Decrypt_comm4 priority 5 MAP HwA_HSM_Bob_Decrypt_comm autoSec__HSM_Bob_Decrypt_comm - SET autoSec__HSM_Bob_Decrypt_comm priority 0 + SET autoSec__HSM_Bob_Decrypt_comm priority 5 MAP HwA_HSM_Bob_Decrypt_comm3 autoSec__HSM_Bob_Decrypt_comm3 - SET autoSec__HSM_Bob_Decrypt_comm3 priority 0 + SET autoSec__HSM_Bob_Decrypt_comm3 priority 5 MAP HwA_HSM_Bob_Decrypt_comm1 autoSec__HSM_Bob_Decrypt_comm1 - SET autoSec__HSM_Bob_Decrypt_comm1 priority 0 + SET autoSec__HSM_Bob_Decrypt_comm1 priority 5 MAP ExternalMemory autoSec__nonceChBob_Alice_comm4 - SET autoSec__nonceChBob_Alice_comm4 priority 0 + SET autoSec__nonceChBob_Alice_comm4 priority 5 MAP BusBob autoSec__nonceChBob_Alice_comm4 - SET autoSec__nonceChBob_Alice_comm4 priority 0 + SET autoSec__nonceChBob_Alice_comm4 priority 5 MAP BusAlice autoSec__nonceChBob_Alice_comm4 - SET autoSec__nonceChBob_Alice_comm4 priority 0 + SET autoSec__nonceChBob_Alice_comm4 priority 5 MAP ExternalBus autoSec__nonceChBob_Alice_comm4 - SET autoSec__nonceChBob_Alice_comm4 priority 0 + SET autoSec__nonceChBob_Alice_comm4 priority 5 MAP ExternalMemory autoSec__nonceChBob_Alice_comm2 - SET autoSec__nonceChBob_Alice_comm2 priority 0 + SET autoSec__nonceChBob_Alice_comm2 priority 5 MAP ExternalBus autoSec__nonceChBob_Alice_comm2 - SET autoSec__nonceChBob_Alice_comm2 priority 0 + SET autoSec__nonceChBob_Alice_comm2 priority 5 MAP BusBob autoSec__nonceChBob_Alice_comm2 - SET autoSec__nonceChBob_Alice_comm2 priority 0 + SET autoSec__nonceChBob_Alice_comm2 priority 5 MAP BusAlice autoSec__nonceChBob_Alice_comm2 - SET autoSec__nonceChBob_Alice_comm2 priority 0 + SET autoSec__nonceChBob_Alice_comm2 priority 5 MAP ExternalMemory autoSec__comm1 - SET autoSec__comm1 priority 0 + SET autoSec__comm1 priority 5 MAP BusBob autoSec__comm1 - SET autoSec__comm1 priority 0 + SET autoSec__comm1 priority 5 MAP BusAlice autoSec__comm1 - SET autoSec__comm1 priority 0 + SET autoSec__comm1 priority 5 MAP ExternalBus autoSec__comm1 - SET autoSec__comm1 priority 0 + SET autoSec__comm1 priority 5 MAP ExternalMemory autoSec__comm - SET autoSec__comm priority 0 + SET autoSec__comm priority 5 MAP ExternalBus autoSec__comm - SET autoSec__comm priority 0 + SET autoSec__comm priority 5 MAP BusAlice autoSec__comm - SET autoSec__comm priority 0 + SET autoSec__comm priority 5 MAP BusBob autoSec__comm - SET autoSec__comm priority 0 + SET autoSec__comm priority 5 MAP ExternalMemory autoSec__comm2 - SET autoSec__comm2 priority 0 + SET autoSec__comm2 priority 5 MAP ExternalBus autoSec__comm2 - SET autoSec__comm2 priority 0 + SET autoSec__comm2 priority 5 MAP BusBob autoSec__comm2 - SET autoSec__comm2 priority 0 + SET autoSec__comm2 priority 5 MAP BusAlice autoSec__comm2 - SET autoSec__comm2 priority 0 + SET autoSec__comm2 priority 5 MAP ExternalMemory autoSec__comm3 - SET autoSec__comm3 priority 0 + SET autoSec__comm3 priority 5 MAP BusBob autoSec__comm3 - SET autoSec__comm3 priority 0 + SET autoSec__comm3 priority 5 MAP BusAlice autoSec__comm3 - SET autoSec__comm3 priority 0 + SET autoSec__comm3 priority 5 MAP ExternalBus autoSec__comm3 - SET autoSec__comm3 priority 0 + SET autoSec__comm3 priority 5 MAP ExternalMemory autoSec__comm4 - SET autoSec__comm4 priority 0 + SET autoSec__comm4 priority 5 MAP BusBob autoSec__comm4 - SET autoSec__comm4 priority 0 + SET autoSec__comm4 priority 5 MAP BusAlice autoSec__comm4 - SET autoSec__comm4 priority 0 + SET autoSec__comm4 priority 5 MAP ExternalBus autoSec__comm4 - SET autoSec__comm4 priority 0 + SET autoSec__comm4 priority 5 MAP MemoryBob autoSec__dataCh_Bob_comm3 - SET autoSec__dataCh_Bob_comm3 priority 0 + SET autoSec__dataCh_Bob_comm3 priority 5 MAP Bus_HSM_Bob autoSec__dataCh_Bob_comm3 - SET autoSec__dataCh_Bob_comm3 priority 0 + SET autoSec__dataCh_Bob_comm3 priority 5 MAP BusBob autoSec__dataCh_Bob_comm3 - SET autoSec__dataCh_Bob_comm3 priority 0 + SET autoSec__dataCh_Bob_comm3 priority 5 MAP MemoryBob autoSec__dataCh_Bob_comm4 - SET autoSec__dataCh_Bob_comm4 priority 0 + SET autoSec__dataCh_Bob_comm4 priority 5 MAP Bus_HSM_Bob autoSec__dataCh_Bob_comm4 - SET autoSec__dataCh_Bob_comm4 priority 0 + SET autoSec__dataCh_Bob_comm4 priority 5 MAP BusBob autoSec__dataCh_Bob_comm4 - SET autoSec__dataCh_Bob_comm4 priority 0 + SET autoSec__dataCh_Bob_comm4 priority 5 MAP MemoryBob autoSec__dataCh_Bob_comm1 - SET autoSec__dataCh_Bob_comm1 priority 0 + SET autoSec__dataCh_Bob_comm1 priority 5 MAP Bus_HSM_Bob autoSec__dataCh_Bob_comm1 - SET autoSec__dataCh_Bob_comm1 priority 0 + SET autoSec__dataCh_Bob_comm1 priority 5 MAP BusBob autoSec__dataCh_Bob_comm1 - SET autoSec__dataCh_Bob_comm1 priority 0 + SET autoSec__dataCh_Bob_comm1 priority 5 MAP MemoryBob autoSec__dataCh_Bob_comm - SET autoSec__dataCh_Bob_comm priority 0 + SET autoSec__dataCh_Bob_comm priority 5 MAP Bus_HSM_Bob autoSec__dataCh_Bob_comm - SET autoSec__dataCh_Bob_comm priority 0 + SET autoSec__dataCh_Bob_comm priority 5 MAP BusBob autoSec__dataCh_Bob_comm - SET autoSec__dataCh_Bob_comm priority 0 + SET autoSec__dataCh_Bob_comm priority 5 MAP MemoryBob autoSec__dataCh_Bob_comm2 - SET autoSec__dataCh_Bob_comm2 priority 0 + SET autoSec__dataCh_Bob_comm2 priority 5 MAP Bus_HSM_Bob autoSec__dataCh_Bob_comm2 - SET autoSec__dataCh_Bob_comm2 priority 0 + SET autoSec__dataCh_Bob_comm2 priority 5 MAP BusBob autoSec__dataCh_Bob_comm2 - SET autoSec__dataCh_Bob_comm2 priority 0 + SET autoSec__dataCh_Bob_comm2 priority 5 MAP Memory_HSM_Bob autoSec__retDataCh_Bob_comm3 - SET autoSec__retDataCh_Bob_comm3 priority 0 + SET autoSec__retDataCh_Bob_comm3 priority 5 MAP Bus_HSM_Bob autoSec__retDataCh_Bob_comm3 - SET autoSec__retDataCh_Bob_comm3 priority 0 + SET autoSec__retDataCh_Bob_comm3 priority 5 MAP BusBob autoSec__retDataCh_Bob_comm3 - SET autoSec__retDataCh_Bob_comm3 priority 0 + SET autoSec__retDataCh_Bob_comm3 priority 5 MAP Memory_HSM_Bob autoSec__retDataNonceChAlice_Bob0 - SET autoSec__retDataNonceChAlice_Bob0 priority 0 + SET autoSec__retDataNonceChAlice_Bob0 priority 5 MAP Bus_HSM_Bob autoSec__retDataNonceChAlice_Bob0 - SET autoSec__retDataNonceChAlice_Bob0 priority 0 + SET autoSec__retDataNonceChAlice_Bob0 priority 5 MAP BusBob autoSec__retDataNonceChAlice_Bob0 - SET autoSec__retDataNonceChAlice_Bob0 priority 0 + SET autoSec__retDataNonceChAlice_Bob0 priority 5 MAP Memory_HSM_Bob autoSec__retDataCh_Bob_comm4 - SET autoSec__retDataCh_Bob_comm4 priority 0 + SET autoSec__retDataCh_Bob_comm4 priority 5 MAP Bus_HSM_Bob autoSec__retDataCh_Bob_comm4 - SET autoSec__retDataCh_Bob_comm4 priority 0 + SET autoSec__retDataCh_Bob_comm4 priority 5 MAP BusBob autoSec__retDataCh_Bob_comm4 - SET autoSec__retDataCh_Bob_comm4 priority 0 + SET autoSec__retDataCh_Bob_comm4 priority 5 MAP Memory_HSM_Bob autoSec__retDataCh_Bob_comm1 - SET autoSec__retDataCh_Bob_comm1 priority 0 + SET autoSec__retDataCh_Bob_comm1 priority 5 MAP Bus_HSM_Bob autoSec__retDataCh_Bob_comm1 - SET autoSec__retDataCh_Bob_comm1 priority 0 + SET autoSec__retDataCh_Bob_comm1 priority 5 MAP BusBob autoSec__retDataCh_Bob_comm1 - SET autoSec__retDataCh_Bob_comm1 priority 0 + SET autoSec__retDataCh_Bob_comm1 priority 5 MAP Memory_HSM_Bob autoSec__retDataCh_Bob_comm - SET autoSec__retDataCh_Bob_comm priority 0 + SET autoSec__retDataCh_Bob_comm priority 5 MAP Bus_HSM_Bob autoSec__retDataCh_Bob_comm - SET autoSec__retDataCh_Bob_comm priority 0 + SET autoSec__retDataCh_Bob_comm priority 5 MAP BusBob autoSec__retDataCh_Bob_comm - SET autoSec__retDataCh_Bob_comm priority 0 + SET autoSec__retDataCh_Bob_comm priority 5 MAP Memory_HSM_Bob autoSec__retDataNonceChAlice_Bob - SET autoSec__retDataNonceChAlice_Bob priority 0 + SET autoSec__retDataNonceChAlice_Bob priority 5 MAP Bus_HSM_Bob autoSec__retDataNonceChAlice_Bob - SET autoSec__retDataNonceChAlice_Bob priority 0 + SET autoSec__retDataNonceChAlice_Bob priority 5 MAP BusBob autoSec__retDataNonceChAlice_Bob - SET autoSec__retDataNonceChAlice_Bob priority 0 + SET autoSec__retDataNonceChAlice_Bob priority 5 MAP Memory_HSM_Bob autoSec__retDataCh_Bob_comm2 - SET autoSec__retDataCh_Bob_comm2 priority 0 + SET autoSec__retDataCh_Bob_comm2 priority 5 MAP Bus_HSM_Bob autoSec__retDataCh_Bob_comm2 - SET autoSec__retDataCh_Bob_comm2 priority 0 + SET autoSec__retDataCh_Bob_comm2 priority 5 MAP BusBob autoSec__retDataCh_Bob_comm2 - SET autoSec__retDataCh_Bob_comm2 priority 0 + SET autoSec__retDataCh_Bob_comm2 priority 5 MAPSEC MemoryAlice mac_comm3 MAPSEC Memory_HSM_Bob mac_comm3 MAPSEC MemoryAlice mac_comm4 diff --git a/ttool/src/test/resources/tmltranslator/AutoSecGenDiplodocusTest/Models/modelWithMultiChannels/spec.tmap b/ttool/src/test/resources/tmltranslator/AutoSecGenDiplodocusTest/Models/modelWithMultiChannels/spec.tmap index 10e6b56606b496c9185faf374696931075145189..ce2b70767504cbe8ab67dcf0d531a2c3a1da3ecd 100644 --- a/ttool/src/test/resources/tmltranslator/AutoSecGenDiplodocusTest/Models/modelWithMultiChannels/spec.tmap +++ b/ttool/src/test/resources/tmltranslator/AutoSecGenDiplodocusTest/Models/modelWithMultiChannels/spec.tmap @@ -8,47 +8,47 @@ ENDTMLARCHI TMLMAPPING MAP CPUAlice autoSec__Alice - SET autoSec__Alice priority 0 + SET autoSec__Alice priority 5 MAP CPUBob autoSec__Bob - SET autoSec__Bob priority 0 + SET autoSec__Bob priority 5 MAP ExternalMemory autoSec__comm4 - SET autoSec__comm4 priority 0 + SET autoSec__comm4 priority 5 MAP BusBob autoSec__comm4 - SET autoSec__comm4 priority 0 + SET autoSec__comm4 priority 5 MAP BusAlice autoSec__comm4 - SET autoSec__comm4 priority 0 + SET autoSec__comm4 priority 5 MAP ExternalBus autoSec__comm4 - SET autoSec__comm4 priority 0 + SET autoSec__comm4 priority 5 MAP ExternalMemory autoSec__comm3 - SET autoSec__comm3 priority 0 + SET autoSec__comm3 priority 5 MAP BusBob autoSec__comm3 - SET autoSec__comm3 priority 0 + SET autoSec__comm3 priority 5 MAP BusAlice autoSec__comm3 - SET autoSec__comm3 priority 0 + SET autoSec__comm3 priority 5 MAP ExternalBus autoSec__comm3 - SET autoSec__comm3 priority 0 + SET autoSec__comm3 priority 5 MAP ExternalMemory autoSec__comm2 - SET autoSec__comm2 priority 0 + SET autoSec__comm2 priority 5 MAP ExternalBus autoSec__comm2 - SET autoSec__comm2 priority 0 + SET autoSec__comm2 priority 5 MAP BusBob autoSec__comm2 - SET autoSec__comm2 priority 0 + SET autoSec__comm2 priority 5 MAP BusAlice autoSec__comm2 - SET autoSec__comm2 priority 0 + SET autoSec__comm2 priority 5 MAP ExternalMemory autoSec__comm - SET autoSec__comm priority 0 + SET autoSec__comm priority 5 MAP ExternalBus autoSec__comm - SET autoSec__comm priority 0 + SET autoSec__comm priority 5 MAP BusAlice autoSec__comm - SET autoSec__comm priority 0 + SET autoSec__comm priority 5 MAP BusBob autoSec__comm - SET autoSec__comm priority 0 + SET autoSec__comm priority 5 MAP ExternalMemory autoSec__comm1 - SET autoSec__comm1 priority 0 + SET autoSec__comm1 priority 5 MAP BusBob autoSec__comm1 - SET autoSec__comm1 priority 0 + SET autoSec__comm1 priority 5 MAP BusAlice autoSec__comm1 - SET autoSec__comm1 priority 0 + SET autoSec__comm1 priority 5 MAP ExternalBus autoSec__comm1 - SET autoSec__comm1 priority 0 + SET autoSec__comm1 priority 5 ENDTMLMAPPING diff --git a/ttool/src/test/resources/tmltranslator/AutoSecGenDiplodocusTest/Models/modelWithMultiChannelsAndMultiUse/CaseWithoutHSM/golden/spec.tmap b/ttool/src/test/resources/tmltranslator/AutoSecGenDiplodocusTest/Models/modelWithMultiChannelsAndMultiUse/CaseWithoutHSM/golden/spec.tmap index c018b41a21d70a97f55cfffba4ded2065e63e767..8ef72389237904714099664380972f25b7f4f9b4 100644 --- a/ttool/src/test/resources/tmltranslator/AutoSecGenDiplodocusTest/Models/modelWithMultiChannelsAndMultiUse/CaseWithoutHSM/golden/spec.tmap +++ b/ttool/src/test/resources/tmltranslator/AutoSecGenDiplodocusTest/Models/modelWithMultiChannelsAndMultiUse/CaseWithoutHSM/golden/spec.tmap @@ -8,65 +8,65 @@ ENDTMLARCHI TMLMAPPING MAP CPUAlice autoSec__Alice - SET autoSec__Alice priority 0 + SET autoSec__Alice priority 5 MAP CPUBob autoSec__Bob - SET autoSec__Bob priority 0 + SET autoSec__Bob priority 5 MAP ExternalMemory autoSec__nonceChBob_Alice_comm4 - SET autoSec__nonceChBob_Alice_comm4 priority 0 + SET autoSec__nonceChBob_Alice_comm4 priority 5 MAP BusBob autoSec__nonceChBob_Alice_comm4 - SET autoSec__nonceChBob_Alice_comm4 priority 0 + SET autoSec__nonceChBob_Alice_comm4 priority 5 MAP BusAlice autoSec__nonceChBob_Alice_comm4 - SET autoSec__nonceChBob_Alice_comm4 priority 0 + SET autoSec__nonceChBob_Alice_comm4 priority 5 MAP ExternalBus autoSec__nonceChBob_Alice_comm4 - SET autoSec__nonceChBob_Alice_comm4 priority 0 + SET autoSec__nonceChBob_Alice_comm4 priority 5 MAP ExternalMemory autoSec__nonceChBob_Alice_comm2 - SET autoSec__nonceChBob_Alice_comm2 priority 0 + SET autoSec__nonceChBob_Alice_comm2 priority 5 MAP ExternalBus autoSec__nonceChBob_Alice_comm2 - SET autoSec__nonceChBob_Alice_comm2 priority 0 + SET autoSec__nonceChBob_Alice_comm2 priority 5 MAP BusBob autoSec__nonceChBob_Alice_comm2 - SET autoSec__nonceChBob_Alice_comm2 priority 0 + SET autoSec__nonceChBob_Alice_comm2 priority 5 MAP BusAlice autoSec__nonceChBob_Alice_comm2 - SET autoSec__nonceChBob_Alice_comm2 priority 0 + SET autoSec__nonceChBob_Alice_comm2 priority 5 MAP ExternalMemory autoSec__comm1 - SET autoSec__comm1 priority 0 + SET autoSec__comm1 priority 5 MAP BusBob autoSec__comm1 - SET autoSec__comm1 priority 0 + SET autoSec__comm1 priority 5 MAP BusAlice autoSec__comm1 - SET autoSec__comm1 priority 0 + SET autoSec__comm1 priority 5 MAP ExternalBus autoSec__comm1 - SET autoSec__comm1 priority 0 + SET autoSec__comm1 priority 5 MAP ExternalMemory autoSec__comm - SET autoSec__comm priority 0 + SET autoSec__comm priority 5 MAP ExternalBus autoSec__comm - SET autoSec__comm priority 0 + SET autoSec__comm priority 5 MAP BusAlice autoSec__comm - SET autoSec__comm priority 0 + SET autoSec__comm priority 5 MAP BusBob autoSec__comm - SET autoSec__comm priority 0 + SET autoSec__comm priority 5 MAP ExternalMemory autoSec__comm2 - SET autoSec__comm2 priority 0 + SET autoSec__comm2 priority 5 MAP ExternalBus autoSec__comm2 - SET autoSec__comm2 priority 0 + SET autoSec__comm2 priority 5 MAP BusBob autoSec__comm2 - SET autoSec__comm2 priority 0 + SET autoSec__comm2 priority 5 MAP BusAlice autoSec__comm2 - SET autoSec__comm2 priority 0 + SET autoSec__comm2 priority 5 MAP ExternalMemory autoSec__comm3 - SET autoSec__comm3 priority 0 + SET autoSec__comm3 priority 5 MAP BusBob autoSec__comm3 - SET autoSec__comm3 priority 0 + SET autoSec__comm3 priority 5 MAP BusAlice autoSec__comm3 - SET autoSec__comm3 priority 0 + SET autoSec__comm3 priority 5 MAP ExternalBus autoSec__comm3 - SET autoSec__comm3 priority 0 + SET autoSec__comm3 priority 5 MAP ExternalMemory autoSec__comm4 - SET autoSec__comm4 priority 0 + SET autoSec__comm4 priority 5 MAP BusBob autoSec__comm4 - SET autoSec__comm4 priority 0 + SET autoSec__comm4 priority 5 MAP BusAlice autoSec__comm4 - SET autoSec__comm4 priority 0 + SET autoSec__comm4 priority 5 MAP ExternalBus autoSec__comm4 - SET autoSec__comm4 priority 0 + SET autoSec__comm4 priority 5 MAPSEC MemoryAlice se_comm1 MAPSEC MemoryBob se_comm1 MAPSEC MemoryAlice mac_comm3 diff --git a/ttool/src/test/resources/tmltranslator/AutoSecGenDiplodocusTest/Models/modelWithMultiChannelsAndMultiUse/CasesWithDirectConnectHSMs/CaseWithHSMAlice/golden/spec.tmap b/ttool/src/test/resources/tmltranslator/AutoSecGenDiplodocusTest/Models/modelWithMultiChannelsAndMultiUse/CasesWithDirectConnectHSMs/CaseWithHSMAlice/golden/spec.tmap index 9619ebae7b80e0553fe44ba74ddb47c5221193d1..3be7544e9a4f69ad993e28ed4760b84166e2bdbe 100644 --- a/ttool/src/test/resources/tmltranslator/AutoSecGenDiplodocusTest/Models/modelWithMultiChannelsAndMultiUse/CasesWithDirectConnectHSMs/CaseWithHSMAlice/golden/spec.tmap +++ b/ttool/src/test/resources/tmltranslator/AutoSecGenDiplodocusTest/Models/modelWithMultiChannelsAndMultiUse/CasesWithDirectConnectHSMs/CaseWithHSMAlice/golden/spec.tmap @@ -8,119 +8,119 @@ ENDTMLARCHI TMLMAPPING MAP CPUAlice autoSec__Alice - SET autoSec__Alice priority 0 + SET autoSec__Alice priority 5 MAP CPUBob autoSec__Bob - SET autoSec__Bob priority 0 + SET autoSec__Bob priority 5 MAP HwA_HSM_Alice_Encrypt_comm autoSec__HSM_Alice_Encrypt_comm - SET autoSec__HSM_Alice_Encrypt_comm priority 0 + SET autoSec__HSM_Alice_Encrypt_comm priority 5 MAP HwA_HSM_Alice_Encrypt_comm1 autoSec__HSM_Alice_Encrypt_comm1 - SET autoSec__HSM_Alice_Encrypt_comm1 priority 0 + SET autoSec__HSM_Alice_Encrypt_comm1 priority 5 MAP HwA_HSM_Alice_Encrypt_comm2 autoSec__HSM_Alice_Encrypt_comm2 - SET autoSec__HSM_Alice_Encrypt_comm2 priority 0 + SET autoSec__HSM_Alice_Encrypt_comm2 priority 5 MAP HwA_HSM_Alice_Encrypt_comm4 autoSec__HSM_Alice_Encrypt_comm4 - SET autoSec__HSM_Alice_Encrypt_comm4 priority 0 + SET autoSec__HSM_Alice_Encrypt_comm4 priority 5 MAP HwA_HSM_Alice_Encrypt_comm3 autoSec__HSM_Alice_Encrypt_comm3 - SET autoSec__HSM_Alice_Encrypt_comm3 priority 0 + SET autoSec__HSM_Alice_Encrypt_comm3 priority 5 MAP MemoryAlice autoSec__dataCh_Alice_comm3 - SET autoSec__dataCh_Alice_comm3 priority 0 + SET autoSec__dataCh_Alice_comm3 priority 5 MAP Bus_HSM_Alice autoSec__dataCh_Alice_comm3 - SET autoSec__dataCh_Alice_comm3 priority 0 + SET autoSec__dataCh_Alice_comm3 priority 5 MAP BusAlice autoSec__dataCh_Alice_comm3 - SET autoSec__dataCh_Alice_comm3 priority 0 + SET autoSec__dataCh_Alice_comm3 priority 5 MAP MemoryAlice autoSec__dataCh_Alice_comm4 - SET autoSec__dataCh_Alice_comm4 priority 0 + SET autoSec__dataCh_Alice_comm4 priority 5 MAP Bus_HSM_Alice autoSec__dataCh_Alice_comm4 - SET autoSec__dataCh_Alice_comm4 priority 0 + SET autoSec__dataCh_Alice_comm4 priority 5 MAP BusAlice autoSec__dataCh_Alice_comm4 - SET autoSec__dataCh_Alice_comm4 priority 0 + SET autoSec__dataCh_Alice_comm4 priority 5 MAP MemoryAlice autoSec__dataCh_Alice_comm - SET autoSec__dataCh_Alice_comm priority 0 + SET autoSec__dataCh_Alice_comm priority 5 MAP Bus_HSM_Alice autoSec__dataCh_Alice_comm - SET autoSec__dataCh_Alice_comm priority 0 + SET autoSec__dataCh_Alice_comm priority 5 MAP BusAlice autoSec__dataCh_Alice_comm - SET autoSec__dataCh_Alice_comm priority 0 + SET autoSec__dataCh_Alice_comm priority 5 MAP MemoryAlice autoSec__dataCh_Alice_comm1 - SET autoSec__dataCh_Alice_comm1 priority 0 + SET autoSec__dataCh_Alice_comm1 priority 5 MAP Bus_HSM_Alice autoSec__dataCh_Alice_comm1 - SET autoSec__dataCh_Alice_comm1 priority 0 + SET autoSec__dataCh_Alice_comm1 priority 5 MAP BusAlice autoSec__dataCh_Alice_comm1 - SET autoSec__dataCh_Alice_comm1 priority 0 + SET autoSec__dataCh_Alice_comm1 priority 5 MAP MemoryAlice autoSec__dataCh_Alice_comm2 - SET autoSec__dataCh_Alice_comm2 priority 0 + SET autoSec__dataCh_Alice_comm2 priority 5 MAP Bus_HSM_Alice autoSec__dataCh_Alice_comm2 - SET autoSec__dataCh_Alice_comm2 priority 0 + SET autoSec__dataCh_Alice_comm2 priority 5 MAP BusAlice autoSec__dataCh_Alice_comm2 - SET autoSec__dataCh_Alice_comm2 priority 0 + SET autoSec__dataCh_Alice_comm2 priority 5 MAP MemoryBob autoSec__nonceChBob_Alice_comm4 - SET autoSec__nonceChBob_Alice_comm4 priority 0 + SET autoSec__nonceChBob_Alice_comm4 priority 5 MAP Bus_HSM_Alice autoSec__nonceChBob_Alice_comm4 - SET autoSec__nonceChBob_Alice_comm4 priority 0 + SET autoSec__nonceChBob_Alice_comm4 priority 5 MAP BusAlice autoSec__nonceChBob_Alice_comm4 - SET autoSec__nonceChBob_Alice_comm4 priority 0 + SET autoSec__nonceChBob_Alice_comm4 priority 5 MAP BusBob autoSec__nonceChBob_Alice_comm4 - SET autoSec__nonceChBob_Alice_comm4 priority 0 + SET autoSec__nonceChBob_Alice_comm4 priority 5 MAP ExternalBus autoSec__nonceChBob_Alice_comm4 - SET autoSec__nonceChBob_Alice_comm4 priority 0 + SET autoSec__nonceChBob_Alice_comm4 priority 5 MAP MemoryBob autoSec__nonceChBob_Alice_comm2 - SET autoSec__nonceChBob_Alice_comm2 priority 0 + SET autoSec__nonceChBob_Alice_comm2 priority 5 MAP Bus_HSM_Alice autoSec__nonceChBob_Alice_comm2 - SET autoSec__nonceChBob_Alice_comm2 priority 0 + SET autoSec__nonceChBob_Alice_comm2 priority 5 MAP BusAlice autoSec__nonceChBob_Alice_comm2 - SET autoSec__nonceChBob_Alice_comm2 priority 0 + SET autoSec__nonceChBob_Alice_comm2 priority 5 MAP ExternalBus autoSec__nonceChBob_Alice_comm2 - SET autoSec__nonceChBob_Alice_comm2 priority 0 + SET autoSec__nonceChBob_Alice_comm2 priority 5 MAP BusBob autoSec__nonceChBob_Alice_comm2 - SET autoSec__nonceChBob_Alice_comm2 priority 0 + SET autoSec__nonceChBob_Alice_comm2 priority 5 MAP Memory_HSM_Alice autoSec__retDataCh_Bob_comm3 - SET autoSec__retDataCh_Bob_comm3 priority 0 + SET autoSec__retDataCh_Bob_comm3 priority 5 MAP Bus_HSM_Alice autoSec__retDataCh_Bob_comm3 - SET autoSec__retDataCh_Bob_comm3 priority 0 + SET autoSec__retDataCh_Bob_comm3 priority 5 MAP BusAlice autoSec__retDataCh_Bob_comm3 - SET autoSec__retDataCh_Bob_comm3 priority 0 + SET autoSec__retDataCh_Bob_comm3 priority 5 MAP BusBob autoSec__retDataCh_Bob_comm3 - SET autoSec__retDataCh_Bob_comm3 priority 0 + SET autoSec__retDataCh_Bob_comm3 priority 5 MAP ExternalBus autoSec__retDataCh_Bob_comm3 - SET autoSec__retDataCh_Bob_comm3 priority 0 + SET autoSec__retDataCh_Bob_comm3 priority 5 MAP Memory_HSM_Alice autoSec__retDataCh_Bob_comm4 - SET autoSec__retDataCh_Bob_comm4 priority 0 + SET autoSec__retDataCh_Bob_comm4 priority 5 MAP Bus_HSM_Alice autoSec__retDataCh_Bob_comm4 - SET autoSec__retDataCh_Bob_comm4 priority 0 + SET autoSec__retDataCh_Bob_comm4 priority 5 MAP BusAlice autoSec__retDataCh_Bob_comm4 - SET autoSec__retDataCh_Bob_comm4 priority 0 + SET autoSec__retDataCh_Bob_comm4 priority 5 MAP BusBob autoSec__retDataCh_Bob_comm4 - SET autoSec__retDataCh_Bob_comm4 priority 0 + SET autoSec__retDataCh_Bob_comm4 priority 5 MAP ExternalBus autoSec__retDataCh_Bob_comm4 - SET autoSec__retDataCh_Bob_comm4 priority 0 + SET autoSec__retDataCh_Bob_comm4 priority 5 MAP Memory_HSM_Alice autoSec__retDataCh_Bob_comm - SET autoSec__retDataCh_Bob_comm priority 0 + SET autoSec__retDataCh_Bob_comm priority 5 MAP Bus_HSM_Alice autoSec__retDataCh_Bob_comm - SET autoSec__retDataCh_Bob_comm priority 0 + SET autoSec__retDataCh_Bob_comm priority 5 MAP BusAlice autoSec__retDataCh_Bob_comm - SET autoSec__retDataCh_Bob_comm priority 0 + SET autoSec__retDataCh_Bob_comm priority 5 MAP ExternalBus autoSec__retDataCh_Bob_comm - SET autoSec__retDataCh_Bob_comm priority 0 + SET autoSec__retDataCh_Bob_comm priority 5 MAP BusBob autoSec__retDataCh_Bob_comm - SET autoSec__retDataCh_Bob_comm priority 0 + SET autoSec__retDataCh_Bob_comm priority 5 MAP Memory_HSM_Alice autoSec__retDataCh_Bob_comm1 - SET autoSec__retDataCh_Bob_comm1 priority 0 + SET autoSec__retDataCh_Bob_comm1 priority 5 MAP Bus_HSM_Alice autoSec__retDataCh_Bob_comm1 - SET autoSec__retDataCh_Bob_comm1 priority 0 + SET autoSec__retDataCh_Bob_comm1 priority 5 MAP BusAlice autoSec__retDataCh_Bob_comm1 - SET autoSec__retDataCh_Bob_comm1 priority 0 + SET autoSec__retDataCh_Bob_comm1 priority 5 MAP BusBob autoSec__retDataCh_Bob_comm1 - SET autoSec__retDataCh_Bob_comm1 priority 0 + SET autoSec__retDataCh_Bob_comm1 priority 5 MAP ExternalBus autoSec__retDataCh_Bob_comm1 - SET autoSec__retDataCh_Bob_comm1 priority 0 + SET autoSec__retDataCh_Bob_comm1 priority 5 MAP Memory_HSM_Alice autoSec__retDataCh_Bob_comm2 - SET autoSec__retDataCh_Bob_comm2 priority 0 + SET autoSec__retDataCh_Bob_comm2 priority 5 MAP Bus_HSM_Alice autoSec__retDataCh_Bob_comm2 - SET autoSec__retDataCh_Bob_comm2 priority 0 + SET autoSec__retDataCh_Bob_comm2 priority 5 MAP BusAlice autoSec__retDataCh_Bob_comm2 - SET autoSec__retDataCh_Bob_comm2 priority 0 + SET autoSec__retDataCh_Bob_comm2 priority 5 MAP ExternalBus autoSec__retDataCh_Bob_comm2 - SET autoSec__retDataCh_Bob_comm2 priority 0 + SET autoSec__retDataCh_Bob_comm2 priority 5 MAP BusBob autoSec__retDataCh_Bob_comm2 - SET autoSec__retDataCh_Bob_comm2 priority 0 + SET autoSec__retDataCh_Bob_comm2 priority 5 MAPSEC MemoryBob mac_comm3 MAPSEC Memory_HSM_Alice mac_comm3 MAPSEC MemoryBob se_comm diff --git a/ttool/src/test/resources/tmltranslator/AutoSecGenDiplodocusTest/Models/modelWithMultiChannelsAndMultiUse/CasesWithDirectConnectHSMs/CaseWithHSMAliceBob/golden/spec.tmap b/ttool/src/test/resources/tmltranslator/AutoSecGenDiplodocusTest/Models/modelWithMultiChannelsAndMultiUse/CasesWithDirectConnectHSMs/CaseWithHSMAliceBob/golden/spec.tmap index 8e2b4b32352a809f4e2bb28e66f7e27a12719a23..c600be0f180c78d28deea1d0abece4cbe0ab4c57 100644 --- a/ttool/src/test/resources/tmltranslator/AutoSecGenDiplodocusTest/Models/modelWithMultiChannelsAndMultiUse/CasesWithDirectConnectHSMs/CaseWithHSMAliceBob/golden/spec.tmap +++ b/ttool/src/test/resources/tmltranslator/AutoSecGenDiplodocusTest/Models/modelWithMultiChannelsAndMultiUse/CasesWithDirectConnectHSMs/CaseWithHSMAliceBob/golden/spec.tmap @@ -8,173 +8,173 @@ ENDTMLARCHI TMLMAPPING MAP CPUAlice autoSec__Alice - SET autoSec__Alice priority 0 + SET autoSec__Alice priority 5 MAP CPUBob autoSec__Bob - SET autoSec__Bob priority 0 + SET autoSec__Bob priority 5 MAP HwA_HSM_Bob_Decrypt_comm autoSec__HSM_Bob_Decrypt_comm - SET autoSec__HSM_Bob_Decrypt_comm priority 0 + SET autoSec__HSM_Bob_Decrypt_comm priority 5 MAP HwA_HSM_Alice_Encrypt_comm4 autoSec__HSM_Alice_Encrypt_comm4 - SET autoSec__HSM_Alice_Encrypt_comm4 priority 0 + SET autoSec__HSM_Alice_Encrypt_comm4 priority 5 MAP HwA_HSM_Alice_Encrypt_comm2 autoSec__HSM_Alice_Encrypt_comm2 - SET autoSec__HSM_Alice_Encrypt_comm2 priority 0 + SET autoSec__HSM_Alice_Encrypt_comm2 priority 5 MAP HwA_HSM_Alice_Encrypt_comm1 autoSec__HSM_Alice_Encrypt_comm1 - SET autoSec__HSM_Alice_Encrypt_comm1 priority 0 + SET autoSec__HSM_Alice_Encrypt_comm1 priority 5 MAP HwA_HSM_Alice_Encrypt_comm3 autoSec__HSM_Alice_Encrypt_comm3 - SET autoSec__HSM_Alice_Encrypt_comm3 priority 0 + SET autoSec__HSM_Alice_Encrypt_comm3 priority 5 MAP HwA_HSM_Bob_Decrypt_comm2 autoSec__HSM_Bob_Decrypt_comm2 - SET autoSec__HSM_Bob_Decrypt_comm2 priority 0 + SET autoSec__HSM_Bob_Decrypt_comm2 priority 5 MAP HwA_HSM_Alice_Encrypt_comm autoSec__HSM_Alice_Encrypt_comm - SET autoSec__HSM_Alice_Encrypt_comm priority 0 + SET autoSec__HSM_Alice_Encrypt_comm priority 5 MAP HwA_HSM_Bob_Decrypt_comm1 autoSec__HSM_Bob_Decrypt_comm1 - SET autoSec__HSM_Bob_Decrypt_comm1 priority 0 + SET autoSec__HSM_Bob_Decrypt_comm1 priority 5 MAP HwA_HSM_Bob_Decrypt_comm3 autoSec__HSM_Bob_Decrypt_comm3 - SET autoSec__HSM_Bob_Decrypt_comm3 priority 0 + SET autoSec__HSM_Bob_Decrypt_comm3 priority 5 MAP HwA_HSM_Bob_Decrypt_comm4 autoSec__HSM_Bob_Decrypt_comm4 - SET autoSec__HSM_Bob_Decrypt_comm4 priority 0 + SET autoSec__HSM_Bob_Decrypt_comm4 priority 5 MAP MemoryAlice autoSec__dataCh_Alice_comm3 - SET autoSec__dataCh_Alice_comm3 priority 0 + SET autoSec__dataCh_Alice_comm3 priority 5 MAP Bus_HSM_Alice autoSec__dataCh_Alice_comm3 - SET autoSec__dataCh_Alice_comm3 priority 0 + SET autoSec__dataCh_Alice_comm3 priority 5 MAP BusAlice autoSec__dataCh_Alice_comm3 - SET autoSec__dataCh_Alice_comm3 priority 0 + SET autoSec__dataCh_Alice_comm3 priority 5 MAP MemoryAlice autoSec__dataCh_Alice_comm4 - SET autoSec__dataCh_Alice_comm4 priority 0 + SET autoSec__dataCh_Alice_comm4 priority 5 MAP Bus_HSM_Alice autoSec__dataCh_Alice_comm4 - SET autoSec__dataCh_Alice_comm4 priority 0 + SET autoSec__dataCh_Alice_comm4 priority 5 MAP BusAlice autoSec__dataCh_Alice_comm4 - SET autoSec__dataCh_Alice_comm4 priority 0 + SET autoSec__dataCh_Alice_comm4 priority 5 MAP MemoryAlice autoSec__dataCh_Alice_comm - SET autoSec__dataCh_Alice_comm priority 0 + SET autoSec__dataCh_Alice_comm priority 5 MAP Bus_HSM_Alice autoSec__dataCh_Alice_comm - SET autoSec__dataCh_Alice_comm priority 0 + SET autoSec__dataCh_Alice_comm priority 5 MAP BusAlice autoSec__dataCh_Alice_comm - SET autoSec__dataCh_Alice_comm priority 0 + SET autoSec__dataCh_Alice_comm priority 5 MAP MemoryAlice autoSec__dataCh_Alice_comm1 - SET autoSec__dataCh_Alice_comm1 priority 0 + SET autoSec__dataCh_Alice_comm1 priority 5 MAP Bus_HSM_Alice autoSec__dataCh_Alice_comm1 - SET autoSec__dataCh_Alice_comm1 priority 0 + SET autoSec__dataCh_Alice_comm1 priority 5 MAP BusAlice autoSec__dataCh_Alice_comm1 - SET autoSec__dataCh_Alice_comm1 priority 0 + SET autoSec__dataCh_Alice_comm1 priority 5 MAP MemoryAlice autoSec__dataCh_Alice_comm2 - SET autoSec__dataCh_Alice_comm2 priority 0 + SET autoSec__dataCh_Alice_comm2 priority 5 MAP Bus_HSM_Alice autoSec__dataCh_Alice_comm2 - SET autoSec__dataCh_Alice_comm2 priority 0 + SET autoSec__dataCh_Alice_comm2 priority 5 MAP BusAlice autoSec__dataCh_Alice_comm2 - SET autoSec__dataCh_Alice_comm2 priority 0 + SET autoSec__dataCh_Alice_comm2 priority 5 MAP Memory_HSM_Alice autoSec__dataCh_HSM_Alice_Encrypt_comm3_comm3 - SET autoSec__dataCh_HSM_Alice_Encrypt_comm3_comm3 priority 0 + SET autoSec__dataCh_HSM_Alice_Encrypt_comm3_comm3 priority 5 MAP Bus_HSM_Alice autoSec__dataCh_HSM_Alice_Encrypt_comm3_comm3 - SET autoSec__dataCh_HSM_Alice_Encrypt_comm3_comm3 priority 0 + SET autoSec__dataCh_HSM_Alice_Encrypt_comm3_comm3 priority 5 MAP BusAlice autoSec__dataCh_HSM_Alice_Encrypt_comm3_comm3 - SET autoSec__dataCh_HSM_Alice_Encrypt_comm3_comm3 priority 0 + SET autoSec__dataCh_HSM_Alice_Encrypt_comm3_comm3 priority 5 MAP Bus_HSM_Bob autoSec__dataCh_HSM_Alice_Encrypt_comm3_comm3 - SET autoSec__dataCh_HSM_Alice_Encrypt_comm3_comm3 priority 0 + SET autoSec__dataCh_HSM_Alice_Encrypt_comm3_comm3 priority 5 MAP BusBob autoSec__dataCh_HSM_Alice_Encrypt_comm3_comm3 - SET autoSec__dataCh_HSM_Alice_Encrypt_comm3_comm3 priority 0 + SET autoSec__dataCh_HSM_Alice_Encrypt_comm3_comm3 priority 5 MAP ExternalBus autoSec__dataCh_HSM_Alice_Encrypt_comm3_comm3 - SET autoSec__dataCh_HSM_Alice_Encrypt_comm3_comm3 priority 0 + SET autoSec__dataCh_HSM_Alice_Encrypt_comm3_comm3 priority 5 MAP Memory_HSM_Alice autoSec__dataCh_HSM_Alice_Encrypt_comm4_comm4 - SET autoSec__dataCh_HSM_Alice_Encrypt_comm4_comm4 priority 0 + SET autoSec__dataCh_HSM_Alice_Encrypt_comm4_comm4 priority 5 MAP Bus_HSM_Alice autoSec__dataCh_HSM_Alice_Encrypt_comm4_comm4 - SET autoSec__dataCh_HSM_Alice_Encrypt_comm4_comm4 priority 0 + SET autoSec__dataCh_HSM_Alice_Encrypt_comm4_comm4 priority 5 MAP BusAlice autoSec__dataCh_HSM_Alice_Encrypt_comm4_comm4 - SET autoSec__dataCh_HSM_Alice_Encrypt_comm4_comm4 priority 0 + SET autoSec__dataCh_HSM_Alice_Encrypt_comm4_comm4 priority 5 MAP Bus_HSM_Bob autoSec__dataCh_HSM_Alice_Encrypt_comm4_comm4 - SET autoSec__dataCh_HSM_Alice_Encrypt_comm4_comm4 priority 0 + SET autoSec__dataCh_HSM_Alice_Encrypt_comm4_comm4 priority 5 MAP BusBob autoSec__dataCh_HSM_Alice_Encrypt_comm4_comm4 - SET autoSec__dataCh_HSM_Alice_Encrypt_comm4_comm4 priority 0 + SET autoSec__dataCh_HSM_Alice_Encrypt_comm4_comm4 priority 5 MAP ExternalBus autoSec__dataCh_HSM_Alice_Encrypt_comm4_comm4 - SET autoSec__dataCh_HSM_Alice_Encrypt_comm4_comm4 priority 0 + SET autoSec__dataCh_HSM_Alice_Encrypt_comm4_comm4 priority 5 MAP Memory_HSM_Alice autoSec__dataCh_HSM_Alice_Encrypt_comm_comm - SET autoSec__dataCh_HSM_Alice_Encrypt_comm_comm priority 0 + SET autoSec__dataCh_HSM_Alice_Encrypt_comm_comm priority 5 MAP Bus_HSM_Alice autoSec__dataCh_HSM_Alice_Encrypt_comm_comm - SET autoSec__dataCh_HSM_Alice_Encrypt_comm_comm priority 0 + SET autoSec__dataCh_HSM_Alice_Encrypt_comm_comm priority 5 MAP BusAlice autoSec__dataCh_HSM_Alice_Encrypt_comm_comm - SET autoSec__dataCh_HSM_Alice_Encrypt_comm_comm priority 0 + SET autoSec__dataCh_HSM_Alice_Encrypt_comm_comm priority 5 MAP Bus_HSM_Bob autoSec__dataCh_HSM_Alice_Encrypt_comm_comm - SET autoSec__dataCh_HSM_Alice_Encrypt_comm_comm priority 0 + SET autoSec__dataCh_HSM_Alice_Encrypt_comm_comm priority 5 MAP BusBob autoSec__dataCh_HSM_Alice_Encrypt_comm_comm - SET autoSec__dataCh_HSM_Alice_Encrypt_comm_comm priority 0 + SET autoSec__dataCh_HSM_Alice_Encrypt_comm_comm priority 5 MAP ExternalBus autoSec__dataCh_HSM_Alice_Encrypt_comm_comm - SET autoSec__dataCh_HSM_Alice_Encrypt_comm_comm priority 0 + SET autoSec__dataCh_HSM_Alice_Encrypt_comm_comm priority 5 MAP Memory_HSM_Alice autoSec__dataCh_HSM_Alice_Encrypt_comm1_comm1 - SET autoSec__dataCh_HSM_Alice_Encrypt_comm1_comm1 priority 0 + SET autoSec__dataCh_HSM_Alice_Encrypt_comm1_comm1 priority 5 MAP Bus_HSM_Alice autoSec__dataCh_HSM_Alice_Encrypt_comm1_comm1 - SET autoSec__dataCh_HSM_Alice_Encrypt_comm1_comm1 priority 0 + SET autoSec__dataCh_HSM_Alice_Encrypt_comm1_comm1 priority 5 MAP BusAlice autoSec__dataCh_HSM_Alice_Encrypt_comm1_comm1 - SET autoSec__dataCh_HSM_Alice_Encrypt_comm1_comm1 priority 0 + SET autoSec__dataCh_HSM_Alice_Encrypt_comm1_comm1 priority 5 MAP Bus_HSM_Bob autoSec__dataCh_HSM_Alice_Encrypt_comm1_comm1 - SET autoSec__dataCh_HSM_Alice_Encrypt_comm1_comm1 priority 0 + SET autoSec__dataCh_HSM_Alice_Encrypt_comm1_comm1 priority 5 MAP BusBob autoSec__dataCh_HSM_Alice_Encrypt_comm1_comm1 - SET autoSec__dataCh_HSM_Alice_Encrypt_comm1_comm1 priority 0 + SET autoSec__dataCh_HSM_Alice_Encrypt_comm1_comm1 priority 5 MAP ExternalBus autoSec__dataCh_HSM_Alice_Encrypt_comm1_comm1 - SET autoSec__dataCh_HSM_Alice_Encrypt_comm1_comm1 priority 0 + SET autoSec__dataCh_HSM_Alice_Encrypt_comm1_comm1 priority 5 MAP Memory_HSM_Alice autoSec__dataCh_HSM_Alice_Encrypt_comm2_comm2 - SET autoSec__dataCh_HSM_Alice_Encrypt_comm2_comm2 priority 0 + SET autoSec__dataCh_HSM_Alice_Encrypt_comm2_comm2 priority 5 MAP Bus_HSM_Alice autoSec__dataCh_HSM_Alice_Encrypt_comm2_comm2 - SET autoSec__dataCh_HSM_Alice_Encrypt_comm2_comm2 priority 0 + SET autoSec__dataCh_HSM_Alice_Encrypt_comm2_comm2 priority 5 MAP BusAlice autoSec__dataCh_HSM_Alice_Encrypt_comm2_comm2 - SET autoSec__dataCh_HSM_Alice_Encrypt_comm2_comm2 priority 0 + SET autoSec__dataCh_HSM_Alice_Encrypt_comm2_comm2 priority 5 MAP Bus_HSM_Bob autoSec__dataCh_HSM_Alice_Encrypt_comm2_comm2 - SET autoSec__dataCh_HSM_Alice_Encrypt_comm2_comm2 priority 0 + SET autoSec__dataCh_HSM_Alice_Encrypt_comm2_comm2 priority 5 MAP BusBob autoSec__dataCh_HSM_Alice_Encrypt_comm2_comm2 - SET autoSec__dataCh_HSM_Alice_Encrypt_comm2_comm2 priority 0 + SET autoSec__dataCh_HSM_Alice_Encrypt_comm2_comm2 priority 5 MAP ExternalBus autoSec__dataCh_HSM_Alice_Encrypt_comm2_comm2 - SET autoSec__dataCh_HSM_Alice_Encrypt_comm2_comm2 priority 0 + SET autoSec__dataCh_HSM_Alice_Encrypt_comm2_comm2 priority 5 MAP Memory_HSM_Bob autoSec__retDataCh_Bob_comm3 - SET autoSec__retDataCh_Bob_comm3 priority 0 + SET autoSec__retDataCh_Bob_comm3 priority 5 MAP Bus_HSM_Bob autoSec__retDataCh_Bob_comm3 - SET autoSec__retDataCh_Bob_comm3 priority 0 + SET autoSec__retDataCh_Bob_comm3 priority 5 MAP BusBob autoSec__retDataCh_Bob_comm3 - SET autoSec__retDataCh_Bob_comm3 priority 0 + SET autoSec__retDataCh_Bob_comm3 priority 5 MAP Memory_HSM_Bob autoSec__retDataCh_Bob_comm4 - SET autoSec__retDataCh_Bob_comm4 priority 0 + SET autoSec__retDataCh_Bob_comm4 priority 5 MAP Bus_HSM_Bob autoSec__retDataCh_Bob_comm4 - SET autoSec__retDataCh_Bob_comm4 priority 0 + SET autoSec__retDataCh_Bob_comm4 priority 5 MAP BusBob autoSec__retDataCh_Bob_comm4 - SET autoSec__retDataCh_Bob_comm4 priority 0 + SET autoSec__retDataCh_Bob_comm4 priority 5 MAP Memory_HSM_Bob autoSec__nonceChBob_Alice_comm4 - SET autoSec__nonceChBob_Alice_comm4 priority 0 + SET autoSec__nonceChBob_Alice_comm4 priority 5 MAP Bus_HSM_Alice autoSec__nonceChBob_Alice_comm4 - SET autoSec__nonceChBob_Alice_comm4 priority 0 + SET autoSec__nonceChBob_Alice_comm4 priority 5 MAP BusAlice autoSec__nonceChBob_Alice_comm4 - SET autoSec__nonceChBob_Alice_comm4 priority 0 + SET autoSec__nonceChBob_Alice_comm4 priority 5 MAP Bus_HSM_Bob autoSec__nonceChBob_Alice_comm4 - SET autoSec__nonceChBob_Alice_comm4 priority 0 + SET autoSec__nonceChBob_Alice_comm4 priority 5 MAP BusBob autoSec__nonceChBob_Alice_comm4 - SET autoSec__nonceChBob_Alice_comm4 priority 0 + SET autoSec__nonceChBob_Alice_comm4 priority 5 MAP ExternalBus autoSec__nonceChBob_Alice_comm4 - SET autoSec__nonceChBob_Alice_comm4 priority 0 + SET autoSec__nonceChBob_Alice_comm4 priority 5 MAP Memory_HSM_Bob autoSec__retDataCh_Bob_comm - SET autoSec__retDataCh_Bob_comm priority 0 + SET autoSec__retDataCh_Bob_comm priority 5 MAP Bus_HSM_Bob autoSec__retDataCh_Bob_comm - SET autoSec__retDataCh_Bob_comm priority 0 + SET autoSec__retDataCh_Bob_comm priority 5 MAP BusBob autoSec__retDataCh_Bob_comm - SET autoSec__retDataCh_Bob_comm priority 0 + SET autoSec__retDataCh_Bob_comm priority 5 MAP Memory_HSM_Bob autoSec__retDataCh_Bob_comm1 - SET autoSec__retDataCh_Bob_comm1 priority 0 + SET autoSec__retDataCh_Bob_comm1 priority 5 MAP Bus_HSM_Bob autoSec__retDataCh_Bob_comm1 - SET autoSec__retDataCh_Bob_comm1 priority 0 + SET autoSec__retDataCh_Bob_comm1 priority 5 MAP BusBob autoSec__retDataCh_Bob_comm1 - SET autoSec__retDataCh_Bob_comm1 priority 0 + SET autoSec__retDataCh_Bob_comm1 priority 5 MAP Memory_HSM_Bob autoSec__retDataCh_Bob_comm2 - SET autoSec__retDataCh_Bob_comm2 priority 0 + SET autoSec__retDataCh_Bob_comm2 priority 5 MAP Bus_HSM_Bob autoSec__retDataCh_Bob_comm2 - SET autoSec__retDataCh_Bob_comm2 priority 0 + SET autoSec__retDataCh_Bob_comm2 priority 5 MAP BusBob autoSec__retDataCh_Bob_comm2 - SET autoSec__retDataCh_Bob_comm2 priority 0 + SET autoSec__retDataCh_Bob_comm2 priority 5 MAP Memory_HSM_Bob autoSec__nonceChBob_Alice_comm2 - SET autoSec__nonceChBob_Alice_comm2 priority 0 + SET autoSec__nonceChBob_Alice_comm2 priority 5 MAP Bus_HSM_Alice autoSec__nonceChBob_Alice_comm2 - SET autoSec__nonceChBob_Alice_comm2 priority 0 + SET autoSec__nonceChBob_Alice_comm2 priority 5 MAP BusAlice autoSec__nonceChBob_Alice_comm2 - SET autoSec__nonceChBob_Alice_comm2 priority 0 + SET autoSec__nonceChBob_Alice_comm2 priority 5 MAP Bus_HSM_Bob autoSec__nonceChBob_Alice_comm2 - SET autoSec__nonceChBob_Alice_comm2 priority 0 + SET autoSec__nonceChBob_Alice_comm2 priority 5 MAP BusBob autoSec__nonceChBob_Alice_comm2 - SET autoSec__nonceChBob_Alice_comm2 priority 0 + SET autoSec__nonceChBob_Alice_comm2 priority 5 MAP ExternalBus autoSec__nonceChBob_Alice_comm2 - SET autoSec__nonceChBob_Alice_comm2 priority 0 + SET autoSec__nonceChBob_Alice_comm2 priority 5 MAPSEC Memory_HSM_Alice mac_comm3 MAPSEC Memory_HSM_Bob mac_comm3 MAPSEC Memory_HSM_Alice se_comm2 diff --git a/ttool/src/test/resources/tmltranslator/AutoSecGenDiplodocusTest/Models/modelWithMultiChannelsAndMultiUse/CasesWithDirectConnectHSMs/CaseWithHSMBob/golden/spec.tmap b/ttool/src/test/resources/tmltranslator/AutoSecGenDiplodocusTest/Models/modelWithMultiChannelsAndMultiUse/CasesWithDirectConnectHSMs/CaseWithHSMBob/golden/spec.tmap index 2a6827e73232308245880e7d36a0c8510a9e9f14..e60102bcec33d45b1ec9ef67ee855918e81ba6f1 100644 --- a/ttool/src/test/resources/tmltranslator/AutoSecGenDiplodocusTest/Models/modelWithMultiChannelsAndMultiUse/CasesWithDirectConnectHSMs/CaseWithHSMBob/golden/spec.tmap +++ b/ttool/src/test/resources/tmltranslator/AutoSecGenDiplodocusTest/Models/modelWithMultiChannelsAndMultiUse/CasesWithDirectConnectHSMs/CaseWithHSMBob/golden/spec.tmap @@ -8,119 +8,119 @@ ENDTMLARCHI TMLMAPPING MAP CPUAlice autoSec__Alice - SET autoSec__Alice priority 0 + SET autoSec__Alice priority 5 MAP CPUBob autoSec__Bob - SET autoSec__Bob priority 0 + SET autoSec__Bob priority 5 MAP HwA_HSM_Bob_Decrypt_comm3 autoSec__HSM_Bob_Decrypt_comm3 - SET autoSec__HSM_Bob_Decrypt_comm3 priority 0 + SET autoSec__HSM_Bob_Decrypt_comm3 priority 5 MAP HwA_HSM_Bob_Decrypt_comm4 autoSec__HSM_Bob_Decrypt_comm4 - SET autoSec__HSM_Bob_Decrypt_comm4 priority 0 + SET autoSec__HSM_Bob_Decrypt_comm4 priority 5 MAP HwA_HSM_Bob_Decrypt_comm2 autoSec__HSM_Bob_Decrypt_comm2 - SET autoSec__HSM_Bob_Decrypt_comm2 priority 0 + SET autoSec__HSM_Bob_Decrypt_comm2 priority 5 MAP HwA_HSM_Bob_Decrypt_comm1 autoSec__HSM_Bob_Decrypt_comm1 - SET autoSec__HSM_Bob_Decrypt_comm1 priority 0 + SET autoSec__HSM_Bob_Decrypt_comm1 priority 5 MAP HwA_HSM_Bob_Decrypt_comm autoSec__HSM_Bob_Decrypt_comm - SET autoSec__HSM_Bob_Decrypt_comm priority 0 + SET autoSec__HSM_Bob_Decrypt_comm priority 5 MAP MemoryAlice autoSec__dataCh_Alice_comm3 - SET autoSec__dataCh_Alice_comm3 priority 0 + SET autoSec__dataCh_Alice_comm3 priority 5 MAP Bus_HSM_Bob autoSec__dataCh_Alice_comm3 - SET autoSec__dataCh_Alice_comm3 priority 0 + SET autoSec__dataCh_Alice_comm3 priority 5 MAP BusBob autoSec__dataCh_Alice_comm3 - SET autoSec__dataCh_Alice_comm3 priority 0 + SET autoSec__dataCh_Alice_comm3 priority 5 MAP BusAlice autoSec__dataCh_Alice_comm3 - SET autoSec__dataCh_Alice_comm3 priority 0 + SET autoSec__dataCh_Alice_comm3 priority 5 MAP ExternalBus autoSec__dataCh_Alice_comm3 - SET autoSec__dataCh_Alice_comm3 priority 0 + SET autoSec__dataCh_Alice_comm3 priority 5 MAP MemoryAlice autoSec__dataCh_Alice_comm4 - SET autoSec__dataCh_Alice_comm4 priority 0 + SET autoSec__dataCh_Alice_comm4 priority 5 MAP Bus_HSM_Bob autoSec__dataCh_Alice_comm4 - SET autoSec__dataCh_Alice_comm4 priority 0 + SET autoSec__dataCh_Alice_comm4 priority 5 MAP BusBob autoSec__dataCh_Alice_comm4 - SET autoSec__dataCh_Alice_comm4 priority 0 + SET autoSec__dataCh_Alice_comm4 priority 5 MAP BusAlice autoSec__dataCh_Alice_comm4 - SET autoSec__dataCh_Alice_comm4 priority 0 + SET autoSec__dataCh_Alice_comm4 priority 5 MAP ExternalBus autoSec__dataCh_Alice_comm4 - SET autoSec__dataCh_Alice_comm4 priority 0 + SET autoSec__dataCh_Alice_comm4 priority 5 MAP MemoryAlice autoSec__dataCh_Alice_comm - SET autoSec__dataCh_Alice_comm priority 0 + SET autoSec__dataCh_Alice_comm priority 5 MAP Bus_HSM_Bob autoSec__dataCh_Alice_comm - SET autoSec__dataCh_Alice_comm priority 0 + SET autoSec__dataCh_Alice_comm priority 5 MAP BusBob autoSec__dataCh_Alice_comm - SET autoSec__dataCh_Alice_comm priority 0 + SET autoSec__dataCh_Alice_comm priority 5 MAP ExternalBus autoSec__dataCh_Alice_comm - SET autoSec__dataCh_Alice_comm priority 0 + SET autoSec__dataCh_Alice_comm priority 5 MAP BusAlice autoSec__dataCh_Alice_comm - SET autoSec__dataCh_Alice_comm priority 0 + SET autoSec__dataCh_Alice_comm priority 5 MAP MemoryAlice autoSec__dataCh_Alice_comm1 - SET autoSec__dataCh_Alice_comm1 priority 0 + SET autoSec__dataCh_Alice_comm1 priority 5 MAP Bus_HSM_Bob autoSec__dataCh_Alice_comm1 - SET autoSec__dataCh_Alice_comm1 priority 0 + SET autoSec__dataCh_Alice_comm1 priority 5 MAP BusBob autoSec__dataCh_Alice_comm1 - SET autoSec__dataCh_Alice_comm1 priority 0 + SET autoSec__dataCh_Alice_comm1 priority 5 MAP BusAlice autoSec__dataCh_Alice_comm1 - SET autoSec__dataCh_Alice_comm1 priority 0 + SET autoSec__dataCh_Alice_comm1 priority 5 MAP ExternalBus autoSec__dataCh_Alice_comm1 - SET autoSec__dataCh_Alice_comm1 priority 0 + SET autoSec__dataCh_Alice_comm1 priority 5 MAP MemoryAlice autoSec__dataCh_Alice_comm2 - SET autoSec__dataCh_Alice_comm2 priority 0 + SET autoSec__dataCh_Alice_comm2 priority 5 MAP Bus_HSM_Bob autoSec__dataCh_Alice_comm2 - SET autoSec__dataCh_Alice_comm2 priority 0 + SET autoSec__dataCh_Alice_comm2 priority 5 MAP BusBob autoSec__dataCh_Alice_comm2 - SET autoSec__dataCh_Alice_comm2 priority 0 + SET autoSec__dataCh_Alice_comm2 priority 5 MAP ExternalBus autoSec__dataCh_Alice_comm2 - SET autoSec__dataCh_Alice_comm2 priority 0 + SET autoSec__dataCh_Alice_comm2 priority 5 MAP BusAlice autoSec__dataCh_Alice_comm2 - SET autoSec__dataCh_Alice_comm2 priority 0 + SET autoSec__dataCh_Alice_comm2 priority 5 MAP Memory_HSM_Bob autoSec__retDataCh_Bob_comm3 - SET autoSec__retDataCh_Bob_comm3 priority 0 + SET autoSec__retDataCh_Bob_comm3 priority 5 MAP Bus_HSM_Bob autoSec__retDataCh_Bob_comm3 - SET autoSec__retDataCh_Bob_comm3 priority 0 + SET autoSec__retDataCh_Bob_comm3 priority 5 MAP BusBob autoSec__retDataCh_Bob_comm3 - SET autoSec__retDataCh_Bob_comm3 priority 0 + SET autoSec__retDataCh_Bob_comm3 priority 5 MAP Memory_HSM_Bob autoSec__retDataCh_Bob_comm4 - SET autoSec__retDataCh_Bob_comm4 priority 0 + SET autoSec__retDataCh_Bob_comm4 priority 5 MAP Bus_HSM_Bob autoSec__retDataCh_Bob_comm4 - SET autoSec__retDataCh_Bob_comm4 priority 0 + SET autoSec__retDataCh_Bob_comm4 priority 5 MAP BusBob autoSec__retDataCh_Bob_comm4 - SET autoSec__retDataCh_Bob_comm4 priority 0 + SET autoSec__retDataCh_Bob_comm4 priority 5 MAP Memory_HSM_Bob autoSec__nonceChBob_Alice_comm4 - SET autoSec__nonceChBob_Alice_comm4 priority 0 + SET autoSec__nonceChBob_Alice_comm4 priority 5 MAP Bus_HSM_Bob autoSec__nonceChBob_Alice_comm4 - SET autoSec__nonceChBob_Alice_comm4 priority 0 + SET autoSec__nonceChBob_Alice_comm4 priority 5 MAP BusBob autoSec__nonceChBob_Alice_comm4 - SET autoSec__nonceChBob_Alice_comm4 priority 0 + SET autoSec__nonceChBob_Alice_comm4 priority 5 MAP BusAlice autoSec__nonceChBob_Alice_comm4 - SET autoSec__nonceChBob_Alice_comm4 priority 0 + SET autoSec__nonceChBob_Alice_comm4 priority 5 MAP ExternalBus autoSec__nonceChBob_Alice_comm4 - SET autoSec__nonceChBob_Alice_comm4 priority 0 + SET autoSec__nonceChBob_Alice_comm4 priority 5 MAP Memory_HSM_Bob autoSec__retDataCh_Bob_comm - SET autoSec__retDataCh_Bob_comm priority 0 + SET autoSec__retDataCh_Bob_comm priority 5 MAP Bus_HSM_Bob autoSec__retDataCh_Bob_comm - SET autoSec__retDataCh_Bob_comm priority 0 + SET autoSec__retDataCh_Bob_comm priority 5 MAP BusBob autoSec__retDataCh_Bob_comm - SET autoSec__retDataCh_Bob_comm priority 0 + SET autoSec__retDataCh_Bob_comm priority 5 MAP Memory_HSM_Bob autoSec__retDataCh_Bob_comm1 - SET autoSec__retDataCh_Bob_comm1 priority 0 + SET autoSec__retDataCh_Bob_comm1 priority 5 MAP Bus_HSM_Bob autoSec__retDataCh_Bob_comm1 - SET autoSec__retDataCh_Bob_comm1 priority 0 + SET autoSec__retDataCh_Bob_comm1 priority 5 MAP BusBob autoSec__retDataCh_Bob_comm1 - SET autoSec__retDataCh_Bob_comm1 priority 0 + SET autoSec__retDataCh_Bob_comm1 priority 5 MAP Memory_HSM_Bob autoSec__retDataCh_Bob_comm2 - SET autoSec__retDataCh_Bob_comm2 priority 0 + SET autoSec__retDataCh_Bob_comm2 priority 5 MAP Bus_HSM_Bob autoSec__retDataCh_Bob_comm2 - SET autoSec__retDataCh_Bob_comm2 priority 0 + SET autoSec__retDataCh_Bob_comm2 priority 5 MAP BusBob autoSec__retDataCh_Bob_comm2 - SET autoSec__retDataCh_Bob_comm2 priority 0 + SET autoSec__retDataCh_Bob_comm2 priority 5 MAP Memory_HSM_Bob autoSec__nonceChBob_Alice_comm2 - SET autoSec__nonceChBob_Alice_comm2 priority 0 + SET autoSec__nonceChBob_Alice_comm2 priority 5 MAP Bus_HSM_Bob autoSec__nonceChBob_Alice_comm2 - SET autoSec__nonceChBob_Alice_comm2 priority 0 + SET autoSec__nonceChBob_Alice_comm2 priority 5 MAP BusBob autoSec__nonceChBob_Alice_comm2 - SET autoSec__nonceChBob_Alice_comm2 priority 0 + SET autoSec__nonceChBob_Alice_comm2 priority 5 MAP ExternalBus autoSec__nonceChBob_Alice_comm2 - SET autoSec__nonceChBob_Alice_comm2 priority 0 + SET autoSec__nonceChBob_Alice_comm2 priority 5 MAP BusAlice autoSec__nonceChBob_Alice_comm2 - SET autoSec__nonceChBob_Alice_comm2 priority 0 + SET autoSec__nonceChBob_Alice_comm2 priority 5 MAPSEC MemoryAlice mac_comm3 MAPSEC Memory_HSM_Bob mac_comm3 MAPSEC MemoryAlice mac_comm4 diff --git a/ttool/src/test/resources/tmltranslator/AutoSecGenDiplodocusTest/Models/modelWithMultiChannelsAndMultiUse/CasesWithPrivateHSMs/CaseWithHSMAlice/golden/spec.tmap b/ttool/src/test/resources/tmltranslator/AutoSecGenDiplodocusTest/Models/modelWithMultiChannelsAndMultiUse/CasesWithPrivateHSMs/CaseWithHSMAlice/golden/spec.tmap index bbcbb540869ea34ae9813ce9a053d9243349a2aa..9b937e04b051dc876832513cece17b52f49df44f 100644 --- a/ttool/src/test/resources/tmltranslator/AutoSecGenDiplodocusTest/Models/modelWithMultiChannelsAndMultiUse/CasesWithPrivateHSMs/CaseWithHSMAlice/golden/spec.tmap +++ b/ttool/src/test/resources/tmltranslator/AutoSecGenDiplodocusTest/Models/modelWithMultiChannelsAndMultiUse/CasesWithPrivateHSMs/CaseWithHSMAlice/golden/spec.tmap @@ -8,147 +8,147 @@ ENDTMLARCHI TMLMAPPING MAP CPUAlice autoSec__Alice - SET autoSec__Alice priority 0 + SET autoSec__Alice priority 5 MAP CPUBob autoSec__Bob - SET autoSec__Bob priority 0 + SET autoSec__Bob priority 5 MAP HwA_HSM_Alice_Encrypt_comm1 autoSec__HSM_Alice_Encrypt_comm1 - SET autoSec__HSM_Alice_Encrypt_comm1 priority 0 + SET autoSec__HSM_Alice_Encrypt_comm1 priority 5 MAP HwA_HSM_Alice_Encrypt_comm2 autoSec__HSM_Alice_Encrypt_comm2 - SET autoSec__HSM_Alice_Encrypt_comm2 priority 0 + SET autoSec__HSM_Alice_Encrypt_comm2 priority 5 MAP HwA_HSM_Alice_Encrypt_comm4 autoSec__HSM_Alice_Encrypt_comm4 - SET autoSec__HSM_Alice_Encrypt_comm4 priority 0 + SET autoSec__HSM_Alice_Encrypt_comm4 priority 5 MAP HwA_HSM_Alice_Encrypt_comm3 autoSec__HSM_Alice_Encrypt_comm3 - SET autoSec__HSM_Alice_Encrypt_comm3 priority 0 + SET autoSec__HSM_Alice_Encrypt_comm3 priority 5 MAP HwA_HSM_Alice_Encrypt_comm autoSec__HSM_Alice_Encrypt_comm - SET autoSec__HSM_Alice_Encrypt_comm priority 0 + SET autoSec__HSM_Alice_Encrypt_comm priority 5 MAP ExternalMemory autoSec__comm1 - SET autoSec__comm1 priority 0 + SET autoSec__comm1 priority 5 MAP BusBob autoSec__comm1 - SET autoSec__comm1 priority 0 + SET autoSec__comm1 priority 5 MAP BusAlice autoSec__comm1 - SET autoSec__comm1 priority 0 + SET autoSec__comm1 priority 5 MAP ExternalBus autoSec__comm1 - SET autoSec__comm1 priority 0 + SET autoSec__comm1 priority 5 MAP ExternalMemory autoSec__comm - SET autoSec__comm priority 0 + SET autoSec__comm priority 5 MAP ExternalBus autoSec__comm - SET autoSec__comm priority 0 + SET autoSec__comm priority 5 MAP BusAlice autoSec__comm - SET autoSec__comm priority 0 + SET autoSec__comm priority 5 MAP BusBob autoSec__comm - SET autoSec__comm priority 0 + SET autoSec__comm priority 5 MAP ExternalMemory autoSec__comm2 - SET autoSec__comm2 priority 0 + SET autoSec__comm2 priority 5 MAP ExternalBus autoSec__comm2 - SET autoSec__comm2 priority 0 + SET autoSec__comm2 priority 5 MAP BusBob autoSec__comm2 - SET autoSec__comm2 priority 0 + SET autoSec__comm2 priority 5 MAP BusAlice autoSec__comm2 - SET autoSec__comm2 priority 0 + SET autoSec__comm2 priority 5 MAP ExternalMemory autoSec__comm3 - SET autoSec__comm3 priority 0 + SET autoSec__comm3 priority 5 MAP BusBob autoSec__comm3 - SET autoSec__comm3 priority 0 + SET autoSec__comm3 priority 5 MAP BusAlice autoSec__comm3 - SET autoSec__comm3 priority 0 + SET autoSec__comm3 priority 5 MAP ExternalBus autoSec__comm3 - SET autoSec__comm3 priority 0 + SET autoSec__comm3 priority 5 MAP ExternalMemory autoSec__comm4 - SET autoSec__comm4 priority 0 + SET autoSec__comm4 priority 5 MAP BusBob autoSec__comm4 - SET autoSec__comm4 priority 0 + SET autoSec__comm4 priority 5 MAP BusAlice autoSec__comm4 - SET autoSec__comm4 priority 0 + SET autoSec__comm4 priority 5 MAP ExternalBus autoSec__comm4 - SET autoSec__comm4 priority 0 + SET autoSec__comm4 priority 5 MAP ExternalMemory autoSec__nonceChBob_Alice_comm2 - SET autoSec__nonceChBob_Alice_comm2 priority 0 + SET autoSec__nonceChBob_Alice_comm2 priority 5 MAP ExternalBus autoSec__nonceChBob_Alice_comm2 - SET autoSec__nonceChBob_Alice_comm2 priority 0 + SET autoSec__nonceChBob_Alice_comm2 priority 5 MAP BusBob autoSec__nonceChBob_Alice_comm2 - SET autoSec__nonceChBob_Alice_comm2 priority 0 + SET autoSec__nonceChBob_Alice_comm2 priority 5 MAP BusAlice autoSec__nonceChBob_Alice_comm2 - SET autoSec__nonceChBob_Alice_comm2 priority 0 + SET autoSec__nonceChBob_Alice_comm2 priority 5 MAP ExternalMemory autoSec__nonceChBob_Alice_comm4 - SET autoSec__nonceChBob_Alice_comm4 priority 0 + SET autoSec__nonceChBob_Alice_comm4 priority 5 MAP BusBob autoSec__nonceChBob_Alice_comm4 - SET autoSec__nonceChBob_Alice_comm4 priority 0 + SET autoSec__nonceChBob_Alice_comm4 priority 5 MAP BusAlice autoSec__nonceChBob_Alice_comm4 - SET autoSec__nonceChBob_Alice_comm4 priority 0 + SET autoSec__nonceChBob_Alice_comm4 priority 5 MAP ExternalBus autoSec__nonceChBob_Alice_comm4 - SET autoSec__nonceChBob_Alice_comm4 priority 0 + SET autoSec__nonceChBob_Alice_comm4 priority 5 MAP MemoryAlice autoSec__dataNonceChAlice_Bob - SET autoSec__dataNonceChAlice_Bob priority 0 + SET autoSec__dataNonceChAlice_Bob priority 5 MAP Bus_HSM_Alice autoSec__dataNonceChAlice_Bob - SET autoSec__dataNonceChAlice_Bob priority 0 + SET autoSec__dataNonceChAlice_Bob priority 5 MAP BusAlice autoSec__dataNonceChAlice_Bob - SET autoSec__dataNonceChAlice_Bob priority 0 + SET autoSec__dataNonceChAlice_Bob priority 5 MAP MemoryAlice autoSec__dataCh_Alice_comm2 - SET autoSec__dataCh_Alice_comm2 priority 0 + SET autoSec__dataCh_Alice_comm2 priority 5 MAP Bus_HSM_Alice autoSec__dataCh_Alice_comm2 - SET autoSec__dataCh_Alice_comm2 priority 0 + SET autoSec__dataCh_Alice_comm2 priority 5 MAP BusAlice autoSec__dataCh_Alice_comm2 - SET autoSec__dataCh_Alice_comm2 priority 0 + SET autoSec__dataCh_Alice_comm2 priority 5 MAP MemoryAlice autoSec__dataCh_Alice_comm1 - SET autoSec__dataCh_Alice_comm1 priority 0 + SET autoSec__dataCh_Alice_comm1 priority 5 MAP Bus_HSM_Alice autoSec__dataCh_Alice_comm1 - SET autoSec__dataCh_Alice_comm1 priority 0 + SET autoSec__dataCh_Alice_comm1 priority 5 MAP BusAlice autoSec__dataCh_Alice_comm1 - SET autoSec__dataCh_Alice_comm1 priority 0 + SET autoSec__dataCh_Alice_comm1 priority 5 MAP MemoryAlice autoSec__dataCh_Alice_comm - SET autoSec__dataCh_Alice_comm priority 0 + SET autoSec__dataCh_Alice_comm priority 5 MAP Bus_HSM_Alice autoSec__dataCh_Alice_comm - SET autoSec__dataCh_Alice_comm priority 0 + SET autoSec__dataCh_Alice_comm priority 5 MAP BusAlice autoSec__dataCh_Alice_comm - SET autoSec__dataCh_Alice_comm priority 0 + SET autoSec__dataCh_Alice_comm priority 5 MAP MemoryAlice autoSec__dataNonceChAlice_Bob0 - SET autoSec__dataNonceChAlice_Bob0 priority 0 + SET autoSec__dataNonceChAlice_Bob0 priority 5 MAP Bus_HSM_Alice autoSec__dataNonceChAlice_Bob0 - SET autoSec__dataNonceChAlice_Bob0 priority 0 + SET autoSec__dataNonceChAlice_Bob0 priority 5 MAP BusAlice autoSec__dataNonceChAlice_Bob0 - SET autoSec__dataNonceChAlice_Bob0 priority 0 + SET autoSec__dataNonceChAlice_Bob0 priority 5 MAP MemoryAlice autoSec__dataCh_Alice_comm4 - SET autoSec__dataCh_Alice_comm4 priority 0 + SET autoSec__dataCh_Alice_comm4 priority 5 MAP Bus_HSM_Alice autoSec__dataCh_Alice_comm4 - SET autoSec__dataCh_Alice_comm4 priority 0 + SET autoSec__dataCh_Alice_comm4 priority 5 MAP BusAlice autoSec__dataCh_Alice_comm4 - SET autoSec__dataCh_Alice_comm4 priority 0 + SET autoSec__dataCh_Alice_comm4 priority 5 MAP MemoryAlice autoSec__dataCh_Alice_comm3 - SET autoSec__dataCh_Alice_comm3 priority 0 + SET autoSec__dataCh_Alice_comm3 priority 5 MAP Bus_HSM_Alice autoSec__dataCh_Alice_comm3 - SET autoSec__dataCh_Alice_comm3 priority 0 + SET autoSec__dataCh_Alice_comm3 priority 5 MAP BusAlice autoSec__dataCh_Alice_comm3 - SET autoSec__dataCh_Alice_comm3 priority 0 + SET autoSec__dataCh_Alice_comm3 priority 5 MAP Memory_HSM_Alice autoSec__retDataCh_Alice_comm2 - SET autoSec__retDataCh_Alice_comm2 priority 0 + SET autoSec__retDataCh_Alice_comm2 priority 5 MAP Bus_HSM_Alice autoSec__retDataCh_Alice_comm2 - SET autoSec__retDataCh_Alice_comm2 priority 0 + SET autoSec__retDataCh_Alice_comm2 priority 5 MAP BusAlice autoSec__retDataCh_Alice_comm2 - SET autoSec__retDataCh_Alice_comm2 priority 0 + SET autoSec__retDataCh_Alice_comm2 priority 5 MAP Memory_HSM_Alice autoSec__retDataCh_Alice_comm1 - SET autoSec__retDataCh_Alice_comm1 priority 0 + SET autoSec__retDataCh_Alice_comm1 priority 5 MAP Bus_HSM_Alice autoSec__retDataCh_Alice_comm1 - SET autoSec__retDataCh_Alice_comm1 priority 0 + SET autoSec__retDataCh_Alice_comm1 priority 5 MAP BusAlice autoSec__retDataCh_Alice_comm1 - SET autoSec__retDataCh_Alice_comm1 priority 0 + SET autoSec__retDataCh_Alice_comm1 priority 5 MAP Memory_HSM_Alice autoSec__retDataCh_Alice_comm - SET autoSec__retDataCh_Alice_comm priority 0 + SET autoSec__retDataCh_Alice_comm priority 5 MAP Bus_HSM_Alice autoSec__retDataCh_Alice_comm - SET autoSec__retDataCh_Alice_comm priority 0 + SET autoSec__retDataCh_Alice_comm priority 5 MAP BusAlice autoSec__retDataCh_Alice_comm - SET autoSec__retDataCh_Alice_comm priority 0 + SET autoSec__retDataCh_Alice_comm priority 5 MAP Memory_HSM_Alice autoSec__retDataCh_Alice_comm4 - SET autoSec__retDataCh_Alice_comm4 priority 0 + SET autoSec__retDataCh_Alice_comm4 priority 5 MAP Bus_HSM_Alice autoSec__retDataCh_Alice_comm4 - SET autoSec__retDataCh_Alice_comm4 priority 0 + SET autoSec__retDataCh_Alice_comm4 priority 5 MAP BusAlice autoSec__retDataCh_Alice_comm4 - SET autoSec__retDataCh_Alice_comm4 priority 0 + SET autoSec__retDataCh_Alice_comm4 priority 5 MAP Memory_HSM_Alice autoSec__retDataCh_Alice_comm3 - SET autoSec__retDataCh_Alice_comm3 priority 0 + SET autoSec__retDataCh_Alice_comm3 priority 5 MAP Bus_HSM_Alice autoSec__retDataCh_Alice_comm3 - SET autoSec__retDataCh_Alice_comm3 priority 0 + SET autoSec__retDataCh_Alice_comm3 priority 5 MAP BusAlice autoSec__retDataCh_Alice_comm3 - SET autoSec__retDataCh_Alice_comm3 priority 0 + SET autoSec__retDataCh_Alice_comm3 priority 5 MAPSEC MemoryBob se_comm MAPSEC Memory_HSM_Alice se_comm MAPSEC MemoryBob se_comm2 diff --git a/ttool/src/test/resources/tmltranslator/AutoSecGenDiplodocusTest/Models/modelWithMultiChannelsAndMultiUse/CasesWithPrivateHSMs/CaseWithHSMAliceBob/golden/spec.tmap b/ttool/src/test/resources/tmltranslator/AutoSecGenDiplodocusTest/Models/modelWithMultiChannelsAndMultiUse/CasesWithPrivateHSMs/CaseWithHSMAliceBob/golden/spec.tmap index 4bba7f769546a5dc72c6b6f567361ef3e8d944cd..969d93f20471f0bbb399a48044df098373aff645 100644 --- a/ttool/src/test/resources/tmltranslator/AutoSecGenDiplodocusTest/Models/modelWithMultiChannelsAndMultiUse/CasesWithPrivateHSMs/CaseWithHSMAliceBob/golden/spec.tmap +++ b/ttool/src/test/resources/tmltranslator/AutoSecGenDiplodocusTest/Models/modelWithMultiChannelsAndMultiUse/CasesWithPrivateHSMs/CaseWithHSMAliceBob/golden/spec.tmap @@ -8,229 +8,229 @@ ENDTMLARCHI TMLMAPPING MAP CPUAlice autoSec__Alice - SET autoSec__Alice priority 0 + SET autoSec__Alice priority 5 MAP CPUBob autoSec__Bob - SET autoSec__Bob priority 0 + SET autoSec__Bob priority 5 MAP HwA_HSM_Bob_Decrypt_comm3 autoSec__HSM_Bob_Decrypt_comm3 - SET autoSec__HSM_Bob_Decrypt_comm3 priority 0 + SET autoSec__HSM_Bob_Decrypt_comm3 priority 5 MAP HwA_HSM_Bob_Decrypt_comm1 autoSec__HSM_Bob_Decrypt_comm1 - SET autoSec__HSM_Bob_Decrypt_comm1 priority 0 + SET autoSec__HSM_Bob_Decrypt_comm1 priority 5 MAP HwA_HSM_Alice_Encrypt_comm4 autoSec__HSM_Alice_Encrypt_comm4 - SET autoSec__HSM_Alice_Encrypt_comm4 priority 0 + SET autoSec__HSM_Alice_Encrypt_comm4 priority 5 MAP HwA_HSM_Alice_Encrypt_comm3 autoSec__HSM_Alice_Encrypt_comm3 - SET autoSec__HSM_Alice_Encrypt_comm3 priority 0 + SET autoSec__HSM_Alice_Encrypt_comm3 priority 5 MAP HwA_HSM_Alice_Encrypt_comm2 autoSec__HSM_Alice_Encrypt_comm2 - SET autoSec__HSM_Alice_Encrypt_comm2 priority 0 + SET autoSec__HSM_Alice_Encrypt_comm2 priority 5 MAP HwA_HSM_Alice_Encrypt_comm autoSec__HSM_Alice_Encrypt_comm - SET autoSec__HSM_Alice_Encrypt_comm priority 0 + SET autoSec__HSM_Alice_Encrypt_comm priority 5 MAP HwA_HSM_Bob_Decrypt_comm4 autoSec__HSM_Bob_Decrypt_comm4 - SET autoSec__HSM_Bob_Decrypt_comm4 priority 0 + SET autoSec__HSM_Bob_Decrypt_comm4 priority 5 MAP HwA_HSM_Alice_Encrypt_comm1 autoSec__HSM_Alice_Encrypt_comm1 - SET autoSec__HSM_Alice_Encrypt_comm1 priority 0 + SET autoSec__HSM_Alice_Encrypt_comm1 priority 5 MAP HwA_HSM_Bob_Decrypt_comm2 autoSec__HSM_Bob_Decrypt_comm2 - SET autoSec__HSM_Bob_Decrypt_comm2 priority 0 + SET autoSec__HSM_Bob_Decrypt_comm2 priority 5 MAP HwA_HSM_Bob_Decrypt_comm autoSec__HSM_Bob_Decrypt_comm - SET autoSec__HSM_Bob_Decrypt_comm priority 0 + SET autoSec__HSM_Bob_Decrypt_comm priority 5 MAP ExternalMemory autoSec__nonceChBob_Alice_comm4 - SET autoSec__nonceChBob_Alice_comm4 priority 0 + SET autoSec__nonceChBob_Alice_comm4 priority 5 MAP BusBob autoSec__nonceChBob_Alice_comm4 - SET autoSec__nonceChBob_Alice_comm4 priority 0 + SET autoSec__nonceChBob_Alice_comm4 priority 5 MAP BusAlice autoSec__nonceChBob_Alice_comm4 - SET autoSec__nonceChBob_Alice_comm4 priority 0 + SET autoSec__nonceChBob_Alice_comm4 priority 5 MAP ExternalBus autoSec__nonceChBob_Alice_comm4 - SET autoSec__nonceChBob_Alice_comm4 priority 0 + SET autoSec__nonceChBob_Alice_comm4 priority 5 MAP ExternalMemory autoSec__nonceChBob_Alice_comm2 - SET autoSec__nonceChBob_Alice_comm2 priority 0 + SET autoSec__nonceChBob_Alice_comm2 priority 5 MAP ExternalBus autoSec__nonceChBob_Alice_comm2 - SET autoSec__nonceChBob_Alice_comm2 priority 0 + SET autoSec__nonceChBob_Alice_comm2 priority 5 MAP BusBob autoSec__nonceChBob_Alice_comm2 - SET autoSec__nonceChBob_Alice_comm2 priority 0 + SET autoSec__nonceChBob_Alice_comm2 priority 5 MAP BusAlice autoSec__nonceChBob_Alice_comm2 - SET autoSec__nonceChBob_Alice_comm2 priority 0 + SET autoSec__nonceChBob_Alice_comm2 priority 5 MAP ExternalMemory autoSec__comm1 - SET autoSec__comm1 priority 0 + SET autoSec__comm1 priority 5 MAP BusBob autoSec__comm1 - SET autoSec__comm1 priority 0 + SET autoSec__comm1 priority 5 MAP BusAlice autoSec__comm1 - SET autoSec__comm1 priority 0 + SET autoSec__comm1 priority 5 MAP ExternalBus autoSec__comm1 - SET autoSec__comm1 priority 0 + SET autoSec__comm1 priority 5 MAP ExternalMemory autoSec__comm - SET autoSec__comm priority 0 + SET autoSec__comm priority 5 MAP ExternalBus autoSec__comm - SET autoSec__comm priority 0 + SET autoSec__comm priority 5 MAP BusAlice autoSec__comm - SET autoSec__comm priority 0 + SET autoSec__comm priority 5 MAP BusBob autoSec__comm - SET autoSec__comm priority 0 + SET autoSec__comm priority 5 MAP ExternalMemory autoSec__comm2 - SET autoSec__comm2 priority 0 + SET autoSec__comm2 priority 5 MAP ExternalBus autoSec__comm2 - SET autoSec__comm2 priority 0 + SET autoSec__comm2 priority 5 MAP BusBob autoSec__comm2 - SET autoSec__comm2 priority 0 + SET autoSec__comm2 priority 5 MAP BusAlice autoSec__comm2 - SET autoSec__comm2 priority 0 + SET autoSec__comm2 priority 5 MAP ExternalMemory autoSec__comm3 - SET autoSec__comm3 priority 0 + SET autoSec__comm3 priority 5 MAP BusBob autoSec__comm3 - SET autoSec__comm3 priority 0 + SET autoSec__comm3 priority 5 MAP BusAlice autoSec__comm3 - SET autoSec__comm3 priority 0 + SET autoSec__comm3 priority 5 MAP ExternalBus autoSec__comm3 - SET autoSec__comm3 priority 0 + SET autoSec__comm3 priority 5 MAP ExternalMemory autoSec__comm4 - SET autoSec__comm4 priority 0 + SET autoSec__comm4 priority 5 MAP BusBob autoSec__comm4 - SET autoSec__comm4 priority 0 + SET autoSec__comm4 priority 5 MAP BusAlice autoSec__comm4 - SET autoSec__comm4 priority 0 + SET autoSec__comm4 priority 5 MAP ExternalBus autoSec__comm4 - SET autoSec__comm4 priority 0 + SET autoSec__comm4 priority 5 MAP MemoryAlice autoSec__dataCh_Alice_comm3 - SET autoSec__dataCh_Alice_comm3 priority 0 + SET autoSec__dataCh_Alice_comm3 priority 5 MAP Bus_HSM_Alice autoSec__dataCh_Alice_comm3 - SET autoSec__dataCh_Alice_comm3 priority 0 + SET autoSec__dataCh_Alice_comm3 priority 5 MAP BusAlice autoSec__dataCh_Alice_comm3 - SET autoSec__dataCh_Alice_comm3 priority 0 + SET autoSec__dataCh_Alice_comm3 priority 5 MAP MemoryAlice autoSec__dataNonceChAlice_Bob0 - SET autoSec__dataNonceChAlice_Bob0 priority 0 + SET autoSec__dataNonceChAlice_Bob0 priority 5 MAP Bus_HSM_Alice autoSec__dataNonceChAlice_Bob0 - SET autoSec__dataNonceChAlice_Bob0 priority 0 + SET autoSec__dataNonceChAlice_Bob0 priority 5 MAP BusAlice autoSec__dataNonceChAlice_Bob0 - SET autoSec__dataNonceChAlice_Bob0 priority 0 + SET autoSec__dataNonceChAlice_Bob0 priority 5 MAP MemoryAlice autoSec__dataCh_Alice_comm4 - SET autoSec__dataCh_Alice_comm4 priority 0 + SET autoSec__dataCh_Alice_comm4 priority 5 MAP Bus_HSM_Alice autoSec__dataCh_Alice_comm4 - SET autoSec__dataCh_Alice_comm4 priority 0 + SET autoSec__dataCh_Alice_comm4 priority 5 MAP BusAlice autoSec__dataCh_Alice_comm4 - SET autoSec__dataCh_Alice_comm4 priority 0 + SET autoSec__dataCh_Alice_comm4 priority 5 MAP MemoryAlice autoSec__dataCh_Alice_comm - SET autoSec__dataCh_Alice_comm priority 0 + SET autoSec__dataCh_Alice_comm priority 5 MAP Bus_HSM_Alice autoSec__dataCh_Alice_comm - SET autoSec__dataCh_Alice_comm priority 0 + SET autoSec__dataCh_Alice_comm priority 5 MAP BusAlice autoSec__dataCh_Alice_comm - SET autoSec__dataCh_Alice_comm priority 0 + SET autoSec__dataCh_Alice_comm priority 5 MAP MemoryAlice autoSec__dataCh_Alice_comm1 - SET autoSec__dataCh_Alice_comm1 priority 0 + SET autoSec__dataCh_Alice_comm1 priority 5 MAP Bus_HSM_Alice autoSec__dataCh_Alice_comm1 - SET autoSec__dataCh_Alice_comm1 priority 0 + SET autoSec__dataCh_Alice_comm1 priority 5 MAP BusAlice autoSec__dataCh_Alice_comm1 - SET autoSec__dataCh_Alice_comm1 priority 0 + SET autoSec__dataCh_Alice_comm1 priority 5 MAP MemoryAlice autoSec__dataNonceChAlice_Bob - SET autoSec__dataNonceChAlice_Bob priority 0 + SET autoSec__dataNonceChAlice_Bob priority 5 MAP Bus_HSM_Alice autoSec__dataNonceChAlice_Bob - SET autoSec__dataNonceChAlice_Bob priority 0 + SET autoSec__dataNonceChAlice_Bob priority 5 MAP BusAlice autoSec__dataNonceChAlice_Bob - SET autoSec__dataNonceChAlice_Bob priority 0 + SET autoSec__dataNonceChAlice_Bob priority 5 MAP MemoryAlice autoSec__dataCh_Alice_comm2 - SET autoSec__dataCh_Alice_comm2 priority 0 + SET autoSec__dataCh_Alice_comm2 priority 5 MAP Bus_HSM_Alice autoSec__dataCh_Alice_comm2 - SET autoSec__dataCh_Alice_comm2 priority 0 + SET autoSec__dataCh_Alice_comm2 priority 5 MAP BusAlice autoSec__dataCh_Alice_comm2 - SET autoSec__dataCh_Alice_comm2 priority 0 + SET autoSec__dataCh_Alice_comm2 priority 5 MAP MemoryBob autoSec__dataCh_Bob_comm3 - SET autoSec__dataCh_Bob_comm3 priority 0 + SET autoSec__dataCh_Bob_comm3 priority 5 MAP Bus_HSM_Bob autoSec__dataCh_Bob_comm3 - SET autoSec__dataCh_Bob_comm3 priority 0 + SET autoSec__dataCh_Bob_comm3 priority 5 MAP BusBob autoSec__dataCh_Bob_comm3 - SET autoSec__dataCh_Bob_comm3 priority 0 + SET autoSec__dataCh_Bob_comm3 priority 5 MAP MemoryBob autoSec__dataCh_Bob_comm4 - SET autoSec__dataCh_Bob_comm4 priority 0 + SET autoSec__dataCh_Bob_comm4 priority 5 MAP Bus_HSM_Bob autoSec__dataCh_Bob_comm4 - SET autoSec__dataCh_Bob_comm4 priority 0 + SET autoSec__dataCh_Bob_comm4 priority 5 MAP BusBob autoSec__dataCh_Bob_comm4 - SET autoSec__dataCh_Bob_comm4 priority 0 + SET autoSec__dataCh_Bob_comm4 priority 5 MAP MemoryBob autoSec__dataCh_Bob_comm - SET autoSec__dataCh_Bob_comm priority 0 + SET autoSec__dataCh_Bob_comm priority 5 MAP Bus_HSM_Bob autoSec__dataCh_Bob_comm - SET autoSec__dataCh_Bob_comm priority 0 + SET autoSec__dataCh_Bob_comm priority 5 MAP BusBob autoSec__dataCh_Bob_comm - SET autoSec__dataCh_Bob_comm priority 0 + SET autoSec__dataCh_Bob_comm priority 5 MAP MemoryBob autoSec__dataCh_Bob_comm1 - SET autoSec__dataCh_Bob_comm1 priority 0 + SET autoSec__dataCh_Bob_comm1 priority 5 MAP Bus_HSM_Bob autoSec__dataCh_Bob_comm1 - SET autoSec__dataCh_Bob_comm1 priority 0 + SET autoSec__dataCh_Bob_comm1 priority 5 MAP BusBob autoSec__dataCh_Bob_comm1 - SET autoSec__dataCh_Bob_comm1 priority 0 + SET autoSec__dataCh_Bob_comm1 priority 5 MAP MemoryBob autoSec__dataCh_Bob_comm2 - SET autoSec__dataCh_Bob_comm2 priority 0 + SET autoSec__dataCh_Bob_comm2 priority 5 MAP Bus_HSM_Bob autoSec__dataCh_Bob_comm2 - SET autoSec__dataCh_Bob_comm2 priority 0 + SET autoSec__dataCh_Bob_comm2 priority 5 MAP BusBob autoSec__dataCh_Bob_comm2 - SET autoSec__dataCh_Bob_comm2 priority 0 + SET autoSec__dataCh_Bob_comm2 priority 5 MAP Memory_HSM_Alice autoSec__retDataCh_Alice_comm3 - SET autoSec__retDataCh_Alice_comm3 priority 0 + SET autoSec__retDataCh_Alice_comm3 priority 5 MAP Bus_HSM_Alice autoSec__retDataCh_Alice_comm3 - SET autoSec__retDataCh_Alice_comm3 priority 0 + SET autoSec__retDataCh_Alice_comm3 priority 5 MAP BusAlice autoSec__retDataCh_Alice_comm3 - SET autoSec__retDataCh_Alice_comm3 priority 0 + SET autoSec__retDataCh_Alice_comm3 priority 5 MAP Memory_HSM_Alice autoSec__retDataCh_Alice_comm4 - SET autoSec__retDataCh_Alice_comm4 priority 0 + SET autoSec__retDataCh_Alice_comm4 priority 5 MAP Bus_HSM_Alice autoSec__retDataCh_Alice_comm4 - SET autoSec__retDataCh_Alice_comm4 priority 0 + SET autoSec__retDataCh_Alice_comm4 priority 5 MAP BusAlice autoSec__retDataCh_Alice_comm4 - SET autoSec__retDataCh_Alice_comm4 priority 0 + SET autoSec__retDataCh_Alice_comm4 priority 5 MAP Memory_HSM_Alice autoSec__retDataCh_Alice_comm - SET autoSec__retDataCh_Alice_comm priority 0 + SET autoSec__retDataCh_Alice_comm priority 5 MAP Bus_HSM_Alice autoSec__retDataCh_Alice_comm - SET autoSec__retDataCh_Alice_comm priority 0 + SET autoSec__retDataCh_Alice_comm priority 5 MAP BusAlice autoSec__retDataCh_Alice_comm - SET autoSec__retDataCh_Alice_comm priority 0 + SET autoSec__retDataCh_Alice_comm priority 5 MAP Memory_HSM_Alice autoSec__retDataCh_Alice_comm1 - SET autoSec__retDataCh_Alice_comm1 priority 0 + SET autoSec__retDataCh_Alice_comm1 priority 5 MAP Bus_HSM_Alice autoSec__retDataCh_Alice_comm1 - SET autoSec__retDataCh_Alice_comm1 priority 0 + SET autoSec__retDataCh_Alice_comm1 priority 5 MAP BusAlice autoSec__retDataCh_Alice_comm1 - SET autoSec__retDataCh_Alice_comm1 priority 0 + SET autoSec__retDataCh_Alice_comm1 priority 5 MAP Memory_HSM_Alice autoSec__retDataCh_Alice_comm2 - SET autoSec__retDataCh_Alice_comm2 priority 0 + SET autoSec__retDataCh_Alice_comm2 priority 5 MAP Bus_HSM_Alice autoSec__retDataCh_Alice_comm2 - SET autoSec__retDataCh_Alice_comm2 priority 0 + SET autoSec__retDataCh_Alice_comm2 priority 5 MAP BusAlice autoSec__retDataCh_Alice_comm2 - SET autoSec__retDataCh_Alice_comm2 priority 0 + SET autoSec__retDataCh_Alice_comm2 priority 5 MAP Memory_HSM_Bob autoSec__retDataCh_Bob_comm3 - SET autoSec__retDataCh_Bob_comm3 priority 0 + SET autoSec__retDataCh_Bob_comm3 priority 5 MAP Bus_HSM_Bob autoSec__retDataCh_Bob_comm3 - SET autoSec__retDataCh_Bob_comm3 priority 0 + SET autoSec__retDataCh_Bob_comm3 priority 5 MAP BusBob autoSec__retDataCh_Bob_comm3 - SET autoSec__retDataCh_Bob_comm3 priority 0 + SET autoSec__retDataCh_Bob_comm3 priority 5 MAP Memory_HSM_Bob autoSec__retDataNonceChAlice_Bob0 - SET autoSec__retDataNonceChAlice_Bob0 priority 0 + SET autoSec__retDataNonceChAlice_Bob0 priority 5 MAP Bus_HSM_Bob autoSec__retDataNonceChAlice_Bob0 - SET autoSec__retDataNonceChAlice_Bob0 priority 0 + SET autoSec__retDataNonceChAlice_Bob0 priority 5 MAP BusBob autoSec__retDataNonceChAlice_Bob0 - SET autoSec__retDataNonceChAlice_Bob0 priority 0 + SET autoSec__retDataNonceChAlice_Bob0 priority 5 MAP Memory_HSM_Bob autoSec__retDataCh_Bob_comm4 - SET autoSec__retDataCh_Bob_comm4 priority 0 + SET autoSec__retDataCh_Bob_comm4 priority 5 MAP Bus_HSM_Bob autoSec__retDataCh_Bob_comm4 - SET autoSec__retDataCh_Bob_comm4 priority 0 + SET autoSec__retDataCh_Bob_comm4 priority 5 MAP BusBob autoSec__retDataCh_Bob_comm4 - SET autoSec__retDataCh_Bob_comm4 priority 0 + SET autoSec__retDataCh_Bob_comm4 priority 5 MAP Memory_HSM_Bob autoSec__retDataCh_Bob_comm - SET autoSec__retDataCh_Bob_comm priority 0 + SET autoSec__retDataCh_Bob_comm priority 5 MAP Bus_HSM_Bob autoSec__retDataCh_Bob_comm - SET autoSec__retDataCh_Bob_comm priority 0 + SET autoSec__retDataCh_Bob_comm priority 5 MAP BusBob autoSec__retDataCh_Bob_comm - SET autoSec__retDataCh_Bob_comm priority 0 + SET autoSec__retDataCh_Bob_comm priority 5 MAP Memory_HSM_Bob autoSec__retDataCh_Bob_comm1 - SET autoSec__retDataCh_Bob_comm1 priority 0 + SET autoSec__retDataCh_Bob_comm1 priority 5 MAP Bus_HSM_Bob autoSec__retDataCh_Bob_comm1 - SET autoSec__retDataCh_Bob_comm1 priority 0 + SET autoSec__retDataCh_Bob_comm1 priority 5 MAP BusBob autoSec__retDataCh_Bob_comm1 - SET autoSec__retDataCh_Bob_comm1 priority 0 + SET autoSec__retDataCh_Bob_comm1 priority 5 MAP Memory_HSM_Bob autoSec__retDataNonceChAlice_Bob - SET autoSec__retDataNonceChAlice_Bob priority 0 + SET autoSec__retDataNonceChAlice_Bob priority 5 MAP Bus_HSM_Bob autoSec__retDataNonceChAlice_Bob - SET autoSec__retDataNonceChAlice_Bob priority 0 + SET autoSec__retDataNonceChAlice_Bob priority 5 MAP BusBob autoSec__retDataNonceChAlice_Bob - SET autoSec__retDataNonceChAlice_Bob priority 0 + SET autoSec__retDataNonceChAlice_Bob priority 5 MAP Memory_HSM_Bob autoSec__retDataCh_Bob_comm2 - SET autoSec__retDataCh_Bob_comm2 priority 0 + SET autoSec__retDataCh_Bob_comm2 priority 5 MAP Bus_HSM_Bob autoSec__retDataCh_Bob_comm2 - SET autoSec__retDataCh_Bob_comm2 priority 0 + SET autoSec__retDataCh_Bob_comm2 priority 5 MAP BusBob autoSec__retDataCh_Bob_comm2 - SET autoSec__retDataCh_Bob_comm2 priority 0 + SET autoSec__retDataCh_Bob_comm2 priority 5 MAPSEC Memory_HSM_Alice se_comm MAPSEC Memory_HSM_Bob se_comm MAPSEC Memory_HSM_Alice se_comm2 diff --git a/ttool/src/test/resources/tmltranslator/AutoSecGenDiplodocusTest/Models/modelWithMultiChannelsAndMultiUse/CasesWithPrivateHSMs/CaseWithHSMBob/golden/spec.tmap b/ttool/src/test/resources/tmltranslator/AutoSecGenDiplodocusTest/Models/modelWithMultiChannelsAndMultiUse/CasesWithPrivateHSMs/CaseWithHSMBob/golden/spec.tmap index 0e8cf91afb98010900872fb28aa32c6aa1320855..e016388e89b7eae9ef55a51e6f6735cb69227413 100644 --- a/ttool/src/test/resources/tmltranslator/AutoSecGenDiplodocusTest/Models/modelWithMultiChannelsAndMultiUse/CasesWithPrivateHSMs/CaseWithHSMBob/golden/spec.tmap +++ b/ttool/src/test/resources/tmltranslator/AutoSecGenDiplodocusTest/Models/modelWithMultiChannelsAndMultiUse/CasesWithPrivateHSMs/CaseWithHSMBob/golden/spec.tmap @@ -8,147 +8,147 @@ ENDTMLARCHI TMLMAPPING MAP CPUAlice autoSec__Alice - SET autoSec__Alice priority 0 + SET autoSec__Alice priority 5 MAP CPUBob autoSec__Bob - SET autoSec__Bob priority 0 + SET autoSec__Bob priority 5 MAP HwA_HSM_Bob_Decrypt_comm3 autoSec__HSM_Bob_Decrypt_comm3 - SET autoSec__HSM_Bob_Decrypt_comm3 priority 0 + SET autoSec__HSM_Bob_Decrypt_comm3 priority 5 MAP HwA_HSM_Bob_Decrypt_comm2 autoSec__HSM_Bob_Decrypt_comm2 - SET autoSec__HSM_Bob_Decrypt_comm2 priority 0 + SET autoSec__HSM_Bob_Decrypt_comm2 priority 5 MAP HwA_HSM_Bob_Decrypt_comm autoSec__HSM_Bob_Decrypt_comm - SET autoSec__HSM_Bob_Decrypt_comm priority 0 + SET autoSec__HSM_Bob_Decrypt_comm priority 5 MAP HwA_HSM_Bob_Decrypt_comm4 autoSec__HSM_Bob_Decrypt_comm4 - SET autoSec__HSM_Bob_Decrypt_comm4 priority 0 + SET autoSec__HSM_Bob_Decrypt_comm4 priority 5 MAP HwA_HSM_Bob_Decrypt_comm1 autoSec__HSM_Bob_Decrypt_comm1 - SET autoSec__HSM_Bob_Decrypt_comm1 priority 0 + SET autoSec__HSM_Bob_Decrypt_comm1 priority 5 MAP ExternalMemory autoSec__nonceChBob_Alice_comm4 - SET autoSec__nonceChBob_Alice_comm4 priority 0 + SET autoSec__nonceChBob_Alice_comm4 priority 5 MAP BusBob autoSec__nonceChBob_Alice_comm4 - SET autoSec__nonceChBob_Alice_comm4 priority 0 + SET autoSec__nonceChBob_Alice_comm4 priority 5 MAP BusAlice autoSec__nonceChBob_Alice_comm4 - SET autoSec__nonceChBob_Alice_comm4 priority 0 + SET autoSec__nonceChBob_Alice_comm4 priority 5 MAP ExternalBus autoSec__nonceChBob_Alice_comm4 - SET autoSec__nonceChBob_Alice_comm4 priority 0 + SET autoSec__nonceChBob_Alice_comm4 priority 5 MAP ExternalMemory autoSec__nonceChBob_Alice_comm2 - SET autoSec__nonceChBob_Alice_comm2 priority 0 + SET autoSec__nonceChBob_Alice_comm2 priority 5 MAP ExternalBus autoSec__nonceChBob_Alice_comm2 - SET autoSec__nonceChBob_Alice_comm2 priority 0 + SET autoSec__nonceChBob_Alice_comm2 priority 5 MAP BusBob autoSec__nonceChBob_Alice_comm2 - SET autoSec__nonceChBob_Alice_comm2 priority 0 + SET autoSec__nonceChBob_Alice_comm2 priority 5 MAP BusAlice autoSec__nonceChBob_Alice_comm2 - SET autoSec__nonceChBob_Alice_comm2 priority 0 + SET autoSec__nonceChBob_Alice_comm2 priority 5 MAP ExternalMemory autoSec__comm4 - SET autoSec__comm4 priority 0 + SET autoSec__comm4 priority 5 MAP BusBob autoSec__comm4 - SET autoSec__comm4 priority 0 + SET autoSec__comm4 priority 5 MAP BusAlice autoSec__comm4 - SET autoSec__comm4 priority 0 + SET autoSec__comm4 priority 5 MAP ExternalBus autoSec__comm4 - SET autoSec__comm4 priority 0 + SET autoSec__comm4 priority 5 MAP ExternalMemory autoSec__comm3 - SET autoSec__comm3 priority 0 + SET autoSec__comm3 priority 5 MAP BusBob autoSec__comm3 - SET autoSec__comm3 priority 0 + SET autoSec__comm3 priority 5 MAP BusAlice autoSec__comm3 - SET autoSec__comm3 priority 0 + SET autoSec__comm3 priority 5 MAP ExternalBus autoSec__comm3 - SET autoSec__comm3 priority 0 + SET autoSec__comm3 priority 5 MAP ExternalMemory autoSec__comm2 - SET autoSec__comm2 priority 0 + SET autoSec__comm2 priority 5 MAP ExternalBus autoSec__comm2 - SET autoSec__comm2 priority 0 + SET autoSec__comm2 priority 5 MAP BusBob autoSec__comm2 - SET autoSec__comm2 priority 0 + SET autoSec__comm2 priority 5 MAP BusAlice autoSec__comm2 - SET autoSec__comm2 priority 0 + SET autoSec__comm2 priority 5 MAP ExternalMemory autoSec__comm - SET autoSec__comm priority 0 + SET autoSec__comm priority 5 MAP ExternalBus autoSec__comm - SET autoSec__comm priority 0 + SET autoSec__comm priority 5 MAP BusAlice autoSec__comm - SET autoSec__comm priority 0 + SET autoSec__comm priority 5 MAP BusBob autoSec__comm - SET autoSec__comm priority 0 + SET autoSec__comm priority 5 MAP ExternalMemory autoSec__comm1 - SET autoSec__comm1 priority 0 + SET autoSec__comm1 priority 5 MAP BusBob autoSec__comm1 - SET autoSec__comm1 priority 0 + SET autoSec__comm1 priority 5 MAP BusAlice autoSec__comm1 - SET autoSec__comm1 priority 0 + SET autoSec__comm1 priority 5 MAP ExternalBus autoSec__comm1 - SET autoSec__comm1 priority 0 + SET autoSec__comm1 priority 5 MAP MemoryBob autoSec__dataCh_Bob_comm3 - SET autoSec__dataCh_Bob_comm3 priority 0 + SET autoSec__dataCh_Bob_comm3 priority 5 MAP Bus_HSM_Bob autoSec__dataCh_Bob_comm3 - SET autoSec__dataCh_Bob_comm3 priority 0 + SET autoSec__dataCh_Bob_comm3 priority 5 MAP BusBob autoSec__dataCh_Bob_comm3 - SET autoSec__dataCh_Bob_comm3 priority 0 + SET autoSec__dataCh_Bob_comm3 priority 5 MAP MemoryBob autoSec__dataCh_Bob_comm4 - SET autoSec__dataCh_Bob_comm4 priority 0 + SET autoSec__dataCh_Bob_comm4 priority 5 MAP Bus_HSM_Bob autoSec__dataCh_Bob_comm4 - SET autoSec__dataCh_Bob_comm4 priority 0 + SET autoSec__dataCh_Bob_comm4 priority 5 MAP BusBob autoSec__dataCh_Bob_comm4 - SET autoSec__dataCh_Bob_comm4 priority 0 + SET autoSec__dataCh_Bob_comm4 priority 5 MAP MemoryBob autoSec__dataCh_Bob_comm - SET autoSec__dataCh_Bob_comm priority 0 + SET autoSec__dataCh_Bob_comm priority 5 MAP Bus_HSM_Bob autoSec__dataCh_Bob_comm - SET autoSec__dataCh_Bob_comm priority 0 + SET autoSec__dataCh_Bob_comm priority 5 MAP BusBob autoSec__dataCh_Bob_comm - SET autoSec__dataCh_Bob_comm priority 0 + SET autoSec__dataCh_Bob_comm priority 5 MAP MemoryBob autoSec__dataCh_Bob_comm1 - SET autoSec__dataCh_Bob_comm1 priority 0 + SET autoSec__dataCh_Bob_comm1 priority 5 MAP Bus_HSM_Bob autoSec__dataCh_Bob_comm1 - SET autoSec__dataCh_Bob_comm1 priority 0 + SET autoSec__dataCh_Bob_comm1 priority 5 MAP BusBob autoSec__dataCh_Bob_comm1 - SET autoSec__dataCh_Bob_comm1 priority 0 + SET autoSec__dataCh_Bob_comm1 priority 5 MAP MemoryBob autoSec__dataCh_Bob_comm2 - SET autoSec__dataCh_Bob_comm2 priority 0 + SET autoSec__dataCh_Bob_comm2 priority 5 MAP Bus_HSM_Bob autoSec__dataCh_Bob_comm2 - SET autoSec__dataCh_Bob_comm2 priority 0 + SET autoSec__dataCh_Bob_comm2 priority 5 MAP BusBob autoSec__dataCh_Bob_comm2 - SET autoSec__dataCh_Bob_comm2 priority 0 + SET autoSec__dataCh_Bob_comm2 priority 5 MAP Memory_HSM_Bob autoSec__retDataCh_Bob_comm3 - SET autoSec__retDataCh_Bob_comm3 priority 0 + SET autoSec__retDataCh_Bob_comm3 priority 5 MAP Bus_HSM_Bob autoSec__retDataCh_Bob_comm3 - SET autoSec__retDataCh_Bob_comm3 priority 0 + SET autoSec__retDataCh_Bob_comm3 priority 5 MAP BusBob autoSec__retDataCh_Bob_comm3 - SET autoSec__retDataCh_Bob_comm3 priority 0 + SET autoSec__retDataCh_Bob_comm3 priority 5 MAP Memory_HSM_Bob autoSec__retDataNonceChAlice_Bob0 - SET autoSec__retDataNonceChAlice_Bob0 priority 0 + SET autoSec__retDataNonceChAlice_Bob0 priority 5 MAP Bus_HSM_Bob autoSec__retDataNonceChAlice_Bob0 - SET autoSec__retDataNonceChAlice_Bob0 priority 0 + SET autoSec__retDataNonceChAlice_Bob0 priority 5 MAP BusBob autoSec__retDataNonceChAlice_Bob0 - SET autoSec__retDataNonceChAlice_Bob0 priority 0 + SET autoSec__retDataNonceChAlice_Bob0 priority 5 MAP Memory_HSM_Bob autoSec__retDataCh_Bob_comm4 - SET autoSec__retDataCh_Bob_comm4 priority 0 + SET autoSec__retDataCh_Bob_comm4 priority 5 MAP Bus_HSM_Bob autoSec__retDataCh_Bob_comm4 - SET autoSec__retDataCh_Bob_comm4 priority 0 + SET autoSec__retDataCh_Bob_comm4 priority 5 MAP BusBob autoSec__retDataCh_Bob_comm4 - SET autoSec__retDataCh_Bob_comm4 priority 0 + SET autoSec__retDataCh_Bob_comm4 priority 5 MAP Memory_HSM_Bob autoSec__retDataCh_Bob_comm - SET autoSec__retDataCh_Bob_comm priority 0 + SET autoSec__retDataCh_Bob_comm priority 5 MAP Bus_HSM_Bob autoSec__retDataCh_Bob_comm - SET autoSec__retDataCh_Bob_comm priority 0 + SET autoSec__retDataCh_Bob_comm priority 5 MAP BusBob autoSec__retDataCh_Bob_comm - SET autoSec__retDataCh_Bob_comm priority 0 + SET autoSec__retDataCh_Bob_comm priority 5 MAP Memory_HSM_Bob autoSec__retDataCh_Bob_comm1 - SET autoSec__retDataCh_Bob_comm1 priority 0 + SET autoSec__retDataCh_Bob_comm1 priority 5 MAP Bus_HSM_Bob autoSec__retDataCh_Bob_comm1 - SET autoSec__retDataCh_Bob_comm1 priority 0 + SET autoSec__retDataCh_Bob_comm1 priority 5 MAP BusBob autoSec__retDataCh_Bob_comm1 - SET autoSec__retDataCh_Bob_comm1 priority 0 + SET autoSec__retDataCh_Bob_comm1 priority 5 MAP Memory_HSM_Bob autoSec__retDataCh_Bob_comm2 - SET autoSec__retDataCh_Bob_comm2 priority 0 + SET autoSec__retDataCh_Bob_comm2 priority 5 MAP Bus_HSM_Bob autoSec__retDataCh_Bob_comm2 - SET autoSec__retDataCh_Bob_comm2 priority 0 + SET autoSec__retDataCh_Bob_comm2 priority 5 MAP BusBob autoSec__retDataCh_Bob_comm2 - SET autoSec__retDataCh_Bob_comm2 priority 0 + SET autoSec__retDataCh_Bob_comm2 priority 5 MAP Memory_HSM_Bob autoSec__retDataNonceChAlice_Bob - SET autoSec__retDataNonceChAlice_Bob priority 0 + SET autoSec__retDataNonceChAlice_Bob priority 5 MAP Bus_HSM_Bob autoSec__retDataNonceChAlice_Bob - SET autoSec__retDataNonceChAlice_Bob priority 0 + SET autoSec__retDataNonceChAlice_Bob priority 5 MAP BusBob autoSec__retDataNonceChAlice_Bob - SET autoSec__retDataNonceChAlice_Bob priority 0 + SET autoSec__retDataNonceChAlice_Bob priority 5 MAPSEC MemoryAlice se_comm1 MAPSEC Memory_HSM_Bob se_comm1 MAPSEC MemoryAlice se_comm diff --git a/ttool/src/test/resources/tmltranslator/AutoSecGenDiplodocusTest/Models/modelWithMultiChannelsAndMultiUse/spec.tmap b/ttool/src/test/resources/tmltranslator/AutoSecGenDiplodocusTest/Models/modelWithMultiChannelsAndMultiUse/spec.tmap index f925afb3a0a8d9f1abfca06cb4b05aa352c754b4..8bf8bfca71c8b1ed28991d99c4af72d03ffc3d34 100644 --- a/ttool/src/test/resources/tmltranslator/AutoSecGenDiplodocusTest/Models/modelWithMultiChannelsAndMultiUse/spec.tmap +++ b/ttool/src/test/resources/tmltranslator/AutoSecGenDiplodocusTest/Models/modelWithMultiChannelsAndMultiUse/spec.tmap @@ -8,47 +8,47 @@ ENDTMLARCHI TMLMAPPING MAP CPUAlice autoSec__Alice - SET autoSec__Alice priority 0 + SET autoSec__Alice priority 5 MAP CPUBob autoSec__Bob - SET autoSec__Bob priority 0 + SET autoSec__Bob priority 5 MAP ExternalMemory autoSec__comm1 - SET autoSec__comm1 priority 0 + SET autoSec__comm1 priority 5 MAP BusBob autoSec__comm1 - SET autoSec__comm1 priority 0 + SET autoSec__comm1 priority 5 MAP BusAlice autoSec__comm1 - SET autoSec__comm1 priority 0 + SET autoSec__comm1 priority 5 MAP ExternalBus autoSec__comm1 - SET autoSec__comm1 priority 0 + SET autoSec__comm1 priority 5 MAP ExternalMemory autoSec__comm - SET autoSec__comm priority 0 + SET autoSec__comm priority 5 MAP ExternalBus autoSec__comm - SET autoSec__comm priority 0 + SET autoSec__comm priority 5 MAP BusAlice autoSec__comm - SET autoSec__comm priority 0 + SET autoSec__comm priority 5 MAP BusBob autoSec__comm - SET autoSec__comm priority 0 + SET autoSec__comm priority 5 MAP ExternalMemory autoSec__comm2 - SET autoSec__comm2 priority 0 + SET autoSec__comm2 priority 5 MAP ExternalBus autoSec__comm2 - SET autoSec__comm2 priority 0 + SET autoSec__comm2 priority 5 MAP BusBob autoSec__comm2 - SET autoSec__comm2 priority 0 + SET autoSec__comm2 priority 5 MAP BusAlice autoSec__comm2 - SET autoSec__comm2 priority 0 + SET autoSec__comm2 priority 5 MAP ExternalMemory autoSec__comm3 - SET autoSec__comm3 priority 0 + SET autoSec__comm3 priority 5 MAP BusBob autoSec__comm3 - SET autoSec__comm3 priority 0 + SET autoSec__comm3 priority 5 MAP BusAlice autoSec__comm3 - SET autoSec__comm3 priority 0 + SET autoSec__comm3 priority 5 MAP ExternalBus autoSec__comm3 - SET autoSec__comm3 priority 0 + SET autoSec__comm3 priority 5 MAP ExternalMemory autoSec__comm4 - SET autoSec__comm4 priority 0 + SET autoSec__comm4 priority 5 MAP BusBob autoSec__comm4 - SET autoSec__comm4 priority 0 + SET autoSec__comm4 priority 5 MAP BusAlice autoSec__comm4 - SET autoSec__comm4 priority 0 + SET autoSec__comm4 priority 5 MAP ExternalBus autoSec__comm4 - SET autoSec__comm4 priority 0 + SET autoSec__comm4 priority 5 ENDTMLMAPPING