From 4e15c27bb136b4f5ab55fbe75257b09e01a550a4 Mon Sep 17 00:00:00 2001 From: jerray <jawher.jerray@eurecom.fr> Date: Fri, 28 Jun 2024 15:52:12 +0200 Subject: [PATCH] update Spec TMAP comparator + update auto sec tests --- src/main/java/tmltranslator/TMLActivity.java | 6 +- .../tmltranslator/TMLActivityElement.java | 5 +- .../TMLActivityElementChannel.java | 18 +- .../TMLActivityElementEvent.java | 14 +- .../TMLActivityElementWithAction.java | 1 + .../TMLActivityElementWithIntervalAction.java | 2 + src/main/java/tmltranslator/TMLChannel.java | 4 +- src/main/java/tmltranslator/TMLChoice.java | 2 + .../tmltranslator/TMLComparingMethod.java | 29 +-- src/main/java/tmltranslator/TMLDelay.java | 1 + src/main/java/tmltranslator/TMLExecC.java | 10 + src/main/java/tmltranslator/TMLForLoop.java | 1 + src/main/java/tmltranslator/TMLMapping.java | 5 +- src/main/java/tmltranslator/TMLRandom.java | 1 + .../java/tmltranslator/TMLRandomSequence.java | 1 + .../java/tmltranslator/TMLSendRequest.java | 2 + src/main/java/tmltranslator/TMLSequence.java | 1 + src/main/java/tmltranslator/TMLTask.java | 4 +- src/main/java/ui/DrawerTMAPModeling.java | 2 +- src/main/java/ui/tmldd/TMLArchiArtifact.java | 3 +- .../tmldd/TMLArchiCommunicationArtifact.java | 3 +- .../java/ui/tmldd/TMLArchiEventArtifact.java | 3 +- src/main/java/ui/tmldd/TMLArchiKey.java | 2 +- .../java/ui/tmldd/TMLArchiPortArtifact.java | 3 +- .../AutoSecurityGenerationDiplodocusTest.java | 2 +- .../tmltranslator/TMLComparingMethodTest.java | 11 +- .../CaseWithoutHSM/golden/spec.tmap | 60 ++--- .../CaseWithHSMAlice/golden/spec.tmap | 114 ++++----- .../CaseWithHSMAliceBob/golden/spec.tmap | 168 ++++++------- .../CaseWithHSMBob/golden/spec.tmap | 114 ++++----- .../CaseWithHSMAlice/golden/spec.tmap | 142 +++++------ .../CaseWithHSMAliceBob/golden/spec.tmap | 224 +++++++++--------- .../CaseWithHSMBob/golden/spec.tmap | 142 +++++------ .../Models/modelWithMultiChannels/spec.tmap | 44 ++-- .../CaseWithoutHSM/golden/spec.tmap | 60 ++--- .../CaseWithHSMAlice/golden/spec.tmap | 114 ++++----- .../CaseWithHSMAliceBob/golden/spec.tmap | 168 ++++++------- .../CaseWithHSMBob/golden/spec.tmap | 114 ++++----- .../CaseWithHSMAlice/golden/spec.tmap | 142 +++++------ .../CaseWithHSMAliceBob/golden/spec.tmap | 224 +++++++++--------- .../CaseWithHSMBob/golden/spec.tmap | 142 +++++------ .../spec.tmap | 44 ++-- 42 files changed, 1090 insertions(+), 1062 deletions(-) diff --git a/src/main/java/tmltranslator/TMLActivity.java b/src/main/java/tmltranslator/TMLActivity.java index 3e3dd772d4..7f2495a9df 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 7059a42593..9b06395c10 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 bc0f37b20f..2bf1606e99 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 c4a7a49278..a2d0024aad 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 5e2fad559e..c2511b7431 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 c375f24a57..2fcae17531 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 b6c31d366f..060f7528ed 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 45d9543ee5..84147db3d1 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 29f4c3154d..636f4d4d21 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 5572d77ba1..7ae1a41031 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 79d323cb05..b736434d6d 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 b7d2e9b0b6..8c0ea888b0 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 8a2d349041..8f830bd6eb 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 c59f805276..0a5c1dc864 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 9b049db9e0..07741656c5 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 8941997de1..77de3b26ac 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 acb205ad48..8f50cdc68d 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 6517fd4f09..1fdc66ec15 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 93d5dec7c0..f4b084612e 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 b1333ce06c..42808f9ca6 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 024ef4ee6a..11ab005c5f 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 c052fbe474..0b40639566 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 6630407901..df0b12822c 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 b7d0d73292..43bd1bca03 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 9c75bcb2c3..c2daff4055 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 834366493d..3b2440feee 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 4936ef9f46..62f3307939 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 a9bca64408..abe2b74873 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 0c44de7574..c3f11dd6d1 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 f19d8053da..bc520d5cbd 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 0a10b4ecbb..278a66018c 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 b3b1f9efb3..8f1c0678d4 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 d9ba439d69..c273a708cd 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 10e6b56606..ce2b707675 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 c018b41a21..8ef7238923 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 9619ebae7b..3be7544e9a 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 8e2b4b3235..c600be0f18 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 2a6827e732..e60102bcec 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 bbcbb54086..9b937e04b0 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 4bba7f7695..969d93f204 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 0e8cf91afb..e016388e89 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 f925afb3a0..8bf8bfca71 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 -- GitLab