Changeset 54855 in vbox

Timestamp:

Mar 19, 2015 8:12:00 PM (10 years ago)

Author:

vboxsync

Message:

Main/Medium: Logic change for IMedium::ChangeEncryption, an empty password and password ID will result in the current password being used for encryption if the cipher is not empty. Useful for changing the encryption cipher of an image while still using the same password

Location:

trunk/src/VBox/Main

Files:

• idl/VirtualBox.xidl (modified) (1 diff)
• src-server/MediumImpl.cpp (modified) (5 diffs)

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -14768 +14768 @@
       <param name="newPassword" type="wstring" dir="in">
         <desc>
-          The new password the medium should be protected with. Use an empty string
-          to indicate that the result should not be encrypted.
+          The new password the medium should be protected with. An empty password and password ID
+          will result in the medium being encrypted with the current password.
         </desc>
       </param>

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

@@ -8937 +8937 @@
         char *pszKeyStoreEncNew = NULL;
         void *pvBuf = NULL;
+        const char *pszPasswordNew = NULL;
         try
         {
@@ -8972 +8973 @@
             if (task.mstrCipher.isNotEmpty())
             {
-                if (task.mstrNewPassword.isEmpty())
+                if (   task.mstrNewPassword.isEmpty()
+                    && task.mstrNewPasswordId.isEmpty()
+                    && task.mstrCurrentPassword.isNotEmpty())
+                {
+                    /* An empty password and password ID will default to the current password. */
+                    pszPasswordNew = task.mstrCurrentPassword.c_str();
+                }
+                else if (task.mstrNewPassword.isEmpty())
                     throw setError(VBOX_E_OBJECT_NOT_FOUND,
                                    tr("A password must be given for the image encryption"));
-
-                if (task.mstrNewPasswordId.isEmpty())
+                else if (task.mstrNewPasswordId.isEmpty())
                     throw setError(VBOX_E_INVALID_OBJECT_STATE,
                                    tr("A valid identifier for the password must be given"));
+                else
+                    pszPasswordNew = task.mstrNewPassword.c_str();
 
                 i_taskEncryptSettingsSetup(&CryptoSettingsWrite, task.mstrCipher.c_str(), NULL,
-                                           task.mstrNewPassword.c_str(), true /* fCreateKeyStore */);
+                                           pszPasswordNew, true /* fCreateKeyStore */);
                 vrc = VDFilterAdd(pDisk, "CRYPT", VD_FILTER_FLAGS_WRITE, CryptoSettingsWrite.vdFilterIfaces);
                 if (RT_FAILURE(vrc))
@@ -8990 +8999 @@
             else if (task.mstrNewPasswordId.isNotEmpty() || task.mstrNewPassword.isNotEmpty())
                 throw setError(VBOX_E_INVALID_OBJECT_STATE,
-                               tr("The password and password identifier must be empty if there is the output shuld be unencrypted"));
+                               tr("The password and password identifier must be empty if the output should be unencrypted"));
 
             /* Open all media in the chain. */
@@ -9044 +9053 @@
                 pBase->m->mapProperties.erase(it);
 
-            it = pBase->m->mapProperties.find("CRYPT/KeyId");
-            if (it != pBase->m->mapProperties.end())
-                pBase->m->mapProperties.erase(it);
+            if (task.mstrNewPasswordId.isNotEmpty())
+            {
+                it = pBase->m->mapProperties.find("CRYPT/KeyId");
+                if (it != pBase->m->mapProperties.end())
+                    pBase->m->mapProperties.erase(it);
+            }
 
             if (CryptoSettingsWrite.pszKeyStore)
             {
                 pBase->m->mapProperties["CRYPT/KeyStore"] = Utf8Str(CryptoSettingsWrite.pszKeyStore);
-                pBase->m->mapProperties["CRYPT/KeyId"] = task.mstrNewPasswordId;
+                if (task.mstrNewPasswordId.isNotEmpty())
+                    pBase->m->mapProperties["CRYPT/KeyId"] = task.mstrNewPasswordId;
             }
 
@@ -9074 +9087 @@
                        tr("Encryption is not supported because extension pack support is not built in"));
 # endif
-
-
     }
     catch (HRESULT aRC) { rc = aRC; }