summaryrefslogtreecommitdiffstats
path: root/Configurations
diff options
context:
space:
mode:
authorgakamath <Ganesh.Kamath@amd.com>2023-04-14 21:46:24 +0530
committerTomas Mraz <tomas@openssl.org>2023-04-19 15:28:02 +0200
commit1adc45b1ded7072d1566addeab227efa81b6c947 (patch)
tree4daf18c2d566cde2cf2945180c47c8943ba3d3e6 /Configurations
parent04e0abc8bb1c24534d16cc930b611ac1d03bc9bf (diff)
Adding Control Flow guard to Windows Builds
Control flow guard is a code security implementation: https://learn.microsoft.com/en-us/windows/win32/secbp/control-flow-guard We identified it with BlackDuck security scan utility CLA: trivial Reviewed-by: Tom Cosgrove <tom.cosgrove@arm.com> Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/20739)
Diffstat (limited to 'Configurations')
-rw-r--r--Configurations/10-main.conf6
1 files changed, 3 insertions, 3 deletions
diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
index c42902cf39..accd4502f5 100644
--- a/Configurations/10-main.conf
+++ b/Configurations/10-main.conf
@@ -1475,10 +1475,10 @@ my %targets = (
"UNICODE", "_UNICODE",
"_CRT_SECURE_NO_DEPRECATE",
"_WINSOCK_DEPRECATED_NO_WARNINGS"),
- lib_cflags => add("/Zi /Fdossl_static.pdb"),
+ lib_cflags => add("/guard:cf /Zi /Fdossl_static.pdb"),
lib_defines => add("L_ENDIAN"),
- dso_cflags => "/Zi /Fddso.pdb",
- bin_cflags => "/Zi /Fdapp.pdb",
+ dso_cflags => "/guard:cf /Zi /Fddso.pdb",
+ bin_cflags => "/guard:cf /Zi /Fdapp.pdb",
# def_flag made to empty string so a .def file gets generated
shared_defflag => '',
shared_ldflag => "/dll",