Changeset 41911 in vbox

Timestamp:

Jun 25, 2012 2:42:30 PM (13 years ago)

Author:

vboxsync

Message:

backed out r78763 and r78763

Location:

trunk

Files:

trunk/include/iprt/mangling.h

r41909	r41911
1021	1021	# define RTRandAdvCreateSystemFaster RT_MANGLER(RTRandAdvCreateSystemFaster)
1022	1022	# define RTRandAdvCreateSystemTruer RT_MANGLER(RTRandAdvCreateSystemTruer)
1023		~~# define RTRandAdvCreateOpenssl RT_MANGLER(RTRandAdvCreateOpenssl)~~
1024	1023	# define RTRandAdvDestroy RT_MANGLER(RTRandAdvDestroy)
1025	1024	# define RTRandAdvRestoreState RT_MANGLER(RTRandAdvRestoreState)

-              r41909
+              r41911
 /**
- * Create an instance of the openssl random number generator.
+ *
- * @returns IPRT status code.
- * @retval  VERR_NOT_SUPPORTED on platforms which doesn't have this feature.
+ *
- * @param   phRand      Where to store the handle to the generator.
+ *
- */
-RTDECL(int) RTRandAdvCreateOpenssl(PRTRAND phRand) RT_NO_THROW;
-/**
  * Create an instance of the truer random number generator for the OS.
+ *

-              r41909
+              r41911
         common/rand/randadv.cpp \
         common/rand/randparkmiller.cpp \
-        common/rand/randopenssl.cpp \
         common/sort/RTSortIsSorted.cpp \
         common/sort/RTSortApvIsSorted.cpp \
 …
 RuntimeBldProg_BLD_TRG_ARCH     := $(KBUILD_HOST_ARCH)
 RuntimeBldProg_BLD_TRG_CPU      := $(KBUILD_HOST_CPU)
-RuntimeBldProg_SOURCES          := $(filter-out \
-        common/rand/randopenssl.cpp \
-        , $(RuntimeR3_SOURCES))
-RuntimeBldProg_SOURCES          += \
-        generic/RTRandAdvCreateOpenssl-generic.cpp
 …
         common/checksum/RTSha1Digest.cpp \
         common/checksum/sha% \
-        common/rand/randopenssl.cpp \
         generic/RTLogWriteUser-generic.cpp \
         , $(RuntimeR3_SOURCES))
 RuntimeGuestR3_SOURCES              += \
         common/time/timesysalias.cpp \
+        VBox/logbackdoor.cpp \
+        generic/RTRandAdvCreateOpenssl-generic.cpp
+        VBox/logbackdoor.cpp
 RuntimeGuestR3_SOURCES.$(KBUILD_TARGET)      := $(RuntimeR3_SOURCES.$(KBUILD_TARGET))
 RuntimeGuestR3_SOURCES.$(KBUILD_HOST)        := $(RuntimeR3_SOURCES.$(KBUILD_HOST))

-              r41909
+              r41911
+{
     RTRAND hRand;
+    int rc = RTRandAdvCreateOpenssl(&hRand);
+    if (RT_FAILURE(rc))
+        rc = RTRandAdvCreateSystemFaster(&hRand);
+    int rc = RTRandAdvCreateSystemFaster(&hRand);
     if (RT_FAILURE(rc))
         rc = RTRandAdvCreateParkMiller(&hRand);

r41909	r41911
77	77	vbox-img_TEMPLATE = VBOXR3STATIC
78	78	vbox-img_DEFS += IN_VBOXDDU IN_VBOXDDU_STATIC VBOX_HDD_NO_DYNAMIC_BACKENDS IN_RT_R3
79		~~vbox-img_SDKS = VBOX_OPENSSL~~
80	79	vbox-img_SOURCES = \
81	80	vbox-img.cpp \

Note: See TracChangeset for help on using the changeset viewer.