summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenny Baumann <BenBE@geshi.org>2015-07-25 14:38:43 +0200
committerBenny Baumann <BenBE@geshi.org>2015-07-25 14:38:43 +0200
commit69cbc101efa4a568e92d98d97bfc1e0f41d68e41 (patch)
treec06ff98cfe5d28a6098a1ded1e8e7dc582e558b6
parentdc0f2ae0d23915ed991f0037df0e9d858008984f (diff)
downloadcacert-devel-69cbc101efa4a568e92d98d97bfc1e0f41d68e41.tar.gz
cacert-devel-69cbc101efa4a568e92d98d97bfc1e0f41d68e41.tar.xz
cacert-devel-69cbc101efa4a568e92d98d97bfc1e0f41d68e41.zip
bug 1392: Update the character blacklist in the signer
-rwxr-xr-xCommModule/server.pl10
1 files changed, 5 insertions, 5 deletions
diff --git a/CommModule/server.pl b/CommModule/server.pl
index 6084042..3fd77e6 100755
--- a/CommModule/server.pl
+++ b/CommModule/server.pl
@@ -491,8 +491,8 @@ sub SignX509($$$$$$$$)
$subject=~ s/\\x([A-F0-9]{2})/pack("C", hex($1))/egi;
$san=~ s/\\x([A-F0-9]{2})/pack("C", hex($1))/egi;
- Error "Invalid characters in SubjectAltName!\n" if($san=~m/[ \n\r\t\x00"'\\]/);
- Error "Invalid characters in Subject: ".hexdump($subject)." - $subject\n" if($subject=~m/[\n\r\t\x00"'\\]/);
+ Error "Invalid characters in SubjectAltName!\n" if($san=~m/[ \n\r\t\x00#"'\\]/);
+ Error "Invalid characters in Subject: ".hexdump($subject)." - $subject\n" if($subject=~m/[\n\r\t\x00#"'\\]/);
print "Subject: $subject\n";
print "SAN: $san\n";
@@ -590,8 +590,8 @@ sub SignOpenPGP
my $keyid=undef;
- Error "Invalid characters in SubjectAltName!\n" if($san=~m/[ \n\r\t\x00"'\\]/);
- Error "Invalid characters in Subject!\n" if($subject=~m/[ \n\r\t\x00"'\\;]/);
+ Error "Invalid characters in SubjectAltName!\n" if($san=~m/[ \n\r\t\x00#"'\\]/);
+ Error "Invalid characters in Subject!\n" if($subject=~m/[ \n\r\t\x00#"'\\;]/);
if(open OUT,">$wid/request.key")
@@ -843,7 +843,7 @@ sub RevokeX509
{
my ($root,$template,$hash,$days,$spkac,$request,$san,$subject)=@_;
- Error "Invalid characters in SubjectAltName!\n" if($san=~m/[ \n\r\t\x00"'\\]/);
+ Error "Invalid characters in SubjectAltName!\n" if($san=~m/[ \n\r\t\x00#"'\\]/);
Error "Invalid characters in Hash!\n" if(! $subject=~m/^[0-9a-fA-F]+$/);
SysLog "Widerrufe $PkiSystems{$_[0]}\n";