Changeset 94714 in vbox for trunk/src

Timestamp:

Apr 27, 2022 7:41:12 AM (3 years ago)

Author:

vboxsync

Message:

Main,Settings: Integrate the extension pack cryptographic module in the ExtPack manager etc., bugref:9955

Location:

trunk/src/VBox

Files:

• Frontends/VBoxManage/VBoxManageList.cpp (modified) (4 diffs)
• Main/idl/VirtualBox.xidl (modified) (4 diffs)
• Main/include/ExtPackManagerImpl.h (modified) (4 diffs)
• Main/include/ExtPackUtil.h (modified) (1 diff)
• Main/include/Global.h (modified) (1 diff)
• Main/include/SystemPropertiesImpl.h (modified) (2 diffs)
• Main/src-all/ExtPackManagerImpl.cpp (modified) (9 diffs)
• Main/src-all/ExtPackUtil.cpp (modified) (4 diffs)
• Main/src-server/SystemPropertiesImpl.cpp (modified) (4 diffs)
• Main/xml/Settings.cpp (modified) (2 diffs)

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

@@ -834 +834 @@
     systemProperties->COMGETTER(DefaultVRDEExtPack)(str.asOutParam());
     RTPrintf(List::tr("Remote desktop ExtPack:          %ls\n"), str.raw());
+    systemProperties->COMGETTER(DefaultCryptoExtPack)(str.asOutParam());
+    RTPrintf(List::tr("VM encryption ExtPack:           %ls\n"), str.raw());
     systemProperties->COMGETTER(LogHistoryCount)(&ulValue);
     RTPrintf(List::tr("Log history count:               %u\n"), ulValue);
@@ -1213 +1215 @@
         Bstr bstrVrdeModule;
         CHECK_ERROR2I_STMT(extPacks[i], COMGETTER(VRDEModule)(bstrVrdeModule.asOutParam()),hrc=hrcCheck; bstrVrdeModule.setNull());
+        Bstr bstrCryptoModule;
+        CHECK_ERROR2I_STMT(extPacks[i], COMGETTER(CryptoModule)(bstrCryptoModule.asOutParam()),hrc=hrcCheck; bstrCryptoModule.setNull());
         BOOL fUsable;
         CHECK_ERROR2I_STMT(extPacks[i], COMGETTER(Usable)(&fUsable),                     hrc = hrcCheck; fUsable = FALSE);
@@ -1223 +1227 @@
         RTPrintf(List::tr(
                    "Pack no.%2zu:   %ls\n"
-                   "Version:      %ls\n"
-                   "Revision:     %u\n"
-                   "Edition:      %ls\n"
-                   "Description:  %ls\n"
-                   "VRDE Module:  %ls\n"
-                   "Usable:       %RTbool\n"
-                   "Why unusable: %ls\n"),
+                   "Version:        %ls\n"
+                   "Revision:       %u\n"
+                   "Edition:        %ls\n"
+                   "Description:    %ls\n"
+                   "VRDE Module:    %ls\n"
+                   "Crypto Module:  %ls\n"
+                   "Usable:         %RTbool\n"
+                   "Why unusable:   %ls\n"),
                  i, bstrName.raw(),
                  bstrVersion.raw(),
@@ -1236 +1241 @@
                  bstrDesc.raw(),
                  bstrVrdeModule.raw(),
+                 bstrCryptoModule.raw(),
                  fUsable != FALSE,
                  bstrWhy.raw());

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

@@ -12297 +12297 @@
     name="ISystemProperties"
     extends="$unknown"
-    uuid="e6bf9165-6685-4ebe-96cd-9c1b7ab7f776"
+    uuid="a2a3be3d-664a-47e9-a4c5-add220d4ebb1"
     wsmap="managed"
     rest="managed"
@@ -12562 +12562 @@
         For details about VirtualBox Remote Desktop Extension and how to
         implement one, please refer to the VirtualBox SDK.
+      </desc>
+    </attribute>
+
+    <attribute name="defaultCryptoExtPack" type="wstring">
+      <desc>
+        The name of the extension pack providing the default cryptographic support
+        for full VM encryption.
+
+        This attribute is for choosing between multiple extension packs
+        providing cryptographic support. If only one is installed, it will automatically be the
+        default one. The attribute value can be empty if no cryptographic extension
+        pack is installed.
       </desc>
     </attribute>
@@ -25157 +25169 @@
   <interface
     name="IExtPackBase" extends="$unknown"
