Changeset 94778 in vbox

Timestamp:

May 2, 2022 10:51:48 AM (3 years ago)

Author:

vboxsync

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

151164

Message:

Main/{DisplayUtils,MachineImpl}: Prepare the various screenshot getters to handle encrypted SSM streams when accessing the saved state file, bugref:9955

Location:

trunk/src/VBox/Main

Files:

• include/DisplayUtils.h (modified) (2 diffs)
• src-all/CryptoUtils.cpp (modified) (1 diff)
• src-all/DisplayUtils.cpp (modified) (6 diffs)
• src-server/MachineImpl.cpp (modified) (5 diffs)

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

@@ -24 +24 @@
 #include "VBox/com/string.h"
 
+#include "CryptoUtils.h"
+
 using namespace com;
 
@@ -33 +35 @@
 #define sSSMDisplayVer5 0x00010005
 
-int readSavedGuestScreenInfo(const Utf8Str &strStateFilePath, uint32_t u32ScreenId,
-                             uint32_t *pu32OriginX, uint32_t *pu32OriginY,
+int readSavedGuestScreenInfo(SsmStream &ssmStream, const Utf8Str &strStateFilePath,
+                             uint32_t u32ScreenId, uint32_t *pu32OriginX, uint32_t *pu32OriginY,
                              uint32_t *pu32Width, uint32_t *pu32Height, uint16_t *pu16Flags);
 
-int readSavedDisplayScreenshot(const Utf8Str &strStateFilePath, uint32_t u32Type, uint8_t **ppu8Data,
-                               uint32_t *pcbData, uint32_t *pu32Width, uint32_t *pu32Height);
+int readSavedDisplayScreenshot(SsmStream &ssmStream, const Utf8Str &strStateFilePath,
+                               uint32_t u32Type, uint8_t **ppu8Data, uint32_t *pcbData,
+                               uint32_t *pu32Width, uint32_t *pu32Height);
 void freeSavedDisplayScreenshot(uint8_t *pu8Data);
 

trunk/src/VBox/Main/src-all/CryptoUtils.cpp

@@ -114 +114 @@
     m_hVfsFile              = NIL_RTVFSFILE;
     m_pSsm                  = NULL;
+    m_pCryptoIf             = NULL;
 }
 

trunk/src/VBox/Main/src-all/DisplayUtils.cpp

@@ -23 +23 @@
 #include <VBoxVideo.h>
 
-int readSavedDisplayScreenshot(const Utf8Str &strStateFilePath, uint32_t u32Type, uint8_t **ppu8Data, uint32_t *pcbData,
+int readSavedDisplayScreenshot(SsmStream &ssmStream, const Utf8Str &strStateFilePath,
+                               uint32_t u32Type, uint8_t **ppu8Data, uint32_t *pcbData,
                                uint32_t *pu32Width, uint32_t *pu32Height)
 {
@@ -41 +42 @@
 
     PSSMHANDLE pSSM;
-    int vrc = SSMR3Open(strStateFilePath.c_str(), NULL /*pStreamOps*/, NULL /*pvStreamOps*/,
-                        0 /*fFlags*/, &pSSM);
+    int vrc = ssmStream.open(strStateFilePath.c_str(), false /*fWrite*/, &pSSM);
     if (RT_SUCCESS(vrc))
     {
@@ -113 +113 @@
         }
 
-        SSMR3Close(pSSM);
+        ssmStream.close();
     }
 
@@ -144 +144 @@
 }
 
-int readSavedGuestScreenInfo(const Utf8Str &strStateFilePath, uint32_t u32ScreenId,
-                             uint32_t *pu32OriginX, uint32_t *pu32OriginY,
+int readSavedGuestScreenInfo(SsmStream &ssmStream, const Utf8Str &strStateFilePath,
+                             uint32_t u32ScreenId, uint32_t *pu32OriginX, uint32_t *pu32OriginY,
                              uint32_t *pu32Width, uint32_t *pu32Height, uint16_t *pu16Flags)
 {
@@ -158 +158 @@
 
     PSSMHANDLE pSSM;
-    int vrc = SSMR3Open(strStateFilePath.c_str(), NULL /*pStreamOps*/, NULL /*pvStreamOps*/,
-                        0 /*fFlags*/, &pSSM);
+    int vrc = ssmStream.open(strStateFilePath.c_str(), false /*fWrite*/, &pSSM);
     if (RT_SUCCESS(vrc))
     {
@@ -208 +207 @@
         }
 
-        SSMR3Close(pSSM);
+        ssmStream.close();
     }
 

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

@@ -51 +51 @@
 #include "ExtPackManagerImpl.h"
 #include "MachineLaunchVMCommonWorker.h"
+#include "CryptoUtils.h"
 
 // generated header
@@ -6524 +6525 @@
     uint16_t u16Flags = 0;
 
-    int vrc = readSavedGuestScreenInfo(mSSData->strStateFilePath, aScreenId,
+    SsmStream SavedStateStream(mParent, mData->mpKeyStore, mSSData->strStateKeyId, mSSData->strStateKeyStore);
+    int vrc = readSavedGuestScreenInfo(SavedStateStream, mSSData->strStateFilePath, aScreenId,
                                        &u32OriginX, &u32OriginY, &u32Width, &u32Height, &u16Flags);
     if (RT_FAILURE(vrc))
@@ -6571 +6573 @@
     uint32_t u32Height = 0;
 
-    int vrc = readSavedDisplayScreenshot(mSSData->strStateFilePath, 0 /* u32Type */, &pu8Data, &cbData, &u32Width, &u32Height);
-
+    SsmStream SavedStateStream(mParent, mData->mpKeyStore, mSSData->strStateKeyId, mSSData->strStateKeyStore);
+    int vrc = readSavedDisplayScreenshot(SavedStateStream, mSSData->strStateFilePath, 0 /* u32Type */,
+                                         &pu8Data, &cbData, &u32Width, &u32Height);
     if (RT_FAILURE(vrc))
         return setErrorBoth(VBOX_E_IPRT_ERROR, vrc,
@@ -6660 +6663 @@
     uint32_t u32Height = 0;
 
-    int vrc = readSavedDisplayScreenshot(mSSData->strStateFilePath, 1 /* u32Type */, &pu8Data, &cbData, &u32Width, &u32Height);
+    SsmStream SavedStateStream(mParent, mData->mpKeyStore, mSSData->strStateKeyId, mSSData->strStateKeyStore);
+    int vrc = readSavedDisplayScreenshot(SavedStateStream, mSSData->strStateFilePath, 1 /* u32Type */,
+                                         &pu8Data, &cbData, &u32Width, &u32Height);
 
     if (RT_FAILURE(vrc))
@@ -6696 +6701 @@
     uint32_t u32Height = 0;
 
-    int vrc = readSavedDisplayScreenshot(mSSData->strStateFilePath, 1 /* u32Type */, &pu8Data, &cbData, &u32Width, &u32Height);
+    SsmStream SavedStateStream(mParent, mData->mpKeyStore, mSSData->strStateKeyId, mSSData->strStateKeyStore);
+    int vrc = readSavedDisplayScreenshot(SavedStateStream, mSSData->strStateFilePath, 1 /* u32Type */,
+                                         &pu8Data, &cbData, &u32Width, &u32Height);
 
     if (RT_FAILURE(vrc))