Changeset 104541 in vbox for trunk/src/VBox/Main/src-server/VRDEServerImpl.cpp

Timestamp:

May 8, 2024 8:32:59 AM (7 months ago)

Author:

vboxsync

Message:

Revert r163069-r163071 for debugging

File:

• trunk/src/VBox/Main/src-server/VRDEServerImpl.cpp (modified) (3 diffs)

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

@@ -38 +38 @@
 #include <iprt/ldr.h>
 #include <iprt/path.h>
-#include <iprt/crypto/x509.h>
 
 #include <VBox/err.h>
@@ -234 +233 @@
 }
 
-/**
- * Auto-generates a self-signed certificate for the VM.
- *
- * @note Locks this object for writing.
-*/
-HRESULT VRDEServer::i_generateServerCertificate()
-{
-    Utf8Str strServerCertificate = "server_cert.pem";
-    Utf8Str strServerPrivateKey = "server_key_private.pem";
-    mParent->i_calculateFullPath(strServerCertificate, strServerCertificate);
-    mParent->i_calculateFullPath(strServerPrivateKey, strServerPrivateKey);
-    const char *pszServerCertificate = strServerCertificate.c_str();
-    const char *pszServerPrivateKey = strServerPrivateKey.c_str();
-
-    HRESULT hrc = RTCrX509Certificate_Generate(pszServerCertificate, pszServerPrivateKey);
-
-    if (SUCCEEDED(hrc))
-    {
-        AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
-        mData.backup();
-
-        mData->mapProperties["Security/Method"] = Utf8Str("TLS");
-        mData->mapProperties["Security/ServerCertificate"] = strServerCertificate;
-        mData->mapProperties["Security/ServerPrivateKey"] = strServerPrivateKey;
-
-        /* Done with the properties access. */
-        alock.release();
-    }
-    return hrc;
-}
-
 // IVRDEServer properties
 /////////////////////////////////////////////////////////////////////////////
@@ -294 +262 @@
         /* leave the lock before informing callbacks */
         alock.release();
-
-        /*
-        * If TLS is not explicitely disabled then auto-generate
-        * a self-signed certificate for this VM.
-        */
-        if (mData->mapProperties["Security/Method"] != "RDP")
-        {
-            hrc = i_generateServerCertificate();
-            if (FAILED(hrc))
-            {
-                LogRel(("Failed to auto generate server key and certificate: (%Rrc)\n", hrc));
-            }
-        }
 
         AutoWriteLock mlock(mParent COMMA_LOCKVAL_SRC_POS);       // mParent is const, needs no locking