Changeset 74353 in vbox for trunk/src/VBox/Main/src-server

Timestamp:

Sep 18, 2018 9:51:33 PM (7 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

125166

Message:

Main/mediumio: Corrected crypto filtering on write access.

File:

• trunk/src/VBox/Main/src-server/MediumImpl.cpp (modified) (2 diffs)

trunk/src/VBox/Main/src-server/MediumImpl.cpp

@@ -8083 +8083 @@
  *                                  MediumLockList::Clear() after destroying
  *                                  @a *ppHdd
- * @param   pCryptoSettingsRead     The crypto read settings to use for setting
- *                                  up decryption of the VDISK.  This object
+ * @param   pCryptoSettings         The crypto settings to use for setting up
+ *                                  decryption/encryption of the VDISK.  This object
  *                                  must be alive until the VDISK is destroyed!
  */
 HRESULT Medium::i_openForIO(bool fWritable, SecretKeyStore *pKeyStore, PVDISK *ppHdd, MediumLockList *pMediumLockList,
-                            MediumCryptoFilterSettings *pCryptoSettingsRead)
+                            MediumCryptoFilterSettings *pCryptoSettings)
 {
     /*
@@ -8173 +8173 @@
                                    itKeyId->second.c_str(), vrc);
 
-            i_taskEncryptSettingsSetup(pCryptoSettingsRead, NULL, itKeyStore->second.c_str(), (const char *)pKey->getKeyBuffer(),
+            i_taskEncryptSettingsSetup(pCryptoSettings, NULL, itKeyStore->second.c_str(), (const char *)pKey->getKeyBuffer(),
                                        false /* fCreateKeyStore */);
-            vrc = VDFilterAdd(pHdd, "CRYPT", VD_FILTER_FLAGS_READ, pCryptoSettingsRead->vdFilterIfaces);
+            vrc = VDFilterAdd(pHdd, "CRYPT", VD_FILTER_FLAGS_DEFAULT, pCryptoSettings->vdFilterIfaces);
             pKeyStore->releaseSecretKey(itKeyId->second);
             if (vrc == VERR_VD_PASSWORD_INCORRECT)