summaryrefslogtreecommitdiff
path: root/CommModule/server.pl
diff options
context:
space:
mode:
Diffstat (limited to 'CommModule/server.pl')
-rwxr-xr-xCommModule/server.pl12
1 files changed, 6 insertions, 6 deletions
diff --git a/CommModule/server.pl b/CommModule/server.pl
index 6084042..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";
@@ -1002,7 +1002,7 @@ my @ready=$sel->can_read($starttime);
my $count=0;
#As soon as the client connected successfully, the client has to send a request faster than every 10 seconds
-while(@ready = $sel->can_read(15) && -f "./server.pl-active")
+while((@ready = $sel->can_read(15)) && -f "./server.pl-active")
{
my $data="";
#my $length=read SER,$data,1;