Merged PR 8050244: Fix Pluton OS Build

Handful of CMake and header changes to support building SymCrypt in the Pluton OS build environment. See individual commit messages for additional details.

Author: reynoldsbd

CMakeLists.txt

@@ -45,6 +45,18 @@ if(SYMCRYPT_FIPS_BUILD)
     add_compile_options(-DSYMCRYPT_DO_FIPS_SELFTESTS=1)
 endif()
 
+option(
+    SYMCRYPT_STACK_PROTECTION
+    "When enabled, SymCrypt will enable various stack protection mechanisms to protect against buffer overruns and the like. Only
+    applicable to non-Windows systems. Defaults to ON, but may need to be disabled for specialized targets such as embedded systems."
+    ON)
+
+option(
+    SYMCRYPT_PIC
+    "When enabled, SymCrypt will be compiled as position-independent code (PIC). Only applicable to non-Windows systems. Defaults to
+    ON, but may need to be disabled for specialized targets such as embedded systems."
+    ON)
+
 include(${CMAKE_SOURCE_DIR}/cmake-configs/SymCrypt-Platforms.cmake)
 
 if(NOT DEFINED CMAKE_BUILD_TYPE)

cmake-configs/SymCrypt-Platforms.cmake

@@ -14,7 +14,7 @@ endif()
 if(NOT DEFINED SYMCRYPT_TARGET_ARCH)
     if(CMAKE_SYSTEM_PROCESSOR MATCHES "AMD64|x86_64")
         set(SYMCRYPT_TARGET_ARCH "AMD64")
-    elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "[Xx]86")
+    elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "[Xx]86|i[3456]86")
         set(SYMCRYPT_TARGET_ARCH "X86")
     elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "ARM64|aarch64")
         set(SYMCRYPT_TARGET_ARCH "ARM64")
@@ -55,7 +55,9 @@ if(CMAKE_SYSTEM_NAME MATCHES "Linux")
     add_compile_options(-Wno-deprecated-declarations -Wno-deprecated)
     add_compile_options(-g)
     add_compile_options(-Wno-multichar)
-    add_compile_options(-fPIC)
+    if(SYMCRYPT_PIC)
+        add_compile_options(-fPIC)
+    endif()
     add_compile_options(-fno-plt)
     add_compile_options(-fno-builtin-bcmp)
 

inc/symcrypt_internal.h

@@ -223,13 +223,13 @@ typedef int                 BOOL;
 typedef unsigned int        UINT;
 typedef unsigned long       ULONG;
 
-typedef signed char         INT8, *PINT8;
-typedef signed short        INT16, *PINT16;
-typedef signed int          INT32, *PINT32;
+typedef int8_t              INT8, *PINT8;
+typedef int16_t             INT16, *PINT16;
+typedef int32_t             INT32, *PINT32;
 typedef int64_t             INT64, *PINT64;
-typedef unsigned char       UINT8, *PUINT8;
-typedef unsigned short      UINT16, *PUINT16;
-typedef unsigned int        UINT32, *PUINT32;
+typedef uint8_t             UINT8, *PUINT8;
+typedef uint16_t            UINT16, *PUINT16;
+typedef uint32_t            UINT32, *PUINT32;
 typedef uint64_t            UINT64, *PUINT64;
 
 typedef uint32_t            ULONG32, *PULONG32;
@@ -526,10 +526,9 @@ SymCryptCpuFeaturesNeverPresent();
         #define SYMCRYPT_BSWAP32( x ) _byteswap_ulong(x)
         #define SYMCRYPT_BSWAP64( x ) _byteswap_uint64(x)
     #elif SYMCRYPT_GNUC
-        #include <byteswap.h>
-        #define SYMCRYPT_BSWAP16( x ) bswap_16(x)
-        #define SYMCRYPT_BSWAP32( x ) bswap_32(x)
-        #define SYMCRYPT_BSWAP64( x ) bswap_64(x)
+        #define SYMCRYPT_BSWAP16( x ) __builtin_bswap16(x)
+        #define SYMCRYPT_BSWAP32( x ) __builtin_bswap32(x)
+        #define SYMCRYPT_BSWAP64( x ) __builtin_bswap64(x)
     #elif SYMCRYPT_APPLE_CC
         #include <libkern/OSByteOrder.h>
         #define SYMCRYPT_BSWAP16( x ) OSSwapInt16(x)

lib/CMakeLists.txt

@@ -352,13 +352,15 @@ endif()
 if(NOT WIN32)
     add_compile_options(-Wno-trigraphs)
 
-    # Mitigate stack buffer overruns, and stack clash attacks
-    add_compile_options(-fstack-protector-strong)
-    add_compile_options(-Wstack-protector)
-    add_compile_options(--param ssp-buffer-size=4)
+    if (SYMCRYPT_STACK_PROTECTION)
+        # Mitigate stack buffer overruns, and stack clash attacks
+        add_compile_options(-fstack-protector-strong)
+        add_compile_options(-Wstack-protector)
+        add_compile_options(--param ssp-buffer-size=4)
 
-    if(CMAKE_C_COMPILER_ID MATCHES "GNU")
-        add_compile_options(-fstack-clash-protection)
+        if(CMAKE_C_COMPILER_ID MATCHES "GNU")
+            add_compile_options(-fstack-clash-protection)
+        endif()
     endif()
 
     if(SYMCRYPT_TARGET_ARCH MATCHES "AMD64|X86")