Changeset 54854 in vbox

Timestamp:

Mar 19, 2015 7:45:09 PM (10 years ago)

Author:

vboxsync

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

99059

Message:

Main: Rearrange and rename parameters of IMedium::ChangeEncryption

Location:

trunk/src/VBox

Files:

• Frontends/VBoxManage/VBoxManageDisk.cpp (modified) (1 diff)
• Main/idl/VirtualBox.xidl (modified) (3 diffs)
• Main/include/MediumImpl.h (modified) (1 diff)
• Main/src-server/MediumImpl.cpp (modified) (9 diffs)

trunk/src/VBox/Frontends/VBoxManage/VBoxManageDisk.cpp

@@ -1821 +1821 @@
 
     ComPtr<IProgress> progress;
-    CHECK_ERROR(hardDisk, ChangeEncryption(Bstr(strPasswordNew).raw(), Bstr(strPasswordOld).raw(),
-                                           Bstr(pszCipher).raw(), Bstr(pszNewPasswordId).raw(),
+    CHECK_ERROR(hardDisk, ChangeEncryption(Bstr(strPasswordOld).raw(), Bstr(pszCipher).raw(),
+                                           Bstr(strPasswordNew).raw(), Bstr(pszNewPasswordId).raw(),
                                            progress.asOutParam()));
     if (SUCCEEDED(rc))

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

@@ -13489 +13489 @@
   <interface
     name="IMedium" extends="$unknown"
-    uuid="41e09c4f-97bf-4a1a-bf5c-c5b87f58464b"
+    uuid="9fae9ea1-c57c-4a3d-8992-cbb2b9b4b4a3"
     wsmap="managed"
     >
@@ -14754 +14754 @@
         </result>
       </desc>
+      <param name="currentPassword" type="wstring" dir="in">
+        <desc>
+          The olcurrentd password the medium is protected with. Use an empty string to indicate
+          that the medium isn't encrypted.
+        </desc>
+      </param>
+      <param name="cipher" type="wstring" dir="in">
+        <desc>
+          The cipher to use for encryption. An empty string indicates no encryption for the
+          result.
+        </desc>
+      </param>
       <param name="newPassword" type="wstring" dir="in">
         <desc>
@@ -14759 +14771 @@
           to indicate that the result should not be encrypted.
         </desc>
-      </param>
-      <param name="oldPassword" type="wstring" dir="in">
-        <desc>
-          The old password the medium is protected with. Use an empty string to indicate
-          that the medium wasn't encrypted before.
-        </desc>
-      </param>
-      <param name="cipher" type="wstring" dir="in">
-        <desc>The cipher to use for encryption.</desc>
       </param>
       <param name="newPasswordId" type="wstring" dir="in">

trunk/src/VBox/Main/include/MediumImpl.h

@@ -276 +276 @@
                    ComPtr<IProgress> &aProgress);
     HRESULT reset(ComPtr<IProgress> &aProgress);
-    HRESULT changeEncryption(const com::Utf8Str &aNewPassword, const com::Utf8Str &aOldPassword,
-                             const com::Utf8Str &aCipher, const com::Utf8Str &aNewPasswordId, ComPtr<IProgress> &aProgress);
+    HRESULT changeEncryption(const com::Utf8Str &aCurrentPassword, const com::Utf8Str &aCipher,
+                             const com::Utf8Str &aNewPassword, const com::Utf8Str &aNewPasswordId,
+                             ComPtr<IProgress> &aProgress);
     HRESULT getEncryptionSettings(com::Utf8Str &aCipher, com::Utf8Str &aPasswordId);
 

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

@@ -676 +676 @@
     EncryptTask(Medium *aMedium,
                 const com::Utf8Str &strNewPassword,
-                const com::Utf8Str &strOldPassword,
+                const com::Utf8Str &strCurrentPassword,
                 const com::Utf8Str &strCipher,
                 const com::Utf8Str &strNewPasswordId,
@@ -683 +683 @@
         : Medium::Task(aMedium, aProgress),
           mstrNewPassword(strNewPassword),
-          mstrOldPassword(strOldPassword),
+          mstrCurrentPassword(strCurrentPassword),
           mstrCipher(strCipher),
           mstrNewPasswordId(strNewPasswordId),
@@ -701 +701 @@
         if (mstrNewPassword.length())
             RTMemWipeThoroughly(mstrNewPassword.mutableRaw(), mstrNewPassword.length(), 10 /* cPasses */);
-        if (mstrOldPassword.length())
-            RTMemWipeThoroughly(mstrOldPassword.mutableRaw(), mstrOldPassword.length(), 10 /* cPasses */);
+        if (mstrCurrentPassword.length())
+            RTMemWipeThoroughly(mstrCurrentPassword.mutableRaw(), mstrCurrentPassword.length(), 10 /* cPasses */);
         delete mpMediumLockList;
     }
 
     Utf8Str mstrNewPassword;
-    Utf8Str mstrOldPassword;
+    Utf8Str mstrCurrentPassword;
     Utf8Str mstrCipher;
     Utf8Str mstrNewPasswordId;
@@ -3039 +3039 @@
 }
 
