BUGFIX: Updating hashfunction usage in protocol files to new conventions.

After the new function implementation, the 'Function' type is no longer one-way by default. However, many protocol description files relied on this implicit assumption. The solution is to use 'hashfunction' declarations instead to model one-wayness. Original bug report by Binh Thanh Nguyen.
2014-01-08 15:08:40 +00:00 · 2014-01-08 15:08:40 +00:00 · f9a34f4de5
commit f9a34f4de5
parent 1a9a8714a6
51 changed files with 51 additions and 51 deletions
--- a/gui/Protocols/IKE/ikev1-pk-a1.spdl
+++ b/gui/Protocols/IKE/ikev1-pk-a1.spdl
@ -14,7 +14,7 @@



-const g, h: Function;
+hashfunction g, h;



--- a/gui/Protocols/IKE/ikev1-pk-a12.spdl
+++ b/gui/Protocols/IKE/ikev1-pk-a12.spdl
@ -14,7 +14,7 @@



-const g, h: Function;
+hashfunction g, h;



--- a/gui/Protocols/IKE/ikev1-pk-a2.spdl
+++ b/gui/Protocols/IKE/ikev1-pk-a2.spdl
@ -14,7 +14,7 @@



-const g, h: Function;
+hashfunction g, h;



--- a/gui/Protocols/IKE/ikev1-pk-a22.spdl
+++ b/gui/Protocols/IKE/ikev1-pk-a22.spdl
@ -14,7 +14,7 @@



-const g, h: Function;
+hashfunction g, h;



--- a/gui/Protocols/IKE/ikev1-pk-m.spdl
+++ b/gui/Protocols/IKE/ikev1-pk-m.spdl
@ -14,7 +14,7 @@



-const g, h: Function;
+hashfunction g, h;



--- a/gui/Protocols/IKE/ikev1-pk-m2.spdl
+++ b/gui/Protocols/IKE/ikev1-pk-m2.spdl
@ -14,7 +14,7 @@



-const g, h: Function;
+hashfunction g, h;



--- a/gui/Protocols/IKE/ikev1-pk2-a.spdl
+++ b/gui/Protocols/IKE/ikev1-pk2-a.spdl
@ -14,7 +14,7 @@



-const g, h: Function;
+hashfunction g, h;



--- a/gui/Protocols/IKE/ikev1-pk2-a2.spdl
+++ b/gui/Protocols/IKE/ikev1-pk2-a2.spdl
@ -14,7 +14,7 @@



-const g, h: Function;
+hashfunction g, h;



--- a/gui/Protocols/IKE/ikev1-pk2-m.spdl
+++ b/gui/Protocols/IKE/ikev1-pk2-m.spdl
@ -14,7 +14,7 @@



-const g, h: Function;
+hashfunction g, h;



--- a/gui/Protocols/IKE/ikev1-pk2-m2.spdl
+++ b/gui/Protocols/IKE/ikev1-pk2-m2.spdl
@ -14,7 +14,7 @@



-const g, h: Function;
+hashfunction g, h;



--- a/gui/Protocols/IKE/ikev1-psk-a.spdl
+++ b/gui/Protocols/IKE/ikev1-psk-a.spdl
@ -14,7 +14,7 @@



