From f9a34f4de5bab3d328cd0c69baf271d78f5820c9 Mon Sep 17 00:00:00 2001
From: Cas Cremers <cas.cremers@gmail.com>
Date: Wed, 8 Jan 2014 15:08:40 +0000
Subject: [PATCH] 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.
---
 gui/Protocols/IKE/ikev1-pk-a1.spdl               | 2 +-
 gui/Protocols/IKE/ikev1-pk-a12.spdl              | 2 +-
 gui/Protocols/IKE/ikev1-pk-a2.spdl               | 2 +-
 gui/Protocols/IKE/ikev1-pk-a22.spdl              | 2 +-
 gui/Protocols/IKE/ikev1-pk-m.spdl                | 2 +-
 gui/Protocols/IKE/ikev1-pk-m2.spdl               | 2 +-
 gui/Protocols/IKE/ikev1-pk2-a.spdl               | 2 +-
 gui/Protocols/IKE/ikev1-pk2-a2.spdl              | 2 +-
 gui/Protocols/IKE/ikev1-pk2-m.spdl               | 2 +-
 gui/Protocols/IKE/ikev1-pk2-m2.spdl              | 2 +-
 gui/Protocols/IKE/ikev1-psk-a.spdl               | 2 +-
 gui/Protocols/IKE/ikev1-psk-m-perlman.spdl       | 2 +-
 gui/Protocols/IKE/ikev1-psk-m.spdl               | 2 +-
 gui/Protocols/IKE/ikev1-quick-noid.spdl          | 2 +-
 gui/Protocols/IKE/ikev1-quick-nopfs.spdl         | 2 +-
 gui/Protocols/IKE/ikev1-quick.spdl               | 2 +-
 gui/Protocols/IKE/ikev1-sig-a-perlman1.spdl      | 2 +-
 gui/Protocols/IKE/ikev1-sig-a-perlman2.spdl      | 2 +-
 gui/Protocols/IKE/ikev1-sig-a1.spdl              | 2 +-
 gui/Protocols/IKE/ikev1-sig-a2.spdl              | 2 +-
 gui/Protocols/IKE/ikev1-sig-m-perlman.spdl       | 2 +-
 gui/Protocols/IKE/ikev1-sig-m.spdl               | 2 +-
 gui/Protocols/IKE/ikev2-child-nopfs.spdl         | 2 +-
 gui/Protocols/IKE/ikev2-child.spdl               | 2 +-
 gui/Protocols/IKE/ikev2-eap.spdl                 | 2 +-
 gui/Protocols/IKE/ikev2-eap2.spdl                | 2 +-
 gui/Protocols/IKE/ikev2-mac.spdl                 | 2 +-
 gui/Protocols/IKE/ikev2-mac2.spdl                | 2 +-
 gui/Protocols/IKE/ikev2-mactosig.spdl            | 2 +-
 gui/Protocols/IKE/ikev2-mactosig2.spdl           | 2 +-
 gui/Protocols/IKE/ikev2-sig-child-composed.spdl  | 2 +-
 gui/Protocols/IKE/ikev2-sig-child.spdl           | 2 +-
 gui/Protocols/IKE/ikev2-sig-child2-composed.spdl | 2 +-
 gui/Protocols/IKE/ikev2-sig-child2.spdl          | 2 +-
 gui/Protocols/IKE/ikev2-sig.spdl                 | 2 +-
 gui/Protocols/IKE/ikev2-sig2.spdl                | 2 +-
 gui/Protocols/IKE/ikev2-sigtomac.spdl            | 2 +-
 gui/Protocols/IKE/ikev2-sigtomac2.spdl           | 2 +-
 gui/Protocols/IKE/jfki-core.spdl                 | 2 +-
 gui/Protocols/IKE/jfki.spdl                      | 2 +-
 gui/Protocols/IKE/jfkr-core.spdl                 | 2 +-
 gui/Protocols/IKE/jfkr.spdl                      | 2 +-
 gui/Protocols/IKE/oakley-a.spdl                  | 2 +-
 gui/Protocols/IKE/oakley-alt.spdl                | 2 +-
 gui/Protocols/IKE/oakley-c.spdl                  | 2 +-
 gui/Protocols/IKE/skeme-basic.spdl               | 2 +-
 gui/Protocols/IKE/skeme-psk.spdl                 | 2 +-
 gui/Protocols/IKE/skeme-rekey.spdl               | 2 +-
 gui/Protocols/IKE/sts-mac.spdl                   | 2 +-
 gui/Protocols/IKE/sts-main.spdl                  | 2 +-
 gui/Protocols/IKE/sts-modified.spdl              | 2 +-
 51 files changed, 51 insertions(+), 51 deletions(-)

diff --git a/gui/Protocols/IKE/ikev1-pk-a1.spdl b/gui/Protocols/IKE/ikev1-pk-a1.spdl
index 7439f2f..b9b8f00 100644
--- 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;
 
 
 
diff --git a/gui/Protocols/IKE/ikev1-pk-a12.spdl b/gui/Protocols/IKE/ikev1-pk-a12.spdl
index f55e2c2..473ffc7 100644
--- 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;
 
 
 
