FIX: failing Base and Core builds

resolves: Oldes/Rebol-issues#2478
Oldes · Jan 11, 2022 · 3464126 · 3464126
1 parent 245a10b
commit 3464126
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 26 deletions.
diff --git a/src/core/u-mbedtls.c b/src/core/u-mbedtls.c
@@ -32,14 +32,14 @@
 
 #include "sys-core.h"
 #ifdef INCLUDE_MBEDTLS
-#ifdef MBEDTLS_MD4_C
+#ifdef INCLUDE_MD4
 #include "mbedtls/md4.h"
 #endif
 #include "mbedtls/md5.h"
 #include "mbedtls/sha1.h"
 #include "mbedtls/sha256.h"
 #include "mbedtls/sha512.h"
-#ifdef MBEDTLS_RIPEMD160_C
+#ifdef INCLUDE_RIPEMD160
 #include "mbedtls/ripemd160.h"
 #endif
 

diff --git a/src/include/mbedtls/build_info.h b/src/include/mbedtls/build_info.h
@@ -53,10 +53,10 @@
 #define _CRT_SECURE_NO_DEPRECATE 1
 #endif
 
-#if !defined(MBEDTLS_CONFIG_FILE)
-#include "mbedtls/config.h"
+#if !defined(REBOL_OPTIONS_FILE)
+#include "opt-config.h"
 #else
-#include MBEDTLS_CONFIG_FILE
+#include REBOL_OPTIONS_FILE
 #endif
 
 #if defined(MBEDTLS_CONFIG_VERSION) && ( \

diff --git a/src/include/mbedtls/check_config.h b/src/include/mbedtls/check_config.h
@@ -23,11 +23,6 @@
 #ifndef MBEDTLS_CHECK_CONFIG_H
 #define MBEDTLS_CHECK_CONFIG_H
 
-/* MD4 was removed from mbedtls, because it is considered to be unsecure,
- * but I'm keeping the old source file for use in Rebol
- */
-#define MBEDTLS_MD4_C
-
 /*
  * We assume CHAR_BIT is 8 in many places. In practice, this is true on our
  * target platforms, so not an issue, but let's just be extra sure.

diff --git a/src/include/opt-dependencies.h b/src/include/opt-dependencies.h
@@ -35,34 +35,38 @@
 //** dependency fixes! ****************************************//
 
 #if defined(INCLUDE_MBEDTLS)
-	#if !defined(MBEDTLS_CONFIG_FILE)
-	#include "mbedtls/config.h"
-	#else
-	#include MBEDTLS_CONFIG_FILE
-	#endif
+	//#include "mbedtls/config.h"
+
+	#define MBEDTLS_HAVE_ASM
+	#define MBEDTLS_HAVE_SSE2
+	#define MBEDTLS_HAVE_TIME
+	#define MBEDTLS_HAVE_TIME_DATE
+	#define MBEDTLS_PLATFORM_C
+
+	//#define MBEDTLS_PLATFORM_MEMORY
+	//#define MBEDTLS_MEMORY_BUFFER_ALLOC_C
+
+	#define MBEDTLS_MD5_C
+	#define MBEDTLS_SHA1_C
+	#define MBEDTLS_SHA224_C
+	#define MBEDTLS_SHA256_C
+	#define MBEDTLS_SHA512_C
 
 	#if defined(INCLUDE_MD4)
 	#define MBEDTLS_MD4_C
-	#else
-	#undef MBEDTLS_MD4_C
 	#endif
 
 	#if defined(INCLUDE_RIPEMD160)
 	#define MBEDTLS_RIPEMD160_C
-	#else
-	#undef MBEDTLS_RIPEMD160_C
 	#endif
 
-	#if defined(INCLUDE_SHA224)
-	#define MBEDTLS_SHA224_C
-	#else
-	#undef MBEDTLS_SHA224_C
-	#endif
+	// INCLUDE_SHA224 is now required for SHA256, which is always included!
+	//#if defined(INCLUDE_SHA224)
+	//#define MBEDTLS_SHA224_C
+	//#endif
 
 	#if defined(INCLUDE_SHA384)
 	#define MBEDTLS_SHA384_C
-	#else
-	#undef MBEDTLS_SHA384_C
 	#endif
 #else
 	// no mbedTLS