-const g, h: Function;
+hashfunction g, h;
 # 97 "common.h"
 protocol @oracle (DH, SWAP) {

--- a/gui/Protocols/IKE/ikev1-psk-m-perlman.spdl
+++ b/gui/Protocols/IKE/ikev1-psk-m-perlman.spdl
@ -14,7 +14,7 @@



-const g, h: Function;
+hashfunction g, h;
 # 97 "common.h"
 protocol @oracle (DH, SWAP) {

--- a/gui/Protocols/IKE/ikev1-psk-m.spdl
+++ b/gui/Protocols/IKE/ikev1-psk-m.spdl
@ -14,7 +14,7 @@



-const g, h: Function;
+hashfunction g, h;
 # 97 "common.h"
 protocol @oracle (DH, SWAP) {

--- a/gui/Protocols/IKE/ikev1-quick-noid.spdl
+++ b/gui/Protocols/IKE/ikev1-quick-noid.spdl
@ -14,7 +14,7 @@



-const g, h: Function;
+hashfunction g, h;
 # 97 "common.h"
 protocol @oracle (DH, SWAP) {

--- a/gui/Protocols/IKE/ikev1-quick-nopfs.spdl
+++ b/gui/Protocols/IKE/ikev1-quick-nopfs.spdl
@ -14,7 +14,7 @@



-const g, h: Function;
+hashfunction g, h;
 # 97 "common.h"
 protocol @oracle (DH, SWAP) {

--- a/gui/Protocols/IKE/ikev1-quick.spdl
+++ b/gui/Protocols/IKE/ikev1-quick.spdl
@ -14,7 +14,7 @@



-const g, h: Function;
+hashfunction g, h;
 # 97 "common.h"
 protocol @oracle (DH, SWAP) {

--- a/gui/Protocols/IKE/ikev1-sig-a-perlman1.spdl
+++ b/gui/Protocols/IKE/ikev1-sig-a-perlman1.spdl
@ -14,7 +14,7 @@



-const g, h: Function;
+hashfunction g, h;



--- a/gui/Protocols/IKE/ikev1-sig-a-perlman2.spdl
+++ b/gui/Protocols/IKE/ikev1-sig-a-perlman2.spdl
@ -14,7 +14,7 @@



-const g, h: Function;
+hashfunction g, h;



--- a/gui/Protocols/IKE/ikev1-sig-a1.spdl
+++ b/gui/Protocols/IKE/ikev1-sig-a1.spdl
@ -14,7 +14,7 @@



-const g, h: Function;
+hashfunction g, h;



--- a/gui/Protocols/IKE/ikev1-sig-a2.spdl
+++ b/gui/Protocols/IKE/ikev1-sig-a2.spdl
@ -14,7 +14,7 @@



-const g, h: Function;
+hashfunction g, h;



--- a/gui/Protocols/IKE/ikev1-sig-m-perlman.spdl
+++ b/gui/Protocols/IKE/ikev1-sig-m-perlman.spdl
@ -14,7 +14,7 @@



-const g, h: Function;
+hashfunction g, h;



--- a/gui/Protocols/IKE/ikev1-sig-m.spdl
+++ b/gui/Protocols/IKE/ikev1-sig-m.spdl
@ -14,7 +14,7 @@



-const g, h: Function;
+hashfunction g, h;



--- a/gui/Protocols/IKE/ikev2-child-nopfs.spdl
+++ b/gui/Protocols/IKE/ikev2-child-nopfs.spdl
@ -14,7 +14,7 @@



-const g, h: Function;
+hashfunction g, h;
 # 97 "common.h"
 protocol @oracle (DH, SWAP) {

--- a/gui/Protocols/IKE/ikev2-child.spdl
+++ b/gui/Protocols/IKE/ikev2-child.spdl
@ -14,7 +14,7 @@



-const g, h: Function;
+hashfunction g, h;
 # 97 "common.h"
 protocol @oracle (DH, SWAP) {

--- a/gui/Protocols/IKE/ikev2-eap.spdl
+++ b/gui/Protocols/IKE/ikev2-eap.spdl
@ -14,7 +14,7 @@



-const g, h: Function;
+hashfunction g, h;
 # 43 "common.h"
 hashfunction MAC;
 # 97 "common.h"
--- a/gui/Protocols/IKE/ikev2-eap2.spdl
+++ b/gui/Protocols/IKE/ikev2-eap2.spdl
@ -14,7 +14,7 @@



-const g, h: Function;
+hashfunction g, h;
 # 43 "common.h"
 hashfunction MAC;
 # 97 "common.h"
--- a/gui/Protocols/IKE/ikev2-mac.spdl
+++ b/gui/Protocols/IKE/ikev2-mac.spdl
@ -14,7 +14,7 @@



-const g, h: Function;
+hashfunction g, h;
 # 43 "common.h"
 hashfunction MAC;
 # 97 "common.h"
--- a/gui/Protocols/IKE/ikev2-mac2.spdl
+++ b/gui/Protocols/IKE/ikev2-mac2.spdl
@ -14,7 +14,7 @@



-const g, h: Function;
+hashfunction g, h;
 # 43 "common.h"
 hashfunction MAC;
 # 97 "common.h"
--- a/gui/Protocols/IKE/ikev2-mactosig.spdl
+++ b/gui/Protocols/IKE/ikev2-mactosig.spdl
@ -14,7 +14,7 @@



-const g, h: Function;
+hashfunction g, h;
 # 43 "common.h"
 hashfunction MAC;
 # 97 "common.h"
--- a/gui/Protocols/IKE/ikev2-mactosig2.spdl
+++ b/gui/Protocols/IKE/ikev2-mactosig2.spdl
@ -14,7 +14,7 @@



-const g, h: Function;
+hashfunction g, h;
 # 43 "common.h"
 hashfunction MAC;
 # 97 "common.h"
--- a/gui/Protocols/IKE/ikev2-sig-child-composed.spdl
+++ b/gui/Protocols/IKE/ikev2-sig-child-composed.spdl
@ -14,7 +14,7 @@



-const g, h: Function;
+hashfunction g, h;
 # 43 "common.h"
 hashfunction MAC;
 # 97 "common.h"
--- a/gui/Protocols/IKE/ikev2-sig-child.spdl
+++ b/gui/Protocols/IKE/ikev2-sig-child.spdl
@ -14,7 +14,7 @@



-const g, h: Function;
+hashfunction g, h;
 # 43 "common.h"
 hashfunction MAC;
 # 97 "common.h"
--- a/gui/Protocols/IKE/ikev2-sig-child2-composed.spdl
+++ b/gui/Protocols/IKE/ikev2-sig-child2-composed.spdl
@ -14,7 +14,7 @@



-const g, h: Function;
+hashfunction g, h;
 # 43 "common.h"
 hashfunction MAC;
 # 97 "common.h"
--- a/gui/Protocols/IKE/ikev2-sig-child2.spdl
+++ b/gui/Protocols/IKE/ikev2-sig-child2.spdl
@ -14,7 +14,7 @@



-const g, h: Function;
+hashfunction g, h;
 # 43 "common.h"
 hashfunction MAC;
 # 97 "common.h"
--- a/gui/Protocols/IKE/ikev2-sig.spdl
+++ b/gui/Protocols/IKE/ikev2-sig.spdl
@ -14,7 +14,7 @@



-const g, h: Function;
+hashfunction g, h;
 # 43 "common.h"
 hashfunction MAC;
 # 97 "common.h"
--- a/gui/Protocols/IKE/ikev2-sig2.spdl
+++ b/gui/Protocols/IKE/ikev2-sig2.spdl
@ -14,7 +14,7 @@



-const g, h: Function;
+hashfunction g, h;
 # 43 "common.h"
 hashfunction MAC;
 # 97 "common.h"
--- a/gui/Protocols/IKE/ikev2-sigtomac.spdl
+++ b/gui/Protocols/IKE/ikev2-sigtomac.spdl
@ -14,7 +14,7 @@



-const g, h: Function;
+hashfunction g, h;
 # 43 "common.h"
 hashfunction MAC;
 # 97 "common.h"
--- a/gui/Protocols/IKE/ikev2-sigtomac2.spdl
+++ b/gui/Protocols/IKE/ikev2-sigtomac2.spdl
@ -14,7 +14,7 @@



-const g, h: Function;
+hashfunction g, h;
 # 43 "common.h"
 hashfunction MAC;
 # 97 "common.h"
--- a/gui/Protocols/IKE/jfki-core.spdl
+++ b/gui/Protocols/IKE/jfki-core.spdl
@ -14,7 +14,7 @@



-const g, h: Function;
+hashfunction g, h;
 # 60 "common.h"
 hashfunction H;
 # 97 "common.h"
--- a/gui/Protocols/IKE/jfki.spdl
+++ b/gui/Protocols/IKE/jfki.spdl
@ -14,7 +14,7 @@



-const g, h: Function;
+hashfunction g, h;
 # 66 "common.h"
 hashfunction H;
 # 97 "common.h"
--- a/gui/Protocols/IKE/jfkr-core.spdl
+++ b/gui/Protocols/IKE/jfkr-core.spdl
@ -14,7 +14,7 @@



-const g, h: Function;
+hashfunction g, h;
 # 60 "common.h"
 hashfunction H;
 # 97 "common.h"
--- a/gui/Protocols/IKE/jfkr.spdl
+++ b/gui/Protocols/IKE/jfkr.spdl
@ -14,7 +14,7 @@



-const g, h: Function;
+hashfunction g, h;
 # 66 "common.h"
 hashfunction H;
 # 97 "common.h"
--- a/gui/Protocols/IKE/oakley-a.spdl
+++ b/gui/Protocols/IKE/oakley-a.spdl
@ -14,7 +14,7 @@



-const g, h: Function;
+hashfunction g, h;
 # 97 "common.h"
 protocol @oracle (DH, SWAP) {

--- a/gui/Protocols/IKE/oakley-alt.spdl
+++ b/gui/Protocols/IKE/oakley-alt.spdl
@ -14,7 +14,7 @@



-const g, h: Function;
+hashfunction g, h;
 # 97 "common.h"
 protocol @oracle (DH, SWAP) {

--- a/gui/Protocols/IKE/oakley-c.spdl
+++ b/gui/Protocols/IKE/oakley-c.spdl
@ -14,7 +14,7 @@



-const g, h: Function;
+hashfunction g, h;
 # 97 "common.h"
 protocol @oracle (DH, SWAP) {

--- a/gui/Protocols/IKE/skeme-basic.spdl
+++ b/gui/Protocols/IKE/skeme-basic.spdl
@ -14,7 +14,7 @@



-const g, h: Function;
+hashfunction g, h;
 # 97 "common.h"
 protocol @oracle (DH, SWAP) {

--- a/gui/Protocols/IKE/skeme-psk.spdl
+++ b/gui/Protocols/IKE/skeme-psk.spdl
@ -14,7 +14,7 @@



-const g, h: Function;
+hashfunction g, h;
 # 97 "common.h"
 protocol @oracle (DH, SWAP) {

--- a/gui/Protocols/IKE/skeme-rekey.spdl
+++ b/gui/Protocols/IKE/skeme-rekey.spdl
@ -14,7 +14,7 @@



-const g, h: Function;
+hashfunction g, h;
 # 97 "common.h"
 protocol @oracle (DH, SWAP) {

--- a/gui/Protocols/IKE/sts-mac.spdl
+++ b/gui/Protocols/IKE/sts-mac.spdl
@ -14,7 +14,7 @@



-const g, h: Function;
+hashfunction g, h;
 # 94 "common.h"
 hashfunction MAC;

--- a/gui/Protocols/IKE/sts-main.spdl
+++ b/gui/Protocols/IKE/sts-main.spdl
@ -14,7 +14,7 @@



-const g, h: Function;
+hashfunction g, h;
 # 94 "common.h"
 hashfunction MAC;

--- a/gui/Protocols/IKE/sts-modified.spdl
+++ b/gui/Protocols/IKE/sts-modified.spdl
@ -14,7 +14,7 @@



-const g, h: Function;
+hashfunction g, h;
 # 94 "common.h"
 hashfunction MAC;