From: Mark Wooding <mdw@distorted.org.uk>
Date: Sat, 7 Jan 2012 02:08:53 +0000 (+0000)
Subject: keyfunc.sh: Check ACLs for good characters.
X-Git-Tag: 0.99.2~48
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/distorted-keys/commitdiff_plain/09c56d3e9bba2d2153a7f465abdac098fe66764c

keyfunc.sh: Check ACLs for good characters.
---

diff --git a/keyfunc.sh.in b/keyfunc.sh.in
index 2a10f26..b55bd99 100644
--- a/keyfunc.sh.in
+++ b/keyfunc.sh.in
@@ -153,10 +153,13 @@ check () {
 
 ## Regular expressions for validating input.
 R_IDENTCHARS="A-Za-z0-9_"
-R_WORDCHARS="-$R_IDENTCHARS!%@+="
+R_GOODPUNCT="!%@+="
+R_WORDCHARS="-$R_IDENTCHARS$R_GOODPUNCT"
 R_IDENT="[$R_IDENTCHARS][$R_IDENTCHARS]*"
 R_WORD="[$R_WORDCHARS][$R_WORDCHARS]*"
+R_ACLCHARS="][$R_IDENTCHARS$R_GOODPUNCT*?:.#"
 R_WORDSEQ="[$R_WORDCHARS[:space:]][$R_WORDCHARS[:space:]]*"
+R_ACL="[$R_ACLCHARS[:space:]-][$R_ACLCHARS[:space:]-]*"
 R_NUMERIC='\(\([1-9][0-9]*\)\{0,1\}0\{0,1\}\)'
 R_LABEL="\($R_WORD\(/$R_WORD\)*\)"
 R_LINE=".*"
@@ -241,6 +244,11 @@ random			t	$R_WORD
 nub_hash		t	$R_WORD
 nubid_hash		t	$R_WORD
 nub_random_bytes	t	$R_NUMERIC
+acl_encrypt		t	$R_ACL
+acl_decrypt		t	$R_ACL
+acl_sign		t	$R_ACL
+acl_verify		t	$R_ACL
+acl_info		t	$R_ACL
 EOF
 
 readprops () {