Changeset 54809 in vbox

Timestamp:

Mar 17, 2015 12:07:04 PM (10 years ago)

Author:

vboxsync

Message:

Distinguished error codes when a provided password is wrong

Location:

trunk

Files:

• include/VBox/err.h (modified) (1 diff)
• src/VBox/Main/idl/VirtualBox.xidl (modified) (2 diffs)
• src/VBox/Main/src-client/ConsoleImpl.cpp (modified) (1 diff)

trunk/include/VBox/err.h

@@ -1541 +1541 @@
 /** The DEK for disk encryption is missing. */
 #define VERR_VD_DEK_MISSING                         (-3214)
+/** The provided password to decrypt the DEK was incorrect. */
+#define VERR_VD_PASSWORD_INCORRECT                  (-3215)
 /** Generic: Invalid image file header. Use this for plugins. */
 #define VERR_VD_GEN_INVALID_HEADER                  (-3220)

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

@@ -423 +423 @@
     <desc>
       Object being in use prohibits operation.
+    </desc>
+  </result>
+
+  <result name="VBOX_E_PASSWORD_INCORRECT" value="0x80BB000D">
+    <desc>
+      A provided password was incorrect.
     </desc>
   </result>
@@ -8357 +8363 @@
       <desc>
         Adds a password used for hard disk encryption/decryption.
+
+        <result name="VBOX_E_PASSWORD_INCORRECT">
+          The password provided wasn't correct for at least one disk using the provided
+          ID.
+        </result>
       </desc>
       <param name="id" type="wstring" dir="in">

trunk/src/VBox/Main/src-client/ConsoleImpl.cpp

@@ -4881 +4881 @@
                     {
                         rc = pIMedium->pfnSetSecKeyIf(pIMedium, mpIfSecKey, mpIfSecKeyHlp);
-                        if (RT_FAILURE(rc))
+                        if (rc == VERR_VD_PASSWORD_INCORRECT)
+                            return setError(VBOX_E_PASSWORD_INCORRECT, tr("The provided password for ID \"%s\" is not correct for at least one disk using this ID"),
+                                            strId.c_str());
+                        else if (RT_FAILURE(rc))
                             return setError(E_FAIL, tr("Failed to set the encryption key (%Rrc)"), rc);
                     }