-    uuid="f25aca3d-0b79-4350-bdd9-a0376cd6e6e3"
+    uuid="aa204a12-5b29-45a5-b5d6-c2bafcdb9b0b"
     wsmap="suppress"
     reservedMethods="4" reservedAttributes="8"
@@ -25196 +25208 @@
     <attribute name="VRDEModule" type="wstring" readonly="yes">
       <desc>The name of the VRDE module if the extension pack sports one.</desc>
+    </attribute>
+    <attribute name="CryptoModule" type="wstring" readonly="yes">
+      <desc>
+        The name of the crypto module if the extension pack sports one.
+        This module is required for full VM encryption.
+      </desc>
     </attribute>
     <attribute name="plugIns" type="IExtPackPlugIn" safearray="yes" readonly="yes">

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

@@ -67 +67 @@
     HRESULT getEdition(com::Utf8Str &aEdition);
     HRESULT getVRDEModule(com::Utf8Str &aVRDEModule);
+    HRESULT getCryptoModule(com::Utf8Str &aCryptoModule);
     HRESULT getPlugIns(std::vector<ComPtr<IExtPackPlugIn> > &aPlugIns);
     HRESULT getUsable(BOOL *aUsable);
@@ -131 +132 @@
 #endif
     HRESULT     i_checkVrde(void);
+    HRESULT     i_checkCrypto(void);
     HRESULT     i_getVrdpLibraryName(Utf8Str *a_pstrVrdeLibrary);
+    HRESULT     i_getCryptoLibraryName(Utf8Str *a_pstrCryptoLibrary);
     HRESULT     i_getLibraryName(const char *a_pszModuleName, Utf8Str *a_pstrLibrary);
     bool        i_wantsToBeDefaultVrde(void) const;
+    bool        i_wantsToBeDefaultCrypto(void) const;
     HRESULT     i_refresh(bool *pfCanDelete);
 #ifndef VBOX_COM_INPROC
@@ -200 +204 @@
     HRESULT getEdition(com::Utf8Str &aEdition);
     HRESULT getVRDEModule(com::Utf8Str &aVRDEModule);
+    HRESULT getCryptoModule(com::Utf8Str &aCryptoModule);
     HRESULT getPlugIns(std::vector<ComPtr<IExtPackPlugIn> > &aPlugIns);
     HRESULT getUsable(BOOL *aUsable);
@@ -261 +266 @@
     HRESULT     i_checkVrdeExtPack(Utf8Str const *a_pstrExtPack);
     int         i_getVrdeLibraryPathForExtPack(Utf8Str const *a_pstrExtPack, Utf8Str *a_pstrVrdeLibrary);
+    HRESULT     i_checkCryptoExtPack(Utf8Str const *a_pstrExtPack);
+    int         i_getCryptoLibraryPathForExtPack(Utf8Str const *a_pstrExtPack, Utf8Str *a_pstrVrdeLibrary);
     HRESULT     i_getLibraryPathForExtPack(const char *a_pszModuleName, const char *a_pszExtPack, Utf8Str *a_pstrLibrary);
     HRESULT     i_getDefaultVrdeExtPack(Utf8Str *a_pstrExtPack);
+    HRESULT     i_getDefaultCryptoExtPack(Utf8Str *a_pstrExtPack);
     bool        i_isExtPackUsable(const char *a_pszExtPack);
     void        i_dumpAllToReleaseLog(void);

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

@@ -107 +107 @@
     /** The name of the VRDE module, empty if none. */
     RTCString               strVrdeModule;
+    /** The name of the cryptographic module, empty if none. */
+    RTCString               strCryptoModule;
     /** The number of plug-in descriptors. */
     uint32_t                cPlugIns;

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

@@ -57 +57 @@
  */
 #define VBOXVRDP_KLUDGE_EXTPACK_NAME    "Built-in-VBoxVRDP"
