summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Warg <mw@it-sls.de>2010-03-30 17:16:42 +0200
committerMarkus Warg <mw@it-sls.de>2010-03-30 17:16:42 +0200
commit0a24e915fdcbf745141e4534b64fdef57319d250 (patch)
treea9682f7942f8248586b8e2cb18be47df57e044c0
parenta84f4ce8db95ec6edf552d6d372e24a9cbf09d5a (diff)
downloadcacert-devel-0a24e915fdcbf745141e4534b64fdef57319d250.tar.gz
cacert-devel-0a24e915fdcbf745141e4534b64fdef57319d250.tar.xz
cacert-devel-0a24e915fdcbf745141e4534b64fdef57319d250.zip
source code taken from cacert-20100329.tar.bz2
-rw-r--r--www/gpg.php15
1 files 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);