diff --git a/spdl/SPORE/wmf-lowe.spdl b/spdl/SPORE/wmf-lowe.spdl index 3c65ec4..2228d50 100644 --- a/spdl/SPORE/wmf-lowe.spdl +++ b/spdl/SPORE/wmf-lowe.spdl @@ -29,10 +29,10 @@ protocol wmfLoweSessionKeyCompromise(C) var I,R,S: Agent; read_C1(C,C, I,R,S); - send_C2(C,C, I, {Ti,R,Kir}k(I,S), - {Ts,I,Kir}k(R,S), - {Nr}k(I,S), - {{Nr}succ}k(I,S), + send_C2(C,C, I, {I,Ti,R,Kir}k(I,S), + {S,Ts,I,Kir}k(R,S), + {R,Nr}Kir, + {I,{Nr}succ}Kir, Kir ); claim_C3(C,Empty, (Compromised,Kir)); @@ -48,9 +48,9 @@ protocol wmfLowe(I,R,S) var Kr: SessionKey; var Nr: Nonce; - send_1(I,S, I, {Ti, R, Kir}k(I,S)); - read_3(R,I,{Nr}Kir); - send_4(I,R,{{Nr}succ}Kir); + send_1(I,S, I, {I, Ti, R, Kir}k(I,S)); + read_3(R,I,{R,Nr}Kir); + send_4(I,R,{I,{Nr}succ}Kir); claim_I1(I,Secret,Kir); claim_I2(I,Nisynch); @@ -63,9 +63,9 @@ protocol wmfLowe(I,R,S) var Kir: SessionKey; const Nr: Nonce; - read_2(S,R, {Ts, I, Kir}k(R,S) ); - send_3(R,I, {Nr}Kir); - read_4(I,R, {{Nr}succ}Kir); + read_2(S,R, {S, Ts, I, Kir}k(R,S) ); + send_3(R,I, {R, Nr}Kir); + read_4(I,R, {I,{Nr}succ}Kir); claim_R1(R,Secret,Kir); claim_R2(R,Nisynch); @@ -78,8 +78,8 @@ protocol wmfLowe(I,R,S) const Ts: TimeStamp; var Ti: TimeStamp; - read_1(I,S, I,{Ti, R, Kir}k(I,S) ); - send_2(S,R, {Ts, I, Kir}k(R,S)); + read_1(I,S, I,{I,Ti, R, Kir}k(I,S) ); + send_2(S,R, {R,Ts, I, Kir}k(R,S)); } }