keyfunc.sh: Check ACLs for good characters.

diff --git a/keyfunc.sh.in b/keyfunc.sh.in
index 2a10f267a46fdc3d69d434b181543fd7f6fbdd8b..b55bd99d0c766e7908304fca2a79f964233358de 100644 (file)
--- a/keyfunc.sh.in
+++ b/keyfunc.sh.in
@@ -153,10 +153,13 @@ check () {
 
 ## Regular expressions for validating input.
 R_IDENTCHARS="A-Za-z0-9_"
 
 ## 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_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_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=".*"
 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
 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 () {
 EOF
 
 readprops () {