Changeset 51856 in vbox for trunk/src/VBox/Runtime/Makefile.kmk

Timestamp:

Jul 3, 2014 6:39:21 PM (10 years ago)

Author:

vboxsync

Message:

Added the odd sha-2 algorithms to RTCrDigest and extended the testcases to cover them. Added VBOX_WITH_ALT_HASH_CODE for avoiding the OpenSSL code even for VBoxRT.dll/so/dylib.

File:

• trunk/src/VBox/Runtime/Makefile.kmk (modified) (4 diffs)

trunk/src/VBox/Runtime/Makefile.kmk

@@ -317 +317 @@
         common/checksum/RTSha256Digest.cpp \
         common/checksum/sha1str.cpp \
+        common/checksum/sha224str.cpp \
         common/checksum/sha256str.cpp \
+        common/checksum/sha384str.cpp \
         common/checksum/sha512str.cpp \
+        common/checksum/sha512t224str.cpp \
+        common/checksum/sha512t256str.cpp \
         common/checksum/x509.cpp \
         common/crypto/digest-core.cpp \
@@ -1411 +1415 @@
 VBoxRT_INST                    = $(INST_DLL) $(INST_TESTCASE)
 endif
-VBoxRT_DEFS                   := $(filter-out RT_NO_GIP,$(RuntimeR3_DEFS)) IN_SUP_R3 IN_SUP_R3 IPRT_WITH_XAR
+VBoxRT_DEFS                   := $(filter-out RT_NO_GIP, $(RuntimeR3_DEFS)) \
+        IN_SUP_R3 IN_SUP_R3 IPRT_WITH_XAR \
+        $(if-expr !defined(VBOX_WITH_ALT_HASH_CODE),IPRT_WITHOUT_SHA512T224 IPRT_WITHOUT_SHA512T256,)
 ifn1of ($(KBUILD_TARGET_ARCH), amd64 x86)
  VBoxRT_DEFS                  += RT_NO_GIP
@@ -1422 +1428 @@
         VBox/VBoxRTDeps.cpp \
         $(filter-out common/checksum/crc32.cpp, \
-                $(patsubst common/checksum/alt-%,common/checksum/openssl-%,$(RuntimeR3_SOURCES))) \
+        $(if-expr defined(VBOX_WITH_ALT_HASH_CODE), $(RuntimeR3_SOURCES), \
+                $(patsubst common/checksum/alt-%,common/checksum/openssl-%,$(RuntimeR3_SOURCES)) ) ) \
         common/checksum/crc32-zlib.cpp \
         common/misc/aiomgr.cpp
@@ -2040 +2047 @@
         common/checksum/md5str.cpp \
         common/checksum/sha1str.cpp \
+        common/checksum/sha224str.cpp \
         common/checksum/sha256str.cpp \
+        common/checksum/sha384str.cpp \
         common/checksum/sha512str.cpp \
+        common/checksum/sha512t224str.cpp \
+        common/checksum/sha512t256str.cpp \
         common/err/errinfo.cpp \
         common/path/RTPathChangeToUnixSlashes.cpp \