Changeset 104541 in vbox

Timestamp:

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

Author:

vboxsync

Message:

Revert r163069-r163071 for debugging

Location:

trunk

Files:

• include/iprt/crypto/x509.h (modified) (2 diffs)
• include/iprt/mangling.h (modified) (2 diffs)
• src/VBox/Main/include/VRDEServerImpl.h (modified) (1 diff)
• src/VBox/Main/src-server/VRDEServerImpl.cpp (modified) (3 diffs)
• src/VBox/Runtime/Makefile.kmk (modified) (4 diffs)
• src/VBox/Runtime/common/crypto/x509-create-sign.cpp (deleted)

trunk/include/iprt/crypto/x509.h

@@ -1212 +1212 @@
 RTDECL(PCRTCRX509CERTIFICATE) RTCrX509CertPathsGetPathNodeCert(RTCRX509CERTPATHS hCertPaths, uint32_t iPath, uint32_t iNode);
 
-/**
- * Generates and signs a certificate.
- */
-RTDECL(int) RTCrX509Certificate_Generate(const char *pszServerCertificate, const char *pszServerPrivateKey);
 
 RT_C_DECLS_END
@@ -1224 +1220 @@
 
 #endif /* !IPRT_INCLUDED_crypto_x509_h */
+

trunk/include/iprt/mangling.h

@@ -4091 +4091 @@
 # define RTCrX509Certificate_VerifySignature            RT_MANGLER(RTCrX509Certificate_VerifySignature)
 # define RTCrX509Certificate_VerifySignatureSelfSigned  RT_MANGLER(RTCrX509Certificate_VerifySignatureSelfSigned)
-# define RTCrX509Certificate_Generate                   RT_MANGLER(RTCrX509Certificate_Generate)
 # define RTCrTafCertPathControls_DecodeAsn1             RT_MANGLER(RTCrTafCertPathControls_DecodeAsn1)
 # define RTCrTafTrustAnchorChoice_DecodeAsn1            RT_MANGLER(RTCrTafTrustAnchorChoice_DecodeAsn1)
@@ -4391 +4390 @@
 
 #endif /* !IPRT_INCLUDED_mangling_h */
+

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

@@ -60 +60 @@
     HRESULT i_loadSettings(const settings::VRDESettings &data);
     HRESULT i_saveSettings(settings::VRDESettings &data);
-    HRESULT i_generateServerCertificate();
     void i_rollback();
     void i_commit();

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

trunk/src/VBox/Runtime/Makefile.kmk

@@ -478 +478 @@
         common/crypto/x509-certpaths.cpp \
         common/crypto/x509-core.cpp \
-        common/crypto/x509-create-sign.cpp \
         common/crypto/x509-file.cpp \
         common/crypto/x509-init.cpp \
@@ -2358 +2357 @@
         common/crypto/x509-certpaths.cpp \
         common/crypto/x509-core.cpp \
-        common/crypto/x509-create-sign.cpp \
         common/crypto/x509-file.cpp \
         common/crypto/x509-init.cpp \
@@ -3764 +3762 @@
         common/crypto/x509-certpaths.cpp \
         common/crypto/x509-core.cpp \
-        common/crypto/x509-create-sign.cpp \
         common/crypto/x509-init.cpp \
         common/crypto/x509-sanity.cpp \
@@ -3918 +3915 @@
         common/crypto/x509-certpaths.cpp \
         common/crypto/x509-core.cpp \
-        common/crypto/x509-create-sign.cpp \
         common/crypto/x509-init.cpp \
         common/crypto/x509-sanity.cpp \