Merge pull request #21557 from owncloud/use-hmac-over-encryption

apps/encryption/appinfo/application.php

apps/encryption/appinfo/register_command.php

apps/encryption/lib/crypto/crypt.php

apps/encryption/lib/crypto/encryption.php

apps/encryption/lib/keymanager.php

apps/encryption/settings/settings-admin.php

apps/encryption/settings/settings-personal.php

apps/encryption/tests/lib/KeyManagerTest.php

apps/encryption/tests/lib/crypto/cryptTest.php

apps/encryption/tests/lib/crypto/encryptionTest.php

apps/files_versions/lib/storage.php

lib/private/files/cache/cache.php

lib/private/files/fileinfo.php

lib/private/files/storage/wrapper/encryption.php

lib/private/files/stream/encryption.php

lib/public/encryption/iencryptionmodule.php

settings/changepassword/controller.php

tests/lib/files/stream/encryption.php