summaryrefslogtreecommitdiff
path: root/CommModule
diff options
context:
space:
mode:
authorBenny Baumann <BenBE@geshi.org>2015-07-25 14:45:00 +0200
committerBenny Baumann <BenBE@geshi.org>2015-07-25 14:45:00 +0200
commitdcab312e776396123f9c4e2cca724fd681fcb42e (patch)
tree32a6065789dcaaf01886097eb2be117e57d207f2 /CommModule
parent3d69a10d61d29b33a14db2bc6861d4129d7cdfda (diff)
parent69cbc101efa4a568e92d98d97bfc1e0f41d68e41 (diff)
downloadcacert-devel-dcab312e776396123f9c4e2cca724fd681fcb42e.tar.gz
cacert-devel-dcab312e776396123f9c4e2cca724fd681fcb42e.tar.xz
cacert-devel-dcab312e776396123f9c4e2cca724fd681fcb42e.zip
Merge branch 'bug-1392' into testserver-stable
Diffstat (limited to 'CommModule')
-rwxr-xr-xCommModule/server.pl10
1 files changed, 5 insertions, 5 deletions
diff --git a/CommModule/server.pl b/CommModule/server.pl
index abc1a1c..31cb537 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";