From 70c9bbe475b03f5430898a0468ef408166f2df03 Mon Sep 17 00:00:00 2001
From: Letitia Li <letitia.li@telecom-paristech.fr>
Date: Wed, 14 Jun 2017 11:10:47 +0200
Subject: [PATCH] Fixed TML2Avatar translation for initializing nonce values
---
.../tmltranslator/toavatar/TML2Avatar.java | 22 +++++++++----------
1 file changed, 10 insertions(+), 12 deletions(-)
diff --git a/src/main/java/tmltranslator/toavatar/TML2Avatar.java b/src/main/java/tmltranslator/toavatar/TML2Avatar.java
index c88520185b..b0b4ecaff1 100644
--- a/src/main/java/tmltranslator/toavatar/TML2Avatar.java
+++ b/src/main/java/tmltranslator/toavatar/TML2Avatar.java
@@ -809,9 +809,9 @@ public class TML2Avatar {
}
tran.addAction(ae.securityPattern.key+" = sdecrypt(encryptedKey_"+ae.securityPattern.key+", key_"+ae.securityPattern.name+")");
}
- elementList.add(as);
- elementList.add(tran);
- as.addNext(tran);
+ // elementList.add(as);
+ // elementList.add(tran);
+ // as.addNext(tran);
if (!ae.securityPattern.nonce.isEmpty()){
block.addAttribute(new AvatarAttribute("testnonce_"+ae.securityPattern.nonce, AvatarType.INTEGER, block, null));
AvatarMethod get2 = new AvatarMethod("get2",ae);
@@ -866,9 +866,9 @@ public class TML2Avatar {
}
tran.addAction("key_"+ae.securityPattern.key+" = adecrypt(encryptedKey_"+ae.securityPattern.key+", privKey_"+ae.securityPattern.name+")");
}
- elementList.add(as);
- elementList.add(tran);
- as.addNext(tran);
+ //elementList.add(as);
+ // elementList.add(tran);
+ //as.addNext(tran);
if (!ae.securityPattern.nonce.isEmpty()){
block.addAttribute(new AvatarAttribute("testnonce_"+ae.securityPattern.nonce, AvatarType.INTEGER, block, null));
AvatarMethod get2 = new AvatarMethod("get2",ae);
@@ -934,10 +934,10 @@ public class TML2Avatar {
block.addAttribute(new AvatarAttribute("testnonce_"+ae.securityPattern.nonce, AvatarType.INTEGER, block, null));
tran.addAction("get2("+ae.securityPattern.name + ","+ae.securityPattern.name+",testnonce_"+ae.securityPattern.nonce+")");
}
- elementList.add(as);
- elementList.add(tran);
+ //elementList.add(as);
+ //elementList.add(tran);
- as.addNext(tran);
+ //as.addNext(tran);
AvatarState guardState = new AvatarState(ae.getName().replaceAll(" ","")+"_guarded", ae.getReferenceObject());
tran.addNext(guardState);
@@ -978,9 +978,7 @@ public class TML2Avatar {
}
}
else {
- as.addNext(tran);
- elementList.add(as);
- elementList.add(tran);
+ //
}
}
else if (ae instanceof TMLActivityElementWithIntervalAction){
--
GitLab