Skip to content

Remember current Cipher #26383

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
J0WI wants to merge 1 commit into from
Closed

Remember current Cipher #26383

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 22 additions & 15 deletions apps/encryption/lib/Crypto/Crypt.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,9 @@ class Crypt {
/** @var IL10N */
private $l;

/** @var string */
private $currentCipher;

/** @var array */
private $supportedCiphersAndKeySize = [
'AES-256-CTR' => 32,
Expand All @@ -106,8 +109,24 @@ public function __construct(ILogger $logger, IUserSession $userSession, IConfig
$this->config = $config;
$this->l = $l;
$this->supportedKeyFormats = ['hash', 'password'];

$this->supportLegacy = $this->config->getSystemValueBool('encryption.legacy_format_support', false);

// Get cipher either from config.php or the default cipher defined in this class
$cipher = $config->getSystemValue('cipher', self::DEFAULT_CIPHER);
if (!isset(self::SUPPORTED_CIPHERS_AND_KEY_SIZE[$cipher])) {
$logger->warning(
sprintf(
'Unsupported cipher (%s) defined in config.php supported. Falling back to %s',
$cipher,
self::DEFAULT_CIPHER
),
['app' => 'encryption']
);
$cipher = self::DEFAULT_CIPHER;
}

// Remember current cipher to avoid frequent lookups
$this->currentCipher = $cipher;
}

/**
Expand Down Expand Up @@ -258,19 +277,7 @@ private function encrypt($plainContent, $iv, $passPhrase = '', $cipher = self::D
* @return string
*/
public function getCipher() {
$cipher = $this->config->getSystemValue('cipher', self::DEFAULT_CIPHER);
if (!isset($this->supportedCiphersAndKeySize[$cipher])) {
$this->logger->warning(
sprintf(
'Unsupported cipher (%s) defined in config.php supported. Falling back to %s',
$cipher,
self::DEFAULT_CIPHER
),
['app' => 'encryption']);
$cipher = self::DEFAULT_CIPHER;
}

return $cipher;
return $this->currentCipher = $cipher;
}

/**
Expand Down Expand Up @@ -580,7 +587,7 @@ private function hasSignature($catFile, $cipher) {
throw new GenericEncryptionException('Missing Signature', $this->l->t('Missing Signature'));
}

// enforce signature for the new 'CTR' ciphers
// Enforce signature for the new 'CTR' ciphers
if (!$skipSignatureCheck && $signaturePosition === false && stripos($cipher, 'ctr') !== false) {
throw new GenericEncryptionException('Missing Signature', $this->l->t('Missing Signature'));
}
Expand Down