Skip to content

Commit

Permalink
Revert "Pass the openssl path too."
Browse files Browse the repository at this point in the history
This reverts commit fa2dca3.
  • Loading branch information
yunosh committed Apr 28, 2017
1 parent 896e8b1 commit 15f2ea3
Showing 1 changed file with 0 additions and 8 deletions.
8 changes: 0 additions & 8 deletions imp/lib/Smime.php
Expand Up @@ -409,8 +409,6 @@ public function deletePublicKey($email)
*/
protected function _signParameters()
{
global $conf;

$pubkey = $this->getPersonalPublicKey(true);
$additional = array();
if ($pubkey) {
Expand All @@ -424,19 +422,13 @@ protected function _signParameters()
if ($secondary) {
$additional[] = $this->getAdditionalCert();
}

$sslpath = empty($conf['openssl']['path'])
? null
: $conf['openssl']['path'];

return array(
'type' => 'signature',
'pubkey' => $pubkey,
'privkey' => $this->getPersonalPrivateKey($secondary),
'passphrase' => $this->getPassphrase($secondary),
'sigtype' => 'detach',
'certs' => implode("\n", $additional),
'sslpath' => $sslpath
);
}

Expand Down

0 comments on commit 15f2ea3

Please sign in to comment.