Skip to content

[DO-NOT-MERGE] Disable signature check via env-variable #355

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

Draft
IljaN wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

[DO-NOT-MERGE] Disable signature check via env-variable #355

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
24 changes: 15 additions & 9 deletions lib/Crypto/Crypt.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -496,15 +496,19 @@ protected function isValidPrivateKey($plainKey) {
public function symmetricDecryptFileContent($keyFileContents, $passPhrase, $cipher = self::DEFAULT_CIPHER, $version = 0, $position = 0, $binaryEncode = false) {
$catFile = $this->splitMetaData($keyFileContents, $cipher);

if ($catFile['signature'] !== false) {
try {
$this->checkSignature($catFile['encrypted'], $passPhrase . $version . "-" . $position, $catFile['signature']);
} catch (HintException $e) {
// Check legacy format...
$this->checkSignature($catFile['encrypted'], $passPhrase . $version . $position, $catFile['signature']);

if (\getenv('ENCRYPTION_DISABLE_SIGNATURE', false) === false) {
if ($catFile['signature'] !== false) {
try {
$this->checkSignature($catFile['encrypted'], $passPhrase . $version . "-" . $position, $catFile['signature']);
} catch (HintException $e) {
// Check legacy format...
$this->checkSignature($catFile['encrypted'], $passPhrase . $version . $position, $catFile['signature']);
}
}
}


return $this->decrypt(
$catFile['encrypted'],
$catFile['iv'],
Expand Down Expand Up @@ -601,9 +605,11 @@ private function hasSignature($catFile, $cipher) {
$meta = \substr($catFile, -93);
$signaturePosition = \strpos($meta, '00sig00');

// enforce signature for the new 'CTR' ciphers
if ($signaturePosition === false && \strpos(\strtolower($cipher), 'ctr') !== false) {
throw new HintException('Missing Signature', $this->l->t('Missing Signature'));
if (\getenv('ENCRYPTION_DISABLE_SIGNATURE', false) === false) {
// enforce signature for the new 'CTR' ciphers
if ($signaturePosition === false && \strpos(\strtolower($cipher), 'ctr') !== false) {
throw new HintException('Missing Signature', $this->l->t('Missing Signature'));
}
}

return ($signaturePosition !== false);
Expand Down