From patchwork Tue Jul 13 15:30:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 4513 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4GPPjj71kNz3xCm for ; Tue, 13 Jul 2021 15:31:05 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4GPPjg6XKwz1Tp; Tue, 13 Jul 2021 15:31:03 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4GPPjg3xjMz2xyg; Tue, 13 Jul 2021 15:31:03 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4GPPjf592jz2xKH for ; Tue, 13 Jul 2021 15:31:02 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4GPPjf08H9zZZ; Tue, 13 Jul 2021 15:31:01 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1626190262; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=F8YRzddxGGMhm5UzFVvBZ0tkl1wwmJ35GI6TrDNhI5Y=; b=WDrvsEVdPPwagOsCtcYp0daetVxTtdPIlL0PfNrVPLDlbd+PhjZK+uPNEdi9VZHCfmLlgV uk4+8vs9Ewb2nICA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1626190262; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=F8YRzddxGGMhm5UzFVvBZ0tkl1wwmJ35GI6TrDNhI5Y=; b=rGRvD1icR9nKQ2L5Hrzi8HNe0w0QfMF72Kr7FD4uJ+gSDXBwF27qDQUQc37rf1lPGU3iNy 1IVv6uFBwV0v7muinOx2mOl0IZzw7j5LY3xOgCaGFnElzVGkSswqtg547Cp/4CN4MHd1s/ nDc50GEMPSgwuXhpDuiylrAAwECSDdKfzY3xlPXuSz97SaC1x8DWZKfP2a1LItuNT64RnT AxiJeELB7Zm2wlO+wMdvQAgIzz/w5eIPlDZ9ZFuVfjDl8QDPKSJwn39MNpzw29PDrJDjzw zXNBt4+0tuOokDWsp9zD2EHW8YuQw473F+dd7VWT1fTIIUgLk6aioZnTINSO3g== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 1/3] ovpnmain.cgi: Join certificate output before &Header::cleanhtml(); Date: Tue, 13 Jul 2021 15:30:51 +0000 Message-Id: <20210713153053.11281-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Signed-off-by: Michael Tremer --- html/cgi-bin/ovpnmain.cgi | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi index 7a2833ce6..3cd2f9381 100644 --- a/html/cgi-bin/ovpnmain.cgi +++ b/html/cgi-bin/ovpnmain.cgi @@ -1532,8 +1532,8 @@ END &Header::openbigbox('100%', 'LEFT', '', $errormessage); &Header::openbox('100%', 'LEFT', "$Lang::tr{'ca certificate'}:"); my @output = &General::system_output("/usr/bin/openssl", "x509", "-text", "-in", "${General::swroot}/ovpn/ca/$cahash{$cgiparams{'KEY'}}[0]cert.pem"); - @output = &Header::cleanhtml(@output,"y"); - print "
@output
\n"; + my $output = &Header::cleanhtml(join("", @output),"y"); + print "
$output
\n"; &Header::closebox(); print ""; &Header::closebigbox(); @@ -1652,8 +1652,8 @@ END &Header::openbox('100%', 'LEFT', "$Lang::tr{'host certificate'}:"); @output = &General::system_output("/usr/bin/openssl", "x509", "-text", "-in", "${General::swroot}/ovpn/certs/servercert.pem"); } - @output = &Header::cleanhtml(@output,"y"); - print "
@output
\n"; + my $output = &Header::cleanhtml(join("", @output), "y"); + print "
$output
\n"; &Header::closebox(); print ""; &Header::closebigbox(); @@ -2616,8 +2616,8 @@ else &Header::openbigbox('100%', 'LEFT', '', ''); &Header::openbox('100%', 'LEFT', "$Lang::tr{'certificate'}:"); my @output = &General::system_output("/usr/bin/openssl", "x509", "-text", "-in", "${General::swroot}/ovpn/certs/$confighash{$cgiparams{'KEY'}}[1]cert.pem"); - @output = &Header::cleanhtml(@output,"y"); - print "
@output
\n"; + my $output = &Header::cleanhtml(join("", @output), "y"); + print "
$output
\n"; &Header::closebox(); print ""; &Header::closebigbox(); @@ -2638,8 +2638,8 @@ else &Header::openbigbox('100%', 'LEFT', '', ''); &Header::openbox('100%', 'LEFT', "$Lang::tr{'dh'}:"); my @output = &General::system_output("/usr/bin/openssl", "dhparam", "-text", "-in", "${General::swroot}/ovpn/ca/dh1024.pem"); - @output = &Header::cleanhtml(@output,"y"); - print "
@output
\n"; + my $output = &Header::cleanhtml(join("", @output) ,"y"); + print "
$output
\n"; &Header::closebox(); print ""; &Header::closebigbox(); @@ -2664,8 +2664,8 @@ else my @output = ; close(FILE); - @output = &Header::cleanhtml(@output,"y"); - print "
@output
\n"; + my $output = &Header::cleanhtml(join("", @output),"y"); + print "
$output
\n"; &Header::closebox(); print ""; &Header::closebigbox(); @@ -2687,8 +2687,8 @@ else &Header::openbigbox('100%', 'LEFT', '', ''); &Header::openbox('100%', 'LEFT', "$Lang::tr{'crl'}:"); my @output = &General::system_output("/usr/bin/openssl", "crl", "-text", "-noout", "-in", "${General::swroot}/ovpn/crls/cacrl.pem"); - @output = &Header::cleanhtml(@output,"y"); - print "
@output
\n"; + my $output = &Header::cleanhtml(join("", @output), "y"); + print "
$output
\n"; &Header::closebox(); print ""; &Header::closebigbox(); From patchwork Tue Jul 13 15:30:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 4514 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4GPPjk3sGCz3xGv for ; Tue, 13 Jul 2021 15:31:06 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4GPPjh5V8Nz27x; Tue, 13 Jul 2021 15:31:04 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4GPPjh4dt0z2xqw; Tue, 13 Jul 2021 15:31:04 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4GPPjg3FVDz2xm2 for ; Tue, 13 Jul 2021 15:31:03 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4GPPjf5cqPzZZ; Tue, 13 Jul 2021 15:31:02 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1626190263; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=FkV2elq/YAnDzZyXYXOu+W6Y1iSaqjSTQnbfE3YUtMU=; b=GeUO2inBe8bcDPpvpuvaNmVI340Wn129F2EwOtgub7s0NKFoTSDg5Dz6Y9/YXwPD7KbPtc flvRHXg0qIy1SUCQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1626190263; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=FkV2elq/YAnDzZyXYXOu+W6Y1iSaqjSTQnbfE3YUtMU=; b=j2qLvFgkR3KvA7UBElIGv7UJHy4WROEQGuawH5vr061Fmkzrldafcky72Z6jTLL/KO3ErU zHI5tZJIWbevc1Xxaa+bYrFa/2LX+Rz4FmnXRS0AGPhhMuwdKNop0QH5HLERAmhbbepBQ9 aClLLwLRfRaBSJtvLk2yCwnDRXmLBmlTRjj1qAAw4xeX0qYykXfMz0CCBQkZ879w+Za/qv 4FHn2GIj64qb3qk0tIPlm+QE5+qedhVoAZzvo1g+yj3pagJB4iY5UXq2J5jPqcuVBpt4l3 wn/tNfPaWJ/VGyAJYI2kTmpMweqh5ng16TtArB/NscFPTH8Veb39mQy819e85Q== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 2/3] Partially revert "vpnmain.cgi: Use new system methods" Date: Tue, 13 Jul 2021 15:30:52 +0000 Message-Id: <20210713153053.11281-2-michael.tremer@ipfire.org> In-Reply-To: <20210713153053.11281-1-michael.tremer@ipfire.org> References: <20210713153053.11281-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" This reverts commit a81cbf61273536ee36f3d26504aabdcd65d39cca. It was no longer possible to generate the root/host certificates. Signed-off-by: Michael Tremer --- html/cgi-bin/vpnmain.cgi | 52 +++++++++++++--------------------------- 1 file changed, 16 insertions(+), 36 deletions(-) diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi index 8f13cf51f..80e93ffd3 100644 --- a/html/cgi-bin/vpnmain.cgi +++ b/html/cgi-bin/vpnmain.cgi @@ -226,13 +226,9 @@ sub newcleanssldatabase { ### sub callssl ($) { my $opt = shift; - - # Split the given argument string into single pieces and assign them to an array. - my @opts = split(/ /, $opt); - - my @retssl = &General::system_output("/usr/bin/openssl", @opts); #redirect stderr + my $retssl = `/usr/bin/openssl $opt 2>&1`; #redirect stderr my $ret = ''; - foreach my $line (split (/\n/, @retssl)) { + foreach my $line (split (/\n/, $retssl)) { &General::log("ipsec", "$line") if (0); # 1 for verbose logging $ret .= '
'.$line if ( $line =~ /error|unknown/ ); } @@ -246,21 +242,13 @@ sub callssl ($) { ### sub getCNfromcert ($) { #&General::log("ipsec", "Extracting name from $_[0]..."); - my @temp = &General::system_output("/usr/bin/openssl", "x509", "-text", "-in", "$_[0]"); - my $temp; - - foreach my $line (@temp) { - if ($line =~ /Subject:.*CN = (.*)[\n]/) { - $temp = $1; - $temp =~ s+/Email+, E+; - $temp =~ s/ ST = / S = /; - $temp =~ s/,//g; - $temp =~ s/\'//g; - - last; - } - } - + my $temp = `/usr/bin/openssl x509 -text -in $_[0]`; + $temp =~ /Subject:.*CN = (.*)[\n]/; + $temp = $1; + $temp =~ s+/Email+, E+; + $temp =~ s/ ST = / S = /; + $temp =~ s/,//g; + $temp =~ s/\'//g; return $temp; } ### @@ -268,19 +256,11 @@ sub getCNfromcert ($) { ### sub getsubjectfromcert ($) { #&General::log("ipsec", "Extracting subject from $_[0]..."); - my @temp = &General::system_output("/usr/bin/openssl", "x509", "-text", "-in", "$_[0]"); - my $temp; - - foreach my $line (@temp) { - if($line =~ /Subject: (.*)[\n]/) { - $temp = $1; - $temp =~ s+/Email+, E+; - $temp =~ s/ ST = / S = /; - - last; - } - } - + my $temp = `/usr/bin/openssl x509 -text -in $_[0]`; + $temp =~ /Subject: (.*)[\n]/; + $temp = $1; + $temp =~ s+/Email+, E+; + $temp =~ s/ ST = / S = /; return $temp; } ### @@ -689,8 +669,8 @@ END $errormessage = $!; goto UPLOADCA_ERROR; } - my @temp = &General::system_output("/usr/bin/openssl", "x509", "-text", "-in", "$filename"); - if (! grep(/CA:TRUE/, @temp)) { + my $temp = `/usr/bin/openssl x509 -text -in $filename`; + if ($temp !~ /CA:TRUE/i) { $errormessage = $Lang::tr{'not a valid ca certificate'}; unlink ($filename); goto UPLOADCA_ERROR; From patchwork Tue Jul 13 15:30:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 4515 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4GPPjl2VKHz3xCm for ; Tue, 13 Jul 2021 15:31:07 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4GPPjj66qqz2Dj; Tue, 13 Jul 2021 15:31:05 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4GPPjj5DrWz2xy5; Tue, 13 Jul 2021 15:31:05 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4GPPjh1G3zz2xCy for ; Tue, 13 Jul 2021 15:31:04 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4GPPjg4k5WzZZ; Tue, 13 Jul 2021 15:31:03 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1626190264; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=cH5FIOP14vV4qlR/AFjy6dg9KUIKRP6+5Bt0fqdoUCU=; b=wBtD9v1JOBCKjRnP02Szk3lwulK1fIVAFPfScb+wtbNzEfykiv4KO9plodEEso5rhbN2Es rgVk1nCVlaSkSqAg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1626190264; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=cH5FIOP14vV4qlR/AFjy6dg9KUIKRP6+5Bt0fqdoUCU=; b=c/HClAysxIQ1JS5S7m+di2qATfp9omcQiXd9EdHqSa6JGc/pSNpgfNreBG7aa96D80Y7Xw 7juOhrigcGySs2M/aZDcHCEHBJjdc9fixVxI/j8jewnJLdG8eX8xb+UYXqFBaZJaCTbHzN HJfsYwwoULNRmAkEpK9ZpokOMzyNCrKINAN1WPSBg6KhtAwjhcsuhxOOjLi+zmH84tXfNU jWxz5sGbg/6ZhBfgUHqOHwQcVsJ0tPmnAReX8URJxvCSDdCZCqKMnaGKqjAHWvjxZBDHkC Z0z2UYdpqKzsNtdxuinyJZrHotvhUX+wsjKKcIc3xsE4tdpYK2OBXgL8xHz5pQ== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 3/3] vpnmain.cgi: Join certificate output before &Header::cleanhtml(); Date: Tue, 13 Jul 2021 15:30:53 +0000 Message-Id: <20210713153053.11281-3-michael.tremer@ipfire.org> In-Reply-To: <20210713153053.11281-1-michael.tremer@ipfire.org> References: <20210713153053.11281-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Signed-off-by: Michael Tremer --- html/cgi-bin/vpnmain.cgi | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi index 80e93ffd3..d54b56577 100644 --- a/html/cgi-bin/vpnmain.cgi +++ b/html/cgi-bin/vpnmain.cgi @@ -705,8 +705,8 @@ END &Header::openbigbox('100%', 'left', '', ''); &Header::openbox('100%', 'left', "$Lang::tr{'ca certificate'}:"); my @output = &General::system_output("/usr/bin/openssl", "x509", "-text", "-in", "${General::swroot}/ca/$cahash{$cgiparams{'KEY'}}[0]cert.pem"); - @output = &Header::cleanhtml(@output,"y"); - print "
@output
\n"; + my $output = &Header::cleanhtml(join("", @output) ,"y"); + print "
$output
\n"; &Header::closebox(); print ""; &Header::closebigbox(); @@ -832,8 +832,8 @@ END &Header::openbox('100%', 'left', "$Lang::tr{'host certificate'}:"); @output = &General::system_output("/usr/bin/openssl", "x509", "-text", "-in", "${General::swroot}/certs/hostcert.pem"); } - @output = &Header::cleanhtml(@output,"y"); - print "
@output
\n"; + my $output = &Header::cleanhtml(join("", @output) ,"y"); + print "
$output
\n"; &Header::closebox(); print ""; &Header::closebigbox(); @@ -1521,8 +1521,8 @@ END &Header::openbigbox('100%', 'left', '', ''); &Header::openbox('100%', 'left', "$Lang::tr{'cert'}:"); my @output = &General::system_output("/usr/bin/openssl", "x509", "-text", "-in", "${General::swroot}/certs/$confighash{$cgiparams{'KEY'}}[1]cert.pem"); - @output = &Header::cleanhtml(@output,"y"); - print "
@output
\n"; + my $output = &Header::cleanhtml(join("", @output) ,"y"); + print "
$output
\n"; &Header::closebox(); print ""; &Header::closebigbox();