diff --git a/gui/Protocols/IKE/ikev1-pk-a2.spdl b/gui/Protocols/IKE/ikev1-pk-a2.spdl
index c81760a..60b9fb4 100644
--- 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;
 
 
 
diff --git a/gui/Protocols/IKE/ikev1-pk-a22.spdl b/gui/Protocols/IKE/ikev1-pk-a22.spdl
index b8e6853..1c59323 100644
--- 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;
 
 
 
diff --git a/gui/Protocols/IKE/ikev1-pk-m.spdl b/gui/Protocols/IKE/ikev1-pk-m.spdl
index c121d25..8436133 100644
--- 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;
 
 
 
diff --git a/gui/Protocols/IKE/ikev1-pk-m2.spdl b/gui/Protocols/IKE/ikev1-pk-m2.spdl
index f21988b..b625de5 100644
--- 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;
 
 
 
diff --git a/gui/Protocols/IKE/ikev1-pk2-a.spdl b/gui/Protocols/IKE/ikev1-pk2-a.spdl
index 2836575..971122a 100644
--- 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;
 
 
 
diff --git a/gui/Protocols/IKE/ikev1-pk2-a2.spdl b/gui/Protocols/IKE/ikev1-pk2-a2.spdl
index f916068..51e0d17 100644
--- 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;
 
 
 
diff --git a/gui/Protocols/IKE/ikev1-pk2-m.spdl b/gui/Protocols/IKE/ikev1-pk2-m.spdl
index 84f0459..e32dd5b 100644
--- 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;
 
 
 
diff --git a/gui/Protocols/IKE/ikev1-pk2-m2.spdl b/gui/Protocols/IKE/ikev1-pk2-m2.spdl
index d87dbb1..62e5b74 100644
--- 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;
 
 
 
