aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--global-config18
-rw-r--r--global-functions19
2 files changed, 20 insertions, 17 deletions
diff --git a/global-config b/global-config
index 02f36c6..743c56f 100644
--- a/global-config
+++ b/global-config
@@ -38,9 +38,23 @@
:global "gre-cert-prefix" "ikev2-";
:global "gre-int-prefix" "gre-";
-# Access-list entries matching this comment are updated with daily
-# pseudo-random PSK.
+# Access-list entries matching this comment are updated
+# with daily pseudo-random PSK.
:global "daily-psk-match-comment" "Daily PSK";
+:global "daily-psk-secrets" {
+ { "Abusive"; "Aggressive"; "Bored"; "Chemical"; "Cold";
+ "Cruel"; "Curved"; "Delightful"; "Discreet"; "Elite";
+ "Evasive"; "Faded"; "Flat"; "Future"; "Grandiose";
+ "Hanging"; "Humorous"; "Interesting"; "Magenta";
+ "Magnificent"; "Numerous"; "Optimal"; "Pathetic";
+ "Possessive"; "Remarkable"; "Rightful"; "Ruthless";
+ "Stale"; "Unusual"; "Useless"; "Various" };
+ { "Adhesive"; "Amusing"; "Astonishing"; "Frantic";
+ "Kindhearted"; "Limping"; "Roasted"; "Robust";
+ "Staking"; "Thundering"; "Ultra"; "Unusual" };
+ { "Belief"; "Button"; "Curtain"; "Edge"; "Jewel";
+ "String"; "Whistle" }
+}
# Run different commands with multiple mode-button presses.
:global "mode-button" {
diff --git a/global-functions b/global-functions
index 5af2999..e60d28d 100644
--- a/global-functions
+++ b/global-functions
@@ -8,20 +8,7 @@
:global GeneratePSK do={
:local date $1;
- # 0-30 for days of month
- :local secret1 { "Abusive"; "Aggressive"; "Bored"; "Chemical"; "Cold";
- "Cruel"; "Curved"; "Delightful"; "Discreet"; "Elite"; "Evasive"; "Faded";
- "Flat"; "Future"; "Grandiose"; "Hanging"; "Humorous"; "Interesting";
- "Magenta"; "Magnificent"; "Numerous"; "Optimal"; "Pathetic"; "Possessive";
- "Remarkable"; "Rightful"; "Ruthless"; "Stale"; "Unusual"; "Useless";
- "Various" }
- # 0-11 for month of year
- :local secret2 { "Adhesive"; "Amusing"; "Astonishing"; "Frantic";
- "Kindhearted"; "Limping"; "Roasted"; "Robust"; "Staking"; "Thundering";
- "Ultra"; "Unusual" }
- # 0-6 for days of week
- :local secret3 { "Belief"; "Button"; "Curtain"; "Edge"; "Jewel"; "String";
- "Whistle" }
+ :global "daily-psk-secrets";
:local months {
"jan"; "feb"; "mar"; "apr"; "may"; "jun";
@@ -52,7 +39,9 @@
:set sum ($sum + $month);
:set sum ($sum - (($sum / 7) * 7));
- :local return ([ :pick $secret1 ($day - 1) ] . [ :pick $secret2 $month ] . [ :pick $secret3 $sum ]);
+ :local return ([ :pick [ :pick $"daily-psk-secrets" 0 ] ($day - 1) ] . \
+ [ :pick [ :pick $"daily-psk-secrets" 1 ] $month ] . \
+ [ :pick [ :pick $"daily-psk-secrets" 2 ] $sum ]);
:return $return;
}