always use default cipher for write operations, no matter how the file was encrypted...

diff --git a/apps/encryption/lib/crypto/encryption.php b/apps/encryption/lib/crypto/encryption.php
index 4843284f7a3178c15bf125c54ae0cca54ddbbe8f..dc60c0947849eea3236e515184f9e67e5a71f883 100644 (file)
--- a/apps/encryption/lib/crypto/encryption.php
+++ b/apps/encryption/lib/crypto/encryption.php
@@ -192,10 +192,10 @@ class Encryption implements IEncryptionModule {
                        }
                }
 
-               if (isset($header['cipher'])) {
-                       $this->cipher = $header['cipher'];
-               } elseif ($this->isWriteOperation) {
+               if ($this->isWriteOperation) {
                        $this->cipher = $this->crypt->getCipher();
+               } elseif (isset($header['cipher'])) {
+                       $this->cipher = $header['cipher'];
                } else {
                        // if we read a file without a header we fall-back to the legacy cipher
                        // which was used in <=oC6