andr3/scyther
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixing artefact with 'read' commands.

Browse Source
This commit is contained in:
Cas Cremers 2012-04-24 13:33:00 -06:00
parent 1cbe9826ac
commit 64e70ea4ea
1 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
protocols/multiparty/multinsl-generator.py
View File

@ -236,8 +236,8 @@ def action (event,label,inrole):
s += " );\n" s += " );\n"
return s return s
def read (label,inrole): def recv (label,inrole):
return action ("read", label,inrole) return action ("recv", label,inrole)
def send (label,inrole): def send (label,inrole):
@ -282,10 +282,10 @@ def roledef (r):
s += "\n" s += "\n"
if r > 0: if r > 0:
# Initial read # Initial recv
s += read(r-1,r) s += recv(r-1,r)
s += send(r,r) s += send(r,r)
s += read(P+r-1,r) s += recv(P+r-1,r)
if r < (P-1): if r < (P-1):
# Final send # Final send
s += send(P+r,r) s += send(P+r,r)
@ -312,9 +312,6 @@ def protocol (args):
s += "// Generalized %s protocol for %i parties\n\n" % (opts.protocol,P) s += "// Generalized %s protocol for %i parties\n\n" % (opts.protocol,P)
s += "// " + str(opts) + "\n\n" s += "// " + str(opts) + "\n\n"
s += "// Variant %i\n" % variant s += "// Variant %i\n" % variant
s += "const pk: Function;\n"
s += "secret sk: Function;\n"
s += "inversekeys (pk,sk);\n"
if opts.protocol == "bke": if opts.protocol == "bke":
s += "usertype Globalconstant;\n" s += "usertype Globalconstant;\n"
@ -334,13 +331,6 @@ def protocol (args):
s += "}\n\n" s += "}\n\n"
s += "const Alice, Bob: Agent;\n\n"
s += "const Eve: Agent;\n"
s += "untrusted Eve;\n"
s += "const ne: Nonce;\n"
s += "compromised sk(Eve);\n"
s += "\n" s += "\n"
return s return s