-HRESULT Medium::changeEncryption(const com::Utf8Str &aNewPassword, const com::Utf8Str &aOldPassword,
-                                 const com::Utf8Str &aCipher, const com::Utf8Str &aNewPasswordId,
+HRESULT Medium::changeEncryption(const com::Utf8Str &aCurrentPassword, const com::Utf8Str &aCipher,
+                                 const com::Utf8Str &aNewPassword, const com::Utf8Str &aNewPasswordId,
                                  ComPtr<IProgress> &aProgress)
 {
@@ -3146 +3146 @@
 
         /* setup task object to carry out the operation asynchronously */
-        pTask = new Medium::EncryptTask(this, aNewPassword, aOldPassword,
+        pTask = new Medium::EncryptTask(this, aNewPassword, aCurrentPassword,
                                         aCipher, aNewPasswordId, pProgress, pMediumLockList);
         rc = pTask->rc();
@@ -8940 +8940 @@
         {
             /* Set up disk encryption filters. */
-            if (task.mstrOldPassword.isEmpty())
+            if (task.mstrCurrentPassword.isEmpty())
             {
                 /*
@@ -8958 +8958 @@
                                    tr("The image is not configured for encryption"));
 
-                i_taskEncryptSettingsSetup(&CryptoSettingsRead, NULL, it->second.c_str(), task.mstrOldPassword.c_str(),
+                i_taskEncryptSettingsSetup(&CryptoSettingsRead, NULL, it->second.c_str(), task.mstrCurrentPassword.c_str(),
                                            false /* fCreateKeyStore */);
                 vrc = VDFilterAdd(pDisk, "CRYPT", VD_FILTER_FLAGS_READ, CryptoSettingsRead.vdFilterIfaces);
@@ -8970 +8970 @@
             }
 
-            if (task.mstrNewPassword.isNotEmpty())
+            if (task.mstrCipher.isNotEmpty())
             {
-                if (task.mstrCipher.isEmpty())
+                if (task.mstrNewPassword.isEmpty())
                     throw setError(VBOX_E_OBJECT_NOT_FOUND,
-                                   tr("No valid cipher identifier was given for encryption"));
+                                   tr("A password must be given for the image encryption"));
 
                 if (task.mstrNewPasswordId.isEmpty())
                     throw setError(VBOX_E_INVALID_OBJECT_STATE,
-                                   tr("A new password must always have a valid identifier"));
+                                   tr("A valid identifier for the password must be given"));
 
                 i_taskEncryptSettingsSetup(&CryptoSettingsWrite, task.mstrCipher.c_str(), NULL,
@@ -8988 +8988 @@
                                    i_vdError(vrc).c_str());
             }
-            else if (task.mstrNewPasswordId.isNotEmpty())
+            else if (task.mstrNewPasswordId.isNotEmpty() || task.mstrNewPassword.isNotEmpty())
                 throw setError(VBOX_E_INVALID_OBJECT_STATE,
-                               tr("The password identifier must be empty if there is no new password set for encryption"));
+                               tr("The password and password identifier must be empty if there is the output shuld be unencrypted"));
 
             /* Open all media in the chain. */