Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-09-07 08:27:03 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Bugfix: encryptKeys was incorrect

Browse source
This commit is contained in:
the-djmaze 2022-01-25 16:39:50 +01:00
parent b1a2b7da95
commit 48febdb414
1 changed files with 5 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

14
snappymail/v/0.0.0/app/libraries/snappymail/pgp/gpg.php
View file

@ -163,9 +163,10 @@ class GPG
/** /**
* Add a key for signing * Add a key for signing
*/ */
public function addSignKey(string $fingerprint, ?string $passphrase) : bool public function addSignKey(string $fingerprint, string $passphrase) : bool
{ {
$this->signKeys[$fingerprint] = $passphrase; $this->signKeys[$fingerprint] = $passphrase;
// $this->signKeys[\substr($fingerprint, -16)] = $passphrase;
return false; return false;
} }
@ -279,8 +280,8 @@ class GPG
$arguments[] = '--armor'; $arguments[] = '--armor';
} }
foreach ($this->encryptKeys as $key) { foreach ($this->encryptKeys as $fingerprint => $dummy) {
$arguments[] = '--recipient ' . \escapeshellarg($key['fingerprint']); $arguments[] = '--recipient ' . \escapeshellarg($fingerprint);
} }
$result = $this->exec($arguments); $result = $this->exec($arguments);
@ -1193,11 +1194,7 @@ class GPG
$length = \strlen($chunk); $length = \strlen($chunk);
$this->_debug('=> about to write ' . $length . ' bytes to output stream'); $this->_debug('=> about to write ' . $length . ' bytes to output stream');
$length = \fwrite($this->_output, $chunk, $length); $length = \fwrite($this->_output, $chunk, $length);
if ($length === 0 || $length === false) { if (!$length) {
// If we wrote 0 bytes it was either EAGAIN or EPIPE. Since
// the pipe was seleted for writing, we assume it was EPIPE.
// There's no way to get the actual error code in PHP. See
// PHP Bug #39598. https://bugs.php.net/bug.php?id=39598
$this->_debug('=> broken pipe on output stream'); $this->_debug('=> broken pipe on output stream');
$this->_debug('=> closing pipe output stream'); $this->_debug('=> closing pipe output stream');
$this->_openPipes->close(self::FD_OUTPUT); $this->_openPipes->close(self::FD_OUTPUT);
@ -1235,7 +1232,6 @@ class GPG
// key ?: subkey // key ?: subkey
$passphrase = $this->getPassphrase($tokens[1]) ?: $this->getPassphrase($tokens[2]); $passphrase = $this->getPassphrase($tokens[1]) ?: $this->getPassphrase($tokens[2]);
$commandBuffer .= $passphrase . PHP_EOL; $commandBuffer .= $passphrase . PHP_EOL;
// $this->_openPipes->writePipe(self::FD_COMMAND, $passphrase . PHP_EOL);
} }
} }
} }