propagate from branch 'net.randombit.botan' (head 367d157c1221a162f5b4098492944a509ef6d019)

            to branch 'net.randombit.botan.c++0x' (head 1b9e8c4e92663f30b7d57b0fd8f57eb13cfce155)

6 files changed, 23 insertions, 5 deletions

diff --git a/src/build-data/buildh.in b/src/build-data/buildh.in
index 9d7012a73..7588dc99b 100644
--- a/src/build-data/buildh.in
+++ b/src/build-data/buildh.in
@@ -30,8 +30,7 @@
 #define BOTAN_PARALLEL_BLOCKS_ECB 8
 #define BOTAN_PARALLEL_BLOCKS_CBC 8
 #define BOTAN_PARALLEL_BLOCKS_CFB 8
-#define BOTAN_PARALLEL_BLOCKS_CTR 8
-#define BOTAN_PARALLEL_BLOCKS_EAX 8
+#define BOTAN_PARALLEL_BLOCKS_CTR 16
 #define BOTAN_PARALLEL_BLOCKS_XTS 8
 
 /* PK key consistency checking toggles */
@@ -53,8 +52,19 @@
 
 %{target_cpu_defines}
 
+#if defined(BOTAN_TARGET_CPU_IS_LITTLE_ENDIAN) || \
+    defined(BOTAN_TARGET_CPU_IS_BIG_ENDIAN)
+  #define BOTAN_TARGET_CPU_HAS_KNOWN_ENDIANNESS
+#endif
+
 %{target_compiler_defines}
 
+#if defined(BOTAN_BUILD_COMPILER_IS_MSVC)
+  // 4250: inherits via dominance (diamond inheritence issue)
+  // 4251: needs DLL interface (STL DLL exports)
+  #pragma warning(disable: 4250 4251)
+#endif
+
 /* Module definitions */
 %{module_defines}
 
diff --git a/src/build-data/cc/msvc.txt b/src/build-data/cc/msvc.txt
index 892e80c4b..36437e6a2 100644
--- a/src/build-data/cc/msvc.txt
+++ b/src/build-data/cc/msvc.txt
@@ -12,7 +12,7 @@ no_debug_flags "/O2"
 debug_flags "/Od /Zi /DDEBUG"
 check_opt_flags "/O2 /D_CONSOLE"
 lang_flags "/EHsc /GR"
-warning_flags ""
+warning_flags "/W3"
 
 shared_flags "/DBOTAN_DLL=__declspec(dllexport)"
 dll_import_flags "__declspec(dllimport)"
diff --git a/src/build-data/innosetup.in b/src/build-data/innosetup.in
index 228ab4e97..c3e0f1ebd 100644
--- a/src/build-data/innosetup.in
+++ b/src/build-data/innosetup.in
@@ -9,7 +9,7 @@ AppPublisherURL=http://botan.randombit.net/
 AppVersion=%{version}
 
 VersionInfoCopyright=Copyright (C) 1999-2009 Jack Lloyd and others
-VersionInfoVersion=%{version}.0
+VersionInfoVersion=%{version_major}.%{version_minor}.%{version_patch}.0
 
 ; Require at least Windows 98 or 2000
 MinVersion=4.1,5.0
diff --git a/src/build-data/os/linux.txt b/src/build-data/os/linux.txt
index b3c227533..2f59fb9d1 100644
--- a/src/build-data/os/linux.txt
+++ b/src/build-data/os/linux.txt
@@ -4,6 +4,7 @@ os_type unix
 clock_gettime
 gettimeofday
 posix_mlock
+gmtime_r
 </target_features>
 
 # Is this correct?
diff --git a/src/build-data/os/mingw.txt b/src/build-data/os/mingw.txt
index 2b7a16cf7..1b30e0b3a 100644
--- a/src/build-data/os/mingw.txt
+++ b/src/build-data/os/mingw.txt
@@ -19,3 +19,8 @@ install_cmd_exec "install -m 755"
 msys
 mingw32
 </aliases>
+
+<target_features>
+win32_virtual_lock
+win32_get_systemtime
+</target_features>
diff --git a/src/build-data/os/windows.txt b/src/build-data/os/windows.txt
index 59e3ec072..23838eb6d 100644
--- a/src/build-data/os/windows.txt
+++ b/src/build-data/os/windows.txt
@@ -11,8 +11,10 @@ install_cmd_data "copy"
 install_cmd_exec "copy"
 
 <target_features>
-win32_virtual_lock
+gmtime_s
+win32_get_systemtime
 win32_query_perf_counter
+win32_virtual_lock
 </target_features>
 
 <supports_shared>