summaryrefslogtreecommitdiff
path: root/www/gpg.php
diff options
context:
space:
mode:
authorMichael Tänzer <neo@nhng.de>2014-04-21 20:07:00 +0200
committerMichael Tänzer <neo@nhng.de>2014-04-21 20:07:00 +0200
commitc7c4d077688807bcbec21e11d0aeb0af9ebfbd30 (patch)
tree74ee152df3b0d09497252bbc98453e8fc280a6b4 /www/gpg.php
parent29cc1c30533de1f6caa6fa163b95970eee5ab8ef (diff)
downloadcacert-c7c4d077688807bcbec21e11d0aeb0af9ebfbd30.tar.gz
cacert-c7c4d077688807bcbec21e11d0aeb0af9ebfbd30.tar.xz
cacert-c7c4d077688807bcbec21e11d0aeb0af9ebfbd30.zip
Source code taken from cacert-20140419.tar.bz2
Diffstat (limited to 'www/gpg.php')
-rw-r--r--www/gpg.php16
1 files changed, 8 insertions, 8 deletions
diff --git a/www/gpg.php b/www/gpg.php
index 829bbcf..263c1d3 100644
--- a/www/gpg.php
+++ b/www/gpg.php
@@ -187,18 +187,18 @@ function verifyEmail($email)
// Name (Comment) <Email>
if(preg_match("/^([^\(\)\[@<>]+) \(([^\(\)@<>]*)\) <([\w=\/%.-]*\@[\w.-]*|[\w.-]*\![\w=\/%.-]*)>/",$bits[9],$matches))
{
- $name=trim(hex2bin($matches[1]));
+ $name=trim(gpg_hex2bin($matches[1]));
$nocomment=0;
- $comm=trim(hex2bin($matches[2]));
- $mail=trim(hex2bin($matches[3]));
+ $comm=trim(gpg_hex2bin($matches[2]));
+ $mail=trim(gpg_hex2bin($matches[3]));
}
// Name <EMail>
elseif(preg_match("/^([^\(\)\[@<>]+) <([\w=\/%.-]*\@[\w.-]*|[\w.-]*\![\w=\/%.-]*)>/",$bits[9],$matches))
{
- $name=trim(hex2bin($matches[1]));
+ $name=trim(gpg_hex2bin($matches[1]));
$nocomment=1;
$comm="";
- $mail=trim(hex2bin($matches[2]));
+ $mail=trim(gpg_hex2bin($matches[2]));
}
// Unrecognized format
else
@@ -357,13 +357,13 @@ function verifyEmail($email)
$pos = strlen($bits[9]);
}
- $name = trim(hex2bin(trim(substr($bits[9], 0, $pos))));
+ $name = trim(gpg_hex2bin(trim(substr($bits[9], 0, $pos))));
$nameok=verifyName($name);
if($nocomment == 0)
{
$pos += 2;
$pos2 = strpos($bits[9], ")");
- $comm = trim(hex2bin(trim(substr($bits[9], $pos, $pos2 - $pos))));
+ $comm = trim(gpg_hex2bin(trim(substr($bits[9], $pos, $pos2 - $pos))));
if($comm != "")
$comment[] = $comm;
$pos = $pos2 + 3;
@@ -374,7 +374,7 @@ function verifyEmail($email)
$mail="";
if (preg_match("/<([\w.-]*\@[\w.-]*)>/", $bits[9],$match)) {
//echo "Found: ".$match[1];
- $mail = trim(hex2bin($match[1]));
+ $mail = trim(gpg_hex2bin($match[1]));
}
else
{