Skip to content

Commit 82fb9ce

Browse files
authored
Only compile with optimizations for release builds and fix typos (microsoft#122)
* Update version * Only optimize release builds * Fix typos in readme * Add compilation flags to resolve pipeline build warnings * Use specific build flags * Add O2 to SslPlay for fortify source * Remove SslPlay options
1 parent eaa0dc5 commit 82fb9ce

File tree

5 files changed

+12
-6
lines changed

5 files changed

+12
-6
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
cmake_minimum_required(VERSION 3.13.0)
22

33
project(SymCrypt-OpenSSL
4-
VERSION 1.10.0-dev
4+
VERSION 1.10.0
55
DESCRIPTION "The SymCrypt engine and provider for OpenSSL (SCOSSL)"
66
HOMEPAGE_URL "https://github.com/microsoft/SymCrypt-OpenSSL")
77

SymCryptProvider/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ The SymCrypt provider can be configured in the SymCrypt provider section of the
129129
### Debug Logging
130130
| Key | Description | Default |
131131
| - | - | - |
132-
| logging_file | Location to write debug logging events to. | NULL |
132+
| logging_file | Location to write debug logging events to. | NULL |
133133
| logging_level | Maximum level to log to logging file. In order, can be <ul><li>off</li><li>error</li><li>info</li><li>debug</li></ul> | off |
134134
| error_level | Maximum level to push logging events to OpenSSL error stack. In order, can be <ul><li>off</li><li>error</li><li>info</li><li>debug</li></ul> | error |
135135

@@ -143,4 +143,4 @@ separate section. This section must be referenced in the symcrypt provider secti
143143
| - | - | - |
144144
| enabled | 0 or 1 to disable or enable keysinuse logging. | 0 |
145145
| max_file_size | Maximum size of the file events are written to. May be written as raw byte size or suffixed with KB/MB/GB | 5KB |
146-
| logging_delay_seconds | Duration in seconds between events being written to the file. Any events that happen in between will be aggregate and logged as one event. | error |
146+
| logging_delay_seconds | Duration in seconds between events being written to the file. Any events that happen in between will be aggregate and logged as one event. | 3600 |

cmake-toolchain/LinuxUserMode-AMD64.cmake

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@ set(CMAKE_SYSTEM_PROCESSOR AMD64)
77

88
# Define _AMD64_ to set up the correct SymCrypt macros, e.g. SYMCRYPT_CPU_AMD64
99
add_compile_options(-D_AMD64_)
10-
add_compile_options(-O3)
10+
if (CMAKE_BUILD_TYPE MATCHES Release|RelWithDebInfo)
11+
add_compile_options(-O3)
12+
endif()
1113

1214
# Enable a baseline of features for the compiler to support everywhere
1315
# Other than for SSSE3 we do not expect the compiler to generate these instructions anywhere other than with intrinsics

cmake-toolchain/LinuxUserMode-ARM.cmake

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,6 @@ if(NOT CMAKE_HOST_SYSTEM_PROCESSOR MATCHES armv8l|ARM$|ARM32|aarch32 AND NOT SCO
2525
endif()
2626

2727
add_compile_options(-D_ARM_)
28-
add_compile_options(-O3)
28+
if (CMAKE_BUILD_TYPE MATCHES Release|RelWithDebInfo)
29+
add_compile_options(-O3)
30+
endif()

cmake-toolchain/LinuxUserMode-ARM64.cmake

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,6 @@ endif()
3232

3333
# Define _ARM64_ to set up the correct SymCrypt macros, e.g. SYMCRYPT_CPU_ARM64
3434
add_compile_options(-D_ARM64_)
35-
add_compile_options(-O3)
35+
if (CMAKE_BUILD_TYPE MATCHES Release|RelWithDebInfo)
36+
add_compile_options(-O3)
37+
endif()

0 commit comments

Comments
 (0)