Changeset 42208 in vbox for trunk/src/VBox

Timestamp:

Jul 18, 2012 1:22:38 PM (13 years ago)

Author:

vboxsync

Message:

Main: properly initialize fSettingsCipherKeySet; don't ignore errors during encryption

Location:

trunk/src/VBox/Main/src-server

Files:

• MediumImpl.cpp (modified) (2 diffs)
• VirtualBoxImpl.cpp (modified) (2 diffs)

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

@@ -3773 +3773 @@
         && !itPln->second.isEmpty())
     {
-        /* Encrypt the plain secret. If that does not work (i.e. no settings key specified),
-         * just use the encrypted secret (if there is any). */
+        /* Encrypt the plain secret. If that does not work (i.e. no or wrong settings key
+         * specified), just use the encrypted secret (if there is any). */
         int rc = m->pVirtualBox->encryptSetting(itPln->second, &strCiphertext);
-        NOREF(rc);
-        fHaveInitiatorSecretEncrypted = true;
+        if (RT_SUCCESS(rc))
+            fHaveInitiatorSecretEncrypted = true;
     }
     for (settings::StringsMap::const_iterator it = m->mapProperties.begin();
@@ -3793 +3793 @@
                 data.properties[name] = value;
         }
-        if (fHaveInitiatorSecretEncrypted)
-            data.properties["InitiatorSecretEncrypted"] = strCiphertext;
-    }
+    }
+    if (fHaveInitiatorSecretEncrypted)
+        data.properties["InitiatorSecretEncrypted"] = strCiphertext;
 
     /* only for base media */

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

@@ -205 +205 @@
           threadAsyncEvent(NIL_RTTHREAD),
           pAsyncEventQ(NULL),
-          pAutostartDb(NULL)
+          pAutostartDb(NULL),
+          fSettingsCipherKeySet(false)
     {
     }
@@ -2169 +2170 @@
     }
 
-    /* fill with random data to have a minimal length */
+    /* fill with random data to have a minimal length (salt) */
     if (i < aCiphertextSize)
     {