Changeset 54591 in vbox for trunk/src/VBox/Main/include

Timestamp:

Mar 2, 2015 7:55:29 PM (10 years ago)

Author:

vboxsync

Message:

Add support to supply passwords for disk encryption while the VM is running

Location:

trunk/src/VBox/Main/include

Files:

• ConsoleImpl.h (modified) (7 diffs)
• MediumImpl.h (modified) (3 diffs)

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2005-2014 Oracle Corporation
+ * Copyright (C) 2005-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -351 +351 @@
                      ULONG aMaxDowntime,
                      ComPtr<IProgress> &aProgress);
+    HRESULT addDiskEncryptionPassword(const com::Utf8Str &aId, const com::Utf8Str &aPassword,
+                                      BOOL aClearOnSuspend);
+    HRESULT removeDiskEncryptionPassword(const com::Utf8Str &aId);
+    HRESULT clearAllDiskEncryptionPasswords();
 
     void notifyNatDnsChange(PUVM pUVM, const char *pszDevice, ULONG ulInstanceMax);
@@ -585 +589 @@
             SecretKey() { }
 
-            SecretKey(uint8_t *pbKey, size_t cbKey)
+            SecretKey(uint8_t *pbKey, size_t cbKey, bool fRemoveOnSuspend)
                : m_cRefs(0),
                  m_pbKey(pbKey),
-                 m_cbKey(cbKey)
+                 m_cbKey(cbKey),
+                 m_fRemoveOnSuspend(fRemoveOnSuspend)
             { }
 
@@ -597 +602 @@
                 m_pbKey = NULL;
                 m_cbKey = 0;
+                m_fRemoveOnSuspend = false;
             }
 
@@ -605 +611 @@
             /** Size of the key in bytes. */
             size_t   m_cbKey;
+            /** Flag whether to remove the key on suspend. */
+            bool     m_fRemoveOnSuspend;
     };
 
@@ -810 +818 @@
                                                         size_t *pcbKey);
     static DECLCALLBACK(int)    i_pdmIfSecKey_KeyRelease(PPDMISECKEY pInterface, const char *pszId);
+    static DECLCALLBACK(int)    i_pdmIfSecKey_PasswordRetain(PPDMISECKEY pInterface, const char *pszId, const char **ppszPassword);
+    static DECLCALLBACK(int)    i_pdmIfSecKey_PasswordRelease(PPDMISECKEY pInterface, const char *pszId);
 
     static DECLCALLBACK(int)    i_pdmIfSecKeyHlp_KeyMissingNotify(PPDMISECKEYHLP pInterface);
@@ -852 +862 @@
      * @{ */
     HRESULT i_consoleParseDiskEncryption(const char *psz, const char **ppszEnd);
-    HRESULT i_configureEncryptionForDisk(const char *pszUuid);
+    HRESULT i_configureEncryptionForDisk(const Utf8Str &aId);
     HRESULT i_clearDiskEncryptionKeysOnAllAttachments(void);
     int i_consoleParseKeyValue(const char *psz, const char **ppszEnd,

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

@@ -7 +7 @@
 
 /*
- * Copyright (C) 2008-2014 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -276 +276 @@
     HRESULT reset(ComPtr<IProgress> &aProgress);
     HRESULT changeEncryption(const com::Utf8Str &aNewPassword, const com::Utf8Str &aOldPassword,
-                             const com::Utf8Str &aCipher, ComPtr<IProgress> &aProgress);
+                             const com::Utf8Str &aCipher, const com::Utf8Str &aNewPasswordId, ComPtr<IProgress> &aProgress);
 
     // Private internal nmethods
@@ -324 +324 @@
                                                  const uint8_t **ppbKey, size_t *pcbKey);
     static DECLCALLBACK(int) i_vdCryptoKeyRelease(void *pvUser, const char *pszId);
-    static DECLCALLBACK(int) i_vdCryptoKeyStoreGetPassword(void *pvUser, const char **ppszPassword);
+    static DECLCALLBACK(int) i_vdCryptoKeyStorePasswordRetain(void *pvUser, const char *pszId, const char **ppszPassword);
+    static DECLCALLBACK(int) i_vdCryptoKeyStorePasswordRelease(void *pvUser, const char *pszId);
     static DECLCALLBACK(int) i_vdCryptoKeyStoreSave(void *pvUser, const void *pvKeyStore, size_t cbKeyStore);
     static DECLCALLBACK(int) i_vdCryptoKeyStoreReturnParameters(void *pvUser, const char *pszCipher,