+
+/** The VBoxPuelCrypto kludge extension pack name.
+ *
+ * This is not a valid extension pack name (dashes are not allowed), and
+ * hence will not conflict with real extension packs.
+ */
+#define VBOXPUELCRYPTO_KLUDGE_EXTPACK_NAME    "Built-in-VBoxPuelCrypto"
 
 /**

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

@@ -101 +101 @@
     HRESULT getDefaultVRDEExtPack(com::Utf8Str &aDefaultVRDEExtPack) RT_OVERRIDE;
     HRESULT setDefaultVRDEExtPack(const com::Utf8Str &aDefaultVRDEExtPack) RT_OVERRIDE;
+    HRESULT getDefaultCryptoExtPack(com::Utf8Str &aDefaultCryptoExtPack) RT_OVERRIDE;
+    HRESULT setDefaultCryptoExtPack(const com::Utf8Str &aDefaultCryptoExtPack) RT_OVERRIDE;
     HRESULT getLogHistoryCount(ULONG *aLogHistoryCount) RT_OVERRIDE;
     HRESULT setLogHistoryCount(ULONG aLogHistoryCount) RT_OVERRIDE;
@@ -185 +187 @@
     HRESULT i_setWebServiceAuthLibrary(const com::Utf8Str &aPath);
     HRESULT i_setDefaultVRDEExtPack(const com::Utf8Str &aExtPack);
+    HRESULT i_setDefaultCryptoExtPack(const com::Utf8Str &aExtPack);
     HRESULT i_setAutostartDatabasePath(const com::Utf8Str &aPath);
     HRESULT i_setDefaultAdditionsISO(const com::Utf8Str &aPath);

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

@@ -481 +481 @@
 {
     aVRDEModule = m->Desc.strVrdeModule;
+    return S_OK;
+}
+
+HRESULT ExtPackFile::getCryptoModule(com::Utf8Str &aCryptoModule)
+{
+    aCryptoModule = m->Desc.strCryptoModule;
     return S_OK;
 }
@@ -1156 +1162 @@
 
 /**
+ * Check if the extension pack is usable and has a cryptographic module.
+ *
+ * @returns S_OK or COM error status with error information.
+ *
+ * @remarks Caller holds the extension manager lock for reading, no locking
+ *          necessary.
+ */
+HRESULT ExtPack::i_checkCrypto(void)
+{
+    HRESULT hrc;
+    if (   m != NULL
+        && m->fUsable)
+    {
+        if (m->Desc.strCryptoModule.isNotEmpty())
+            hrc = S_OK;
+        else
+            hrc = setError(E_FAIL, tr("The extension pack '%s' does not include a cryptographic module"), m->Desc.strName.c_str());
+    }
+    else
+        hrc = setError(E_FAIL, "%s", m->strWhyUnusable.c_str());
+    return hrc;
+}
+
+/**
  * Same as checkVrde(), except that it also resolves the path to the module.
  *
@@ -1175 +1205 @@
             hrc = setError(E_FAIL, tr("Failed to locate the VRDE module '%s' in extension pack '%s'"),
                            m->Desc.strVrdeModule.c_str(), m->Desc.strName.c_str());
+    }
+    return hrc;
+}
+
+/**
+ * Same as i_checkCrypto(), except that it also resolves the path to the module.
+ *
+ * @returns S_OK or COM error status with error information.
+ * @param   a_pstrCryptoLibrary  Where to return the path on success.
+ *
+ * @remarks Caller holds the extension manager lock for reading, no locking
+ *          necessary.
+ */
+HRESULT ExtPack::i_getCryptoLibraryName(Utf8Str *a_pstrCryptoLibrary)
+{
+    HRESULT hrc = i_checkCrypto();
+    if (SUCCEEDED(hrc))
+    {
+        if (i_findModule(m->Desc.strCryptoModule.c_str(), NULL, VBOXEXTPACKMODKIND_R3,
+                         a_pstrCryptoLibrary, NULL /*a_pfNative*/, NULL /*a_pObjInfo*/))
+            hrc = S_OK;
+        else
+            hrc = setError(E_FAIL, tr("Failed to locate the cryptographic module '%s' in extension pack '%s'"),
+                           m->Desc.strCryptoModule.c_str(), m->Desc.strName.c_str());
     }
     return hrc;
@@ -1214 +1268 @@
     return m->fUsable
         && m->Desc.strVrdeModule.isNotEmpty();
+}
+
+/**
+ * Check if this extension pack wishes to be the default cryptographic provider.
+ *
+ * @returns @c true if it wants to and it is in a usable state, otherwise
+ *          @c false.
+ *
+ * @remarks Caller holds the extension manager lock for reading, no locking
+ *          necessary.
+ */
+bool ExtPack::i_wantsToBeDefaultCrypto(void) const
+{
+    return m->fUsable
+        && m->Desc.strCryptoModule.isNotEmpty();
 }
 
@@ -2097 +2166 @@
 {
     aVRDEModule = m->Desc.strVrdeModule;
+    return S_OK;
+}
+
+HRESULT ExtPack::getCryptoModule(com::Utf8Str &aCryptoModule)
+{
+    aCryptoModule = m->Desc.strCryptoModule;
     return S_OK;
 }
