Changeset 63983 in vbox for trunk

Timestamp:

Sep 23, 2016 6:34:30 PM (8 years ago)

Author:

vboxsync

Message:

IPRT: Created a minimal openssl linker definition file for 1.0.1 too.

Location:

trunk/src/VBox/Runtime

Files:

• Makefile.kmk (modified) (2 diffs)
• r3/win/VBoxRT-openssl-ose.def (deleted)
• r3/win/VBoxRT-openssl-pre-1.1.def (copied) (copied from trunk/src/VBox/Runtime/r3/win/VBoxRT-openssl-1.1plus.def ) (9 diffs)
• r3/win/VBoxRT-openssl.def (deleted)

trunk/src/VBox/Runtime/Makefile.kmk

@@ -1593 +1593 @@
 
 if1of ($(DLLS), VBoxRT)
+VBoxRT_CLEAN += $(VBoxRT_0_OUTDIR)/VBoxRT.def
 $$(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_1_1_0)\
                 ,$(PATH_SUB_CURRENT)/r3/win/VBoxRT-openssl-1.1plus.def \
-                ,$(PATH_SUB_CURRENT)/r3/win/$(if $(VBOX_OSE),VBoxRT-openssl-ose.def,VBoxRT-openssl.def) )\
+                ,$(PATH_SUB_CURRENT)/r3/win/VBoxRT-openssl-pre-1.1.def )\
                 $(if-expr "$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)" == "win.x86" && defined(VBOX_WITH_MORE_NT4_COMPAT_BINARIES)\
                 ,$(PATH_SUB_CURRENT)/r3/win/VBoxRT-msvcr100-win32.def ,) #$(PATH_SUB_CURRENT)/r3/win/VBoxRT-msvcp100-win32.def
@@ -1727 +1728 @@
 VBoxRT-x86_SOURCES.win = $(filter-out %.def %.rc,$(VBoxRT_SOURCES.win)) \
         $(VBoxRT-x86_0_OUTDIR)/VBoxRT-x86.def
+VBoxRT-x86_CLEAN += $(VBoxRT-x86_0_OUTDIR)/VBoxRT-x86.def
 if1of ($(DLLS), VBoxRT-x86)
 $$(VBoxRT-x86_0_OUTDIR)/VBoxRT-x86.def: \

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

@@ -1 +1 @@
 ; $Id$
 ;; @file
-; IPRT - Windows OpenSSL exports we use outside VBoxRT (keep them few!).
+; IPRT - Windows OpenSSL v1.0.x exports we use outside VBoxRT (keep them few!).
 ;
 ; This file is appended to the architecture specific .def file.
@@ -42 +42 @@
     BN_num_bits
     BN_set_word
-    EVP_PKEY_get0_RSA
+    ;1.1.0: EVP_PKEY_get0_RSA
     i2d_X509
     MD5_Final
@@ -55 +55 @@
     RSA_free
     RSA_generate_key_ex
-    RSA_get0_key
+    ;1.1.0: RSA_get0_key
     RSA_new
     SHA1_Final
@@ -61 +61 @@
     SHA1_Update
     X509_free
-    X509_get_X509_PUBKEY
+    ;1.1.0: X509_get_X509_PUBKEY
     X509_PUBKEY_get0_param
+
+    ; VBoxVRDP.dll - secure.cpp - 1.0.1 additions:
+    BN_init
 
     ; VBoxVRDP.dll - tcp_vrdp.cpp
     BIO_new_socket
     BIO_test_flags
-    OPENSSL_init_ssl
+    ;1.1.0: OPENSSL_init_ssl
     SSL_accept
     SSL_CTX_free
@@ -137 +140 @@
     GENERAL_NAME_free
     i2v_GENERAL_NAMES
-    OPENSSL_init_crypto
+    ;1.1.0: OPENSSL_init_crypto
     ;exported above: OPENSSL_init_ssl
-    OPENSSL_sk_num
-    OPENSSL_sk_pop_free
-    OPENSSL_sk_value
+    ;1.1.0: OPENSSL_sk_num
+    ;1.1.0: OPENSSL_sk_pop_free
+    ;1.1.0: OPENSSL_sk_value
     PEM_read_bio_DHparams
     RAND_load_file
@@ -162 +165 @@
     SSL_CTX_set_default_passwd_cb_userdata
     SSL_CTX_set_default_verify_paths
-    SSL_CTX_set_options
+    ;1.1.0: SSL_CTX_set_options
     SSL_CTX_set_session_id_context
     ;exported above: SSL_CTX_set_verify
@@ -173 +176 @@
     SSL_get_verify_result
     SSL_get1_session
-    SSL_is_init_finished
+    ;1.1.0: SSL_is_init_finished
     SSL_load_client_CA_file
     ;exported above: SSL_new
@@ -184 +187 @@
     SSL_want
     ;exported above: SSL_write
-    TLS_method
+    ;1.1.0: TLS_method
     ;exported above: X509_free
     X509_get_ext_d2i
@@ -207 +210 @@
     X509V3_conf_free
 
+    ; vboxwebsrv - 1.0.1 additions
+    CRYPTO_set_dynlock_destroy_callback
+    CRYPTO_set_dynlock_lock_callback
+    CRYPTO_set_dynlock_create_callback
+    CRYPTO_set_locking_callback
+    CRYPTO_set_id_callback
+    CRYPTO_num_locks
+    ERR_remove_state
+    OPENSSL_add_all_algorithms_noconf
+    sk_value
+    sk_num
+    sk_pop_free
+    SSL_load_error_strings
+    SSL_library_init
+    SSL_state
+    SSLv23_method
+
     ; tstRTBigNum.cpp
     BN_div