Changeset 94157 in vbox for trunk/src/VBox/Runtime

Timestamp:

Mar 10, 2022 3:11:22 PM (3 years ago)

Author:

vboxsync

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

150411

Message:

Runtime: Windows build fixes and updated .def file in preparation for openssl-3.0.1 switch, bugref:10128

Location:

trunk/src/VBox/Runtime

Files:

• Makefile.kmk (modified) (1 diff)
• common/crypto/pkcs7-verify.cpp (modified) (1 diff)
• common/crypto/store.cpp (modified) (1 diff)
• r3/win/VBoxRT-openssl-3.0.def (copied) (copied from trunk/src/VBox/Runtime/r3/win/VBoxRT-openssl-1.1plus.def ) (8 diffs)
• r3/win/VBoxRT-openssl-pre-1.1.def (deleted)

trunk/src/VBox/Runtime/Makefile.kmk

@@ -2413 +2413 @@
 $$(VBoxRT_0_OUTDIR)/VBoxRT.def: \
                 $(PATH_SUB_CURRENT)/r3/win/VBoxRT-$$(if-expr $$(KBUILD_TARGET_ARCH) == amd64,win64,win32).def \
-                $(if-expr defined(VBOX_WITH_OPENSSL_PRE_1_1)\
-                ,$(PATH_SUB_CURRENT)/r3/win/VBoxRT-openssl-pre-1.1.def \
+                $(if-expr defined(VBOX_WITH_OPENSSL3)\
+                ,$(PATH_SUB_CURRENT)/r3/win/VBoxRT-openssl-3.0.def \
                 ,$(PATH_SUB_CURRENT)/r3/win/VBoxRT-openssl-1.1plus.def )\
                 $(if-expr "$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)" == "win.x86" && defined(VBOX_WITH_MORE_NT4_COMPAT_BINARIES)\

trunk/src/VBox/Runtime/common/crypto/pkcs7-verify.cpp

@@ -118 +118 @@
             else
                 rcOssl = RTErrInfoSet(pErrInfo, rcOssl, "RTCrStoreConvertToOpenSslCertStack failed");
+#include "internal/openssl-pre.h" /* Need to disable C5039 warning here. */
             if (pAddCerts)
                 sk_X509_pop_free(pAddCerts, X509_free);
+#include "internal/openssl-post.h"
         }
         else

trunk/src/VBox/Runtime/common/crypto/store.cpp

@@ -513 +513 @@
             }
         }
+#include "internal/openssl-pre.h"  /* Need to disable C5039 warning here. */
         sk_X509_pop_free(pOsslStack, X509_free);
+#include "internal/openssl-post.h"
     }
     else

trunk/src/VBox/Runtime/r3/win/VBoxRT-openssl-3.0.def

@@ -26 +26 @@
 ; terms and conditions of either the GPL or the CDDL or both.
 ;
-
-    ; ConsoleImpl.cpp uses this when VBOX_OPENSSL_FIPS is enabled.
-    FIPS_mode
 
     ; VBoxVRDP.dll - secure.cpp
@@ -98 +95 @@
     EVP_EncryptInit
     EVP_EncryptUpdate
-    EVP_MD_size
+    EVP_MD_get_size
     EVP_sha1
     EVP_sha256
@@ -119 +116 @@
 
     ; vboxwebsrv needs SSL support.
-    ASN1_STRING_data
     ASN1_STRING_get0_data
     ASN1_STRING_to_UTF8
@@ -148 +144 @@
     PEM_read_bio_DHparams
     RAND_load_file
-    RAND_pseudo_bytes
     RAND_seed
     RAND_status
@@ -174 +169 @@
     ;exported above: SSL_free
     SSL_get_error
-    SSL_get_peer_certificate
+    SSL_get1_peer_certificate
     SSL_get_verify_result
     SSL_get1_session
@@ -353 +348 @@
     EVP_DigestSignFinal
     EVP_DigestSignInit
+    EVP_DigestSignUpdate
     EVP_DigestUpdate
     EVP_DigestVerifyFinal
     EVP_DigestVerifyInit
+    EVP_DigestVerifyUpdate
     EVP_EncryptInit_ex
     EVP_MD_CTX_free
@@ -361 +358 @@
     EVP_MD_CTX_reset
     EVP_md5
-    EVP_PKEY_base_id
+    EVP_PKEY_get_base_id
     EVP_PKEY_free
     EVP_PKEY_get1_DSA
@@ -370 +367 @@
     EVP_PKEY_set1_EC_KEY
     EVP_PKEY_set1_RSA
-    EVP_PKEY_size
+    EVP_PKEY_get_size
     EVP_sha384
     HMAC_CTX_free