diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2021-03-30 11:43:44 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-30 11:43:44 +0200 |
| commit | 08209e649cb0e411895430e4f28a29d14e269fb5 (patch) | |
| tree | bcf850757ca7d788fb194a4239e3cc457b41c8b8 /apps | |
| parent | c9e18218c8f986be46283161042c4af515f0ab83 (diff) | |
| parent | 21494a5b7bea0204e094ff27a1da5b7a78bc83e8 (diff) | |
| download | nextcloud-server-08209e649cb0e411895430e4f28a29d14e269fb5.tar.gz nextcloud-server-08209e649cb0e411895430e4f28a29d14e269fb5.zip | |
Merge pull request #26324 from J0WI/crypt-drop-openssl-09
Drop OpenSSL 0.9.8 workaround
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/encryption/lib/Crypto/Crypt.php | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/apps/encryption/lib/Crypto/Crypt.php b/apps/encryption/lib/Crypto/Crypt.php index 2ba30425c7f..c956283e5f6 100644 --- a/apps/encryption/lib/Crypto/Crypt.php +++ b/apps/encryption/lib/Crypto/Crypt.php @@ -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; } |