summaryrefslogtreecommitdiff
path: root/includes/general.php
diff options
context:
space:
mode:
authorBenny Baumann <BenBE@geshi.org>2014-03-21 01:26:52 +0100
committerBenny Baumann <BenBE@geshi.org>2014-03-21 01:26:52 +0100
commit75439b2e684bf1fd58a112cfd57779d104e78d78 (patch)
tree5ba7290efc5f64d893d6f0d25726b644ffd36fa6 /includes/general.php
parentd9f88e530a728c631f31ed01e113b084fb596c7b (diff)
parentea9f9d8d7f0b8f196161333384da2b814ac973fe (diff)
downloadcacert-devel-75439b2e684bf1fd58a112cfd57779d104e78d78.tar.gz
cacert-devel-75439b2e684bf1fd58a112cfd57779d104e78d78.tar.xz
cacert-devel-75439b2e684bf1fd58a112cfd57779d104e78d78.zip
Merge branch 'bug-1184' into testserver-stable
Diffstat (limited to 'includes/general.php')
-rw-r--r--includes/general.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/includes/general.php b/includes/general.php
index fca4563..7887370 100644
--- a/includes/general.php
+++ b/includes/general.php
@@ -512,7 +512,7 @@
return(0);
}
- function hex2bin($data)
+ function gpg_hex2bin($data)
{
while(strstr($data, "\\x"))
{