holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

W.I.P. SMIME:

Browse Source 
- Fix switching account fetches a wrong pubkey
This commit is contained in:
Hadi Nategh 2017-07-25 19:55:46 +02:00
parent 72f3dc394b
commit ec6e82f0a1
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/src/Mail.php
View File

@ -7413,7 +7413,7 @@ class Mail
{ {
$AB_bo = new \addressbook_bo(); $AB_bo = new \addressbook_bo();
$credents = Mail\Credentials::read($this->profileID, Mail\Credentials::SMIME, $GLOBALS['egw_info']['user']['account_id']); $credents = Mail\Credentials::read($this->profileID, Mail\Credentials::SMIME, $GLOBALS['egw_info']['user']['account_id']);
$certkey = $AB_bo->get_smime_keys($GLOBALS['egw_info']['user']['account_email']); $certkey = $AB_bo->get_smime_keys($this->icServer->ident_email);
if (!$this->smime->verifyPassphrase($credents['acc_smime_password'], $_passphrase)) if (!$this->smime->verifyPassphrase($credents['acc_smime_password'], $_passphrase))
{ {
return array ( return array (
@ -7424,7 +7424,7 @@ class Mail
$params = array ( $params = array (
'type' => 'message', 'type' => 'message',
'pubkey' => $certkey[$GLOBALS['egw_info']['user']['account_email']], 'pubkey' => $certkey[$this->icServer->ident_email],
'privkey' => $credents['acc_smime_password'], 'privkey' => $credents['acc_smime_password'],
'passphrase'=> $_passphrase 'passphrase'=> $_passphrase
); );