Merge pull request #26324 from J0WI/crypt-drop-openssl-09

Drop OpenSSL 0.9.8 workaround
This commit is contained in:
Roeland Jago Douma 2021-03-30 11:43:44 +02:00 committed by GitHub
commit 08209e649c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 7 deletions

View File

@ -270,13 +270,6 @@ class Crypt {
$cipher = self::DEFAULT_CIPHER;
}
// Workaround for OpenSSL 0.9.8. Fallback to an old cipher that should work.
if (OPENSSL_VERSION_NUMBER < 0x1000101f) {
if ($cipher === 'AES-256-CTR' || $cipher === 'AES-128-CTR') {
$cipher = self::LEGACY_CIPHER;
}
}
return $cipher;
}