@@ -3509 +3584 @@
 
 /**
+ * Checks that the specified extension pack contains a cryptographic module and that it
+ * is shipshape.
+ *
+ * @returns S_OK if ok, appropriate failure status code with details.
+ * @param   a_pstrExtPack   The name of the extension pack.
+ */
+HRESULT ExtPackManager::i_checkCryptoExtPack(Utf8Str const *a_pstrExtPack)
+{
+    AutoCaller autoCaller(this);
+    HRESULT hrc = autoCaller.rc();
+    if (SUCCEEDED(hrc))
+    {
+        AutoReadLock autoLock(this COMMA_LOCKVAL_SRC_POS);
+
+        ExtPack *pExtPack = i_findExtPack(a_pstrExtPack->c_str());
+        if (pExtPack)
+            hrc = pExtPack->i_checkCrypto();
+        else
+            hrc = setError(VBOX_E_OBJECT_NOT_FOUND, tr("No extension pack by the name '%s' was found"), a_pstrExtPack->c_str());
+    }
+
+    return hrc;
+}
+
+/**
+ * Gets the full path to the cryptographic library of the specified extension pack.
+ *
+ * This will do extacly the same as checkCryptoExtPack and then resolve the
+ * library path.
+ *
+ * @returns VINF_SUCCESS if a path is returned, VBox error status and message
+ *          return if not.
+ * @param   a_pstrExtPack       The extension pack.
+ * @param   a_pstrCryptoLibrary Where to return the path.
+ */
+int ExtPackManager::i_getCryptoLibraryPathForExtPack(Utf8Str const *a_pstrExtPack, Utf8Str *a_pstrCryptoLibrary)
+{
+    AutoCaller autoCaller(this);
+    HRESULT hrc = autoCaller.rc();
+    if (SUCCEEDED(hrc))
+    {
+        AutoReadLock autoLock(this COMMA_LOCKVAL_SRC_POS);
+
+        ExtPack *pExtPack = i_findExtPack(a_pstrExtPack->c_str());
+        if (pExtPack)
+            hrc = pExtPack->i_getCryptoLibraryName(a_pstrCryptoLibrary);
+        else
+            hrc = setError(VBOX_E_OBJECT_NOT_FOUND, tr("No extension pack by the name '%s' was found"),
+                           a_pstrExtPack->c_str());
+    }
+
+    return Global::vboxStatusCodeFromCOM(hrc);
+}
+
+
+/**
  * Gets the full path to the specified library of the specified extension pack.
  *
@@ -3568 +3699 @@
 
 /**
+ * Gets the name of the default cryptographic extension pack.
+ *
+ * @returns S_OK or some COM error status on red tape failure.
+ * @param   a_pstrExtPack   Where to return the extension pack name.  Returns
+ *                          empty if no extension pack wishes to be the default
+ *                          VRDP provider.
+ */
+HRESULT ExtPackManager::i_getDefaultCryptoExtPack(Utf8Str *a_pstrExtPack)
+{
+    a_pstrExtPack->setNull();
+
+    AutoCaller autoCaller(this);
+    HRESULT hrc = autoCaller.rc();
+    if (SUCCEEDED(hrc))
+    {
+        AutoReadLock autoLock(this COMMA_LOCKVAL_SRC_POS);
+
+        for (ExtPackList::iterator it = m->llInstalledExtPacks.begin();
+             it != m->llInstalledExtPacks.end();
+             ++it)
+        {
+            if ((*it)->i_wantsToBeDefaultCrypto())
+            {
+                *a_pstrExtPack = (*it)->m->Desc.strName;
+                break;
+            }
+        }
+    }
+    return hrc;
+}
+
+/**
  * Checks if an extension pack is (present and) usable.
  *
@@ -3606 +3769 @@
         {
             if (pExtPackData->fUsable)
-                LogRel(("  %s (Version: %s r%u%s%s; VRDE Module: %s)\n",
-                        pExtPackData->Desc.strName.c_str(),
-                        pExtPackData->Desc.strVersion.c_str(),
-                        pExtPackData->Desc.uRevision,
-                        pExtPackData->Desc.strEdition.isEmpty() ? "" : " ",
-                        pExtPackData->Desc.strEdition.c_str(),
-                        pExtPackData->Desc.strVrdeModule.c_str() ));
-            else
-                LogRel(("  %s (Version: %s r%u%s%s; VRDE Module: %s unusable because of '%s')\n",
+                LogRel(("  %s (Version: %s r%u%s%s; VRDE Module: %s; Crypto Module: %s)\n",
                         pExtPackData->Desc.strName.c_str(),
                         pExtPackData->Desc.strVersion.c_str(),
@@ -3621 +3776 @@
                         pExtPackData->Desc.strEdition.c_str(),
                         pExtPackData->Desc.strVrdeModule.c_str(),
+                        pExtPackData->Desc.strCryptoModule.c_str() ));
+            else
+                LogRel(("  %s (Version: %s r%u%s%s; VRDE Module: %s; Crypto Module: %s unusable because of '%s')\n",
+                        pExtPackData->Desc.strName.c_str(),
+                        pExtPackData->Desc.strVersion.c_str(),
+                        pExtPackData->Desc.uRevision,
+                        pExtPackData->Desc.strEdition.isEmpty() ? "" : " ",
+                        pExtPackData->Desc.strEdition.c_str(),
+                        pExtPackData->Desc.strVrdeModule.c_str(),
+                        pExtPackData->Desc.strCryptoModule.c_str(),
                         pExtPackData->strWhyUnusable.c_str() ));
         }

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

@@ -90 +90 @@
     a_pExtPackDesc->strMainVMModule.setNull();
     a_pExtPackDesc->strVrdeModule.setNull();
+    a_pExtPackDesc->strCryptoModule.setNull();
     a_pExtPackDesc->cPlugIns = 0;
     a_pExtPackDesc->paPlugIns = NULL;
@@ -210 +211 @@
 
     /*
+     * The cryptographic module, optional.
+     * Accept both none and empty as tokens of no cryptographic module.
+     */
+    const char *pszCryptoModule = NULL;
+    const xml::ElementNode *pCryptoModuleElm = pVBoxExtPackElm->findChildElement("CryptoModule");
+    if (pCryptoModuleElm)
+    {
+        pszCryptoModule = pCryptoModuleElm->getValueN(RT_XML_CONTENT_SMALL);
+        if (!pszCryptoModule || *pszCryptoModule == '\0')
+            pszCryptoModule = NULL;
+        else if (!VBoxExtPackIsValidModuleString(pszCryptoModule))
+            return &(new RTCString(ExtPackUtil::tr("Invalid cryptographic module string: ")))->append(pszCryptoModule);
+    }
+
+    /*
      * Whether to show the license, optional. (presense is enough here)
      */