diff --git a/gui/Protocols/IKE/ikev1-psk-a.spdl b/gui/Protocols/IKE/ikev1-psk-a.spdl
index 3a66a36..788dde0 100644
--- 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) {
 
diff --git a/gui/Protocols/IKE/ikev1-psk-m-perlman.spdl b/gui/Protocols/IKE/ikev1-psk-m-perlman.spdl
index 68c9213..fa9436a 100644
--- 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) {
 
diff --git a/gui/Protocols/IKE/ikev1-psk-m.spdl b/gui/Protocols/IKE/ikev1-psk-m.spdl
index b98435f..ca7a688 100644
--- 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) {
 
diff --git a/gui/Protocols/IKE/ikev1-quick-noid.spdl b/gui/Protocols/IKE/ikev1-quick-noid.spdl
index 96246de..03e9c05 100644
--- 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) {
 
diff --git a/gui/Protocols/IKE/ikev1-quick-nopfs.spdl b/gui/Protocols/IKE/ikev1-quick-nopfs.spdl
index 8f7d3a2..c7d2f99 100644
--- 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) {
 
diff --git a/gui/Protocols/IKE/ikev1-quick.spdl b/gui/Protocols/IKE/ikev1-quick.spdl
index 5ace037..6a723c7 100644
--- 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) {
 
diff --git a/gui/Protocols/IKE/ikev1-sig-a-perlman1.spdl b/gui/Protocols/IKE/ikev1-sig-a-perlman1.spdl
index ff8babf..f758a99 100644
--- 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;
 
 
 
diff --git a/gui/Protocols/IKE/ikev1-sig-a-perlman2.spdl b/gui/Protocols/IKE/ikev1-sig-a-perlman2.spdl
index cb520cc..c2edf7d 100644
--- 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;
 
 
 
diff --git a/gui/Protocols/IKE/ikev1-sig-a1.spdl b/gui/Protocols/IKE/ikev1-sig-a1.spdl
index 936776e..327c4fe 100644
--- 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;
 
 
 
diff --git a/gui/Protocols/IKE/ikev1-sig-a2.spdl b/gui/Protocols/IKE/ikev1-sig-a2.spdl
index ea26372..b0e6e07 100644
--- 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;
 
 
 
diff --git a/gui/Protocols/IKE/ikev1-sig-m-perlman.spdl b/gui/Protocols/IKE/ikev1-sig-m-perlman.spdl
index e97ba4c..321fc1b 100644
--- 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;
 
 
 
diff --git a/gui/Protocols/IKE/ikev1-sig-m.spdl b/gui/Protocols/IKE/ikev1-sig-m.spdl
index 121f5d1..28150b0 100644
--- 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;
 
 
 
diff --git a/gui/Protocols/IKE/ikev2-child-nopfs.spdl b/gui/Protocols/IKE/ikev2-child-nopfs.spdl
index 342bed2..d163151 100644
--- 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) {
 
diff --git a/gui/Protocols/IKE/ikev2-child.spdl b/gui/Protocols/IKE/ikev2-child.spdl
index 8b3d408..7c58959 100644
--- 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) {
 
diff --git a/gui/Protocols/IKE/ikev2-eap.spdl b/gui/Protocols/IKE/ikev2-eap.spdl
index d2c3932..43ec49a 100644
--- 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"
diff --git a/gui/Protocols/IKE/ikev2-eap2.spdl b/gui/Protocols/IKE/ikev2-eap2.spdl
index b1bfcbd..1fbb580 100644
--- 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"
diff --git a/gui/Protocols/IKE/ikev2-mac.spdl b/gui/Protocols/IKE/ikev2-mac.spdl
index 264d16a..608d314 100644
--- 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"
diff --git a/gui/Protocols/IKE/ikev2-mac2.spdl b/gui/Protocols/IKE/ikev2-mac2.spdl
index 5d3acc3..f6d3385 100644
--- 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"
diff --git a/gui/Protocols/IKE/ikev2-mactosig.spdl b/gui/Protocols/IKE/ikev2-mactosig.spdl
index 895724f..388562e 100644
--- 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"
diff --git a/gui/Protocols/IKE/ikev2-mactosig2.spdl b/gui/Protocols/IKE/ikev2-mactosig2.spdl
index c434d7e..92864ab 100644
--- 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"
diff --git a/gui/Protocols/IKE/ikev2-sig-child-composed.spdl b/gui/Protocols/IKE/ikev2-sig-child-composed.spdl
index b3c4630..392c995 100644
--- 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"
diff --git a/gui/Protocols/IKE/ikev2-sig-child.spdl b/gui/Protocols/IKE/ikev2-sig-child.spdl
index 54b7342..f9db4cf 100644
--- 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"
diff --git a/gui/Protocols/IKE/ikev2-sig-child2-composed.spdl b/gui/Protocols/IKE/ikev2-sig-child2-composed.spdl
index d87dfb6..49df999 100644
--- 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"
diff --git a/gui/Protocols/IKE/ikev2-sig-child2.spdl b/gui/Protocols/IKE/ikev2-sig-child2.spdl
index 3694664..aa8642f 100644
--- 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"
diff --git a/gui/Protocols/IKE/ikev2-sig.spdl b/gui/Protocols/IKE/ikev2-sig.spdl
index 261d732..baaba1a 100644
--- 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"
diff --git a/gui/Protocols/IKE/ikev2-sig2.spdl b/gui/Protocols/IKE/ikev2-sig2.spdl
index 309c9c5..0825976 100644
--- 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"
diff --git a/gui/Protocols/IKE/ikev2-sigtomac.spdl b/gui/Protocols/IKE/ikev2-sigtomac.spdl
index eea159b..9d40a3a 100644
--- 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"
diff --git a/gui/Protocols/IKE/ikev2-sigtomac2.spdl b/gui/Protocols/IKE/ikev2-sigtomac2.spdl
index 79ef0f4..99ad18c 100644
--- 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"
diff --git a/gui/Protocols/IKE/jfki-core.spdl b/gui/Protocols/IKE/jfki-core.spdl
index 599786c..2517cbf 100644
--- 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"
diff --git a/gui/Protocols/IKE/jfki.spdl b/gui/Protocols/IKE/jfki.spdl
index 02c916f..d385543 100644
--- 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"
diff --git a/gui/Protocols/IKE/jfkr-core.spdl b/gui/Protocols/IKE/jfkr-core.spdl
index 9668081..adce573 100644
--- 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"
diff --git a/gui/Protocols/IKE/jfkr.spdl b/gui/Protocols/IKE/jfkr.spdl
index 0a3fc64..6e5e3e2 100644
--- 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"
diff --git a/gui/Protocols/IKE/oakley-a.spdl b/gui/Protocols/IKE/oakley-a.spdl
index 597f7c2..aa04c2e 100644
--- 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) {
 
diff --git a/gui/Protocols/IKE/oakley-alt.spdl b/gui/Protocols/IKE/oakley-alt.spdl
index 8fe6c65..f94b355 100644
--- 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) {
 
diff --git a/gui/Protocols/IKE/oakley-c.spdl b/gui/Protocols/IKE/oakley-c.spdl
index fba780d..2585ef9 100644
--- 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) {
 
diff --git a/gui/Protocols/IKE/skeme-basic.spdl b/gui/Protocols/IKE/skeme-basic.spdl
index 8ff3ecd..8c53deb 100644
--- 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) {
 
diff --git a/gui/Protocols/IKE/skeme-psk.spdl b/gui/Protocols/IKE/skeme-psk.spdl
index 70d33bc..e3e8796 100644
--- 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) {
 
diff --git a/gui/Protocols/IKE/skeme-rekey.spdl b/gui/Protocols/IKE/skeme-rekey.spdl
index dcc709c..acd0c50 100644
--- 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) {
 
diff --git a/gui/Protocols/IKE/sts-mac.spdl b/gui/Protocols/IKE/sts-mac.spdl
index fdc1a11..09c583b 100644
--- 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;
 
diff --git a/gui/Protocols/IKE/sts-main.spdl b/gui/Protocols/IKE/sts-main.spdl
index 17951b1..4cfb76c 100644
--- 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;
 
diff --git a/gui/Protocols/IKE/sts-modified.spdl b/gui/Protocols/IKE/sts-modified.spdl
index f9cafa1..660d068 100644
--- 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;