extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-14 18:08:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

W.I.P. smime support:

Browse Source 
- Fix stdClass not exist
This commit is contained in:
Hadi Nategh 2017-04-11 15:29:31 +02:00
parent fff5543d3d
commit 1a63b5681d
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
api/src/Mail/Smime.php
View File

@ -14,7 +14,7 @@ namespace EGroupware\Api\Mail;
use EGroupware\Api; use EGroupware\Api;
use Horde_Crypt_Smime; use Horde_Crypt_Smime;
use Horde_Crypt;
/** /**
* EMailAdmin generic base class for SMTP * EMailAdmin generic base class for SMTP
*/ */
@ -187,7 +187,7 @@ class Smime extends Horde_Crypt_Smime
* </pre> * </pre>
* @throws Horde_Crypt_Exception * @throws Horde_Crypt_Exception
* *
* *
* @TODO: This method is overridden in order to extract content * @TODO: This method is overridden in order to extract content
* from the signed message. There's a pull request opened for this * from the signed message. There's a pull request opened for this
* modification on horde github, https://github.com/horde/horde/pull/218 * modification on horde github, https://github.com/horde/horde/pull/218
@ -217,7 +217,7 @@ class Smime extends Horde_Crypt_Smime
} }
} }
$ob = new stdClass; $ob = new \stdClass();
if (!empty($root_certs) && if (!empty($root_certs) &&
(openssl_pkcs7_verify($input, 0, $output) === true)) { (openssl_pkcs7_verify($input, 0, $output) === true)) {
@ -229,12 +229,12 @@ class Smime extends Horde_Crypt_Smime
$result = openssl_pkcs7_verify($input, PKCS7_NOVERIFY, $output); $result = openssl_pkcs7_verify($input, PKCS7_NOVERIFY, $output);
if ($result === -1) { if ($result === -1) {
throw new Horde_Crypt_Exception(Horde_Crypt_Translation::t("Verification failed - an unknown error has occurred.")); throw new \Horde_Crypt_Exception(\Horde_Crypt_Translation::t("Verification failed - an unknown error has occurred."));
} elseif ($result === false) { } elseif ($result === false) {
throw new Horde_Crypt_Exception(Horde_Crypt_Translation::t("Verification failed - this message may have been tampered with.")); throw new \Horde_Crypt_Exception(\Horde_Crypt_Translation::t("Verification failed - this message may have been tampered with."));
} }
$ob->msg = Horde_Crypt_Translation::t("Message verified successfully but the signer's certificate could not be verified."); $ob->msg = \Horde_Crypt_Translation::t("Message verified successfully but the signer's certificate could not be verified.");
$ob->verify = false; $ob->verify = false;
} }
if (openssl_pkcs7_verify($input, PKCS7_NOVERIFY, $output, array(), $output, $content)) if (openssl_pkcs7_verify($input, PKCS7_NOVERIFY, $output, array(), $output, $content))