@@ -238 +254 @@
     a_pExtPackDesc->strMainVMModule = pszMainVMModule;
     a_pExtPackDesc->strVrdeModule   = pszVrdeModule;
+    a_pExtPackDesc->strCryptoModule = pszCryptoModule;
     a_pExtPackDesc->cPlugIns        = cPlugIns;
     a_pExtPackDesc->paPlugIns       = paPlugIns;
@@ -411 +428 @@
     a_pExtPackDesc->strMainVMModule.setNull();
     a_pExtPackDesc->strVrdeModule.setNull();
+    a_pExtPackDesc->strCryptoModule.setNull();
     a_pExtPackDesc->cPlugIns = 0;
     RTMemFree(a_pExtPackDesc->paPlugIns);

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

@@ -103 +103 @@
     i_setVRDEAuthLibrary(Utf8Str::Empty);
     i_setDefaultVRDEExtPack(Utf8Str::Empty);
+    i_setDefaultCryptoExtPack(Utf8Str::Empty);
 
     m->uLogHistoryCount = 3;
@@ -1157 +1158 @@
 
 
+HRESULT SystemProperties::getDefaultCryptoExtPack(com::Utf8Str &aExtPack)
+{
+    HRESULT hrc = S_OK;
+    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+    Utf8Str strExtPack(m->strDefaultCryptoExtPack);
+    if (strExtPack.isNotEmpty())
+    {
+        if (strExtPack.equals(VBOXPUELCRYPTO_KLUDGE_EXTPACK_NAME))
+            hrc = S_OK;
+        else
+#ifdef VBOX_WITH_EXTPACK
+            hrc = mParent->i_getExtPackManager()->i_checkCryptoExtPack(&strExtPack);
+#else
+            hrc = setError(E_FAIL, tr("The extension pack '%s' does not exist"), strExtPack.c_str());
+#endif
+    }
+    else
+    {
+#ifdef VBOX_WITH_EXTPACK
+        hrc = mParent->i_getExtPackManager()->i_getDefaultCryptoExtPack(&strExtPack);
+#endif
+        if (strExtPack.isEmpty())
+        {
+            /*
+            * Klugde - check if VBoxPuelCrypto.dll/.so/.dylib is installed.
+            * This is hardcoded uglyness, sorry.
+            */
+            char szPath[RTPATH_MAX];
+            int vrc = RTPathAppPrivateArch(szPath, sizeof(szPath));
+            if (RT_SUCCESS(vrc))
+                vrc = RTPathAppend(szPath, sizeof(szPath), "VBoxPuelCrypto");
+            if (RT_SUCCESS(vrc))
+                vrc = RTStrCat(szPath, sizeof(szPath), RTLdrGetSuff());
+            if (RT_SUCCESS(vrc) && RTFileExists(szPath))
+            {
+                /* Illegal extpack name, so no conflict. */
+                strExtPack = VBOXPUELCRYPTO_KLUDGE_EXTPACK_NAME;
+            }
+        }
+    }
+
+    if (SUCCEEDED(hrc))
+          aExtPack = strExtPack;
+
+    return S_OK;
+}
+
+
+HRESULT SystemProperties::setDefaultCryptoExtPack(const com::Utf8Str &aExtPack)
+{
+    HRESULT hrc = S_OK;
+    if (aExtPack.isNotEmpty())
+    {
+        if (aExtPack.equals(VBOXPUELCRYPTO_KLUDGE_EXTPACK_NAME))
+            hrc = S_OK;
+        else
+#ifdef VBOX_WITH_EXTPACK
+            hrc = mParent->i_getExtPackManager()->i_checkCryptoExtPack(&aExtPack);
+#else
+            hrc = setError(E_FAIL, tr("The extension pack '%s' does not exist"), aExtPack.c_str());
+#endif
+    }
+    if (SUCCEEDED(hrc))
+    {
+        AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
+        hrc = i_setDefaultCryptoExtPack(aExtPack);
+        if (SUCCEEDED(hrc))
+        {
+            /* VirtualBox::i_saveSettings() needs the VirtualBox write lock. */
+            alock.release();
+            AutoWriteLock vboxLock(mParent COMMA_LOCKVAL_SRC_POS);
+            hrc = mParent->i_saveSettings();
+        }
+    }
+
+    return hrc;
+}
+
+
 HRESULT SystemProperties::getLogHistoryCount(ULONG *count)
 {
@@ -1853 +1933 @@
     if (FAILED(rc)) return rc;
 
+    rc = i_setDefaultCryptoExtPack(data.strDefaultCryptoExtPack);
+    if (FAILED(rc)) return rc;
+
     m->uLogHistoryCount  = data.uLogHistoryCount;
     m->fExclusiveHwVirt  = data.fExclusiveHwVirt;
@@ -2118 +2201 @@
 {
     m->strDefaultVRDEExtPack = aExtPack;
+
+    return S_OK;
+}
+
+HRESULT SystemProperties::i_setDefaultCryptoExtPack(const com::Utf8Str &aExtPack)
+{
+    m->strDefaultCryptoExtPack = aExtPack;
 
     return S_OK;

trunk/src/VBox/Main/xml/Settings.cpp

@@ -2332 +2332 @@
                         pelmGlobalChild->getAttributeValue("webServiceAuthLibrary", systemProperties.strWebServiceAuthLibrary);
                         pelmGlobalChild->getAttributeValue("defaultVRDEExtPack", systemProperties.strDefaultVRDEExtPack);
+                        pelmGlobalChild->getAttributeValue("defaultCryptoExtPack", systemProperties.strDefaultCryptoExtPack);
                         pelmGlobalChild->getAttributeValue("LogHistoryCount", systemProperties.uLogHistoryCount);
                         pelmGlobalChild->getAttributeValue("autostartDatabasePath", systemProperties.strAutostartDatabasePath);
@@ -2628 +2629 @@
     if (systemProperties.strDefaultVRDEExtPack.length())
         pelmSysProps->setAttribute("defaultVRDEExtPack", systemProperties.strDefaultVRDEExtPack);
+    if (systemProperties.strDefaultCryptoExtPack.length())
+        pelmSysProps->setAttribute("defaultCryptoExtPack", systemProperties.strDefaultCryptoExtPack);
     pelmSysProps->setAttribute("LogHistoryCount", systemProperties.uLogHistoryCount);
     if (systemProperties.strAutostartDatabasePath.length())