From: Mathias Berchtold Date: Sat, 22 Apr 2023 00:04:49 +0000 (-0600) Subject: Revert "Adding Control Flow guard to Windows Builds" X-Git-Tag: openssl-3.2.0-alpha1~979 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d748a1c6ac264ba74815e34c8d7a2ca478eb8b04;p=thirdparty%2Fopenssl.git 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 Reviewed-by: Tomas Mraz (Merged from https://github.com/openssl/openssl/pull/20807) --- diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf index accd4502f5d..c42902cf39f 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",