diff options
| author | Mathias Berchtold <mberchtold@gmail.com> | 2023-04-21 18:04:49 -0600 |
|---|---|---|
| committer | Tomas Mraz <tomas@openssl.org> | 2023-04-24 11:49:39 +0200 |
| commit | d748a1c6ac264ba74815e34c8d7a2ca478eb8b04 (patch) | |
| tree | 52e6fd125ed3907aa1b0e450dbc7e2dea5e331a3 /Configurations | |
| parent | 31295ca02c0a2d7209a33047c7f6dd1dabc12c93 (diff) | |
Revert "Adding Control Flow guard to Windows Builds"
Reasons:
- The patch was missing the linker flag /guard:cf
As a result no binary with CFG was ever built
- /guard:cf is incompatible with NASM
If the linker flag is added, the resulting binary fails with this exception:
Unhandled exception at 0x00007FFFB8B93C90 (ntdll.dll) in openssl.exe: Indirect call guard check detected invalid control transfer.
Reviewed-by: Hugo Landau <hlandau@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/20807)
Diffstat (limited to 'Configurations')
| -rw-r--r-- | Configurations/10-main.conf | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf index accd4502f5..c42902cf39 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("/guard:cf /Zi /Fdossl_static.pdb"), + lib_cflags => add("/Zi /Fdossl_static.pdb"), lib_defines => add("L_ENDIAN"), - dso_cflags => "/guard:cf /Zi /Fddso.pdb", - bin_cflags => "/guard:cf /Zi /Fdapp.pdb", + dso_cflags => "/Zi /Fddso.pdb", + bin_cflags => "/Zi /Fdapp.pdb", # def_flag made to empty string so a .def file gets generated shared_defflag => '', shared_ldflag => "/dll", |