Cast the u32bit output array to an int* when calling the VC++ intrinsic,

since it passes signed ints for whatever reason.

Ensure CALL_CPUID is always defined (previously, it would not be if on an x86
but compiled with something other than GCC, ICC, VC++).

1 files changed, 6 insertions, 3 deletions

diff --git a/src/utils/cpuid.cpp b/src/utils/cpuid.cpp
index 63edd2737..b92afbde3 100644
--- a/src/utils/cpuid.cpp
+++ b/src/utils/cpuid.cpp
@@ -15,7 +15,7 @@
 #if defined(BOTAN_BUILD_COMPILER_IS_MSVC)
 
   #include <intrin.h>
-  #define CALL_CPUID(type, out) do { __cpuid(out, type) } while(0)
+  #define CALL_CPUID(type, out) do { __cpuid((int*)out, type) } while(0)
 
 #elif defined(BOTAN_BUILD_COMPILER_IS_ICC)
 
@@ -30,9 +30,12 @@
 
 #endif
 
-#else
+#endif
+
+#ifndef CALL_CPUID
   // In all other cases, just zeroize the supposed cpuid output
-  #define CALL_CPUID(type, out) out[0] = out[1] = out[2] = out[3] = 0;
+  #define CALL_CPUID(type, out) \
+    do { out[0] = out[1] = out[2] = out[3] = 0; } while(0);
 #endif
 
 namespace Botan {