From 0a24e915fdcbf745141e4534b64fdef57319d250 Mon Sep 17 00:00:00 2001 From: Markus Warg Date: Tue, 30 Mar 2010 17:16:42 +0200 Subject: source code taken from cacert-20100329.tar.bz2 --- www/gpg.php | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/www/gpg.php b/www/gpg.php index 526bcad..345b559 100644 --- a/www/gpg.php +++ b/www/gpg.php @@ -83,14 +83,13 @@ function verifyEmail($email) if($oldid == "0" && $CSR != "") { $debugkey = $gpgkey = clean_gpgcsr($CSR); - #$debugpg = $gpg = trim(`echo "$gpgkey"|gpg --with-colons --homedir /tmp 2>&1`); - - $tnam = tempnam('/tmp/', '__gpg'); - $fp = fopen($tnam, 'w'); - fwrite($fp, $gpgkey); - fclose($fp); - $debugpg = $gpg = trim(`gpg --with-colons --homedir /tmp 2>&1 < $tnam`); - unlink($tnam); + + $tnam = tempnam('/tmp/', '__gpg'); + $fp = fopen($tnam, 'w'); + fwrite($fp, $gpgkey); + fclose($fp); + $debugpg = $gpg = trim(`gpg --with-colons --homedir /tmp 2>&1 < $tnam`); + unlink($tnam); $lines = ""; $gpgarr = explode("\n", $gpg); -- cgit v1.2.1