From b1781931894bf2057464e634beed68b1e3218c9e Mon Sep 17 00:00:00 2001 From: Cole Robinson Date: Sun, 6 Nov 2016 15:04:24 -0500 Subject: [PATCH] Update to git master 20161105git3b25ca8 --- .gitignore | 2 + ...EFI_D_VERBOSE-0x00400000-in-NvmExpre.patch | 12 +- ...EFI_D_VERBOSE-0x00400000-in-the-DXE-.patch | 18 +- 0003-OvmfPkg-enable-DEBUG_VERBOSE.patch | 12 +- 0006-EXCLUDE_SHELL_FROM_FD.patch | 24 +- ...faultKeys-application-for-enrolling-.patch | 31 +-- ...rminalDxe-add-other-text-resolutions.patch | 2 +- ...tools_def-to-support-cross-compiling.patch | 252 ++++++++++++------ ...k-up-any-display-device-not-only-vga.patch | 21 -- ...patch => EDKII_openssl-1.0.2j-no-srp.patch | 237 ++++++---------- edk2.spec | 28 +- sources | 4 +- 12 files changed, 309 insertions(+), 334 deletions(-) rename 0010-prepare-tools_def-for-x86-cross.patch => 0009-Tweak-the-tools_def-to-support-cross-compiling.patch (64%) delete mode 100644 0009-pick-up-any-display-device-not-only-vga.patch rename EDKII_openssl-1.0.2g-no-srp.patch => EDKII_openssl-1.0.2j-no-srp.patch (91%) diff --git a/.gitignore b/.gitignore index bbb00e5..f508e4b 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,5 @@ /edk2-20160418-a8c39ba.tar.gz /openssl-1.0.2g.tar.gz /openssl-1.0.2g-hobbled.tar.gz +/openssl-1.0.2j-hobbled.tar.xz +/edk2-20161105-3b25ca8.tar.gz diff --git a/0001-OvmfPkg-silence-EFI_D_VERBOSE-0x00400000-in-NvmExpre.patch b/0001-OvmfPkg-silence-EFI_D_VERBOSE-0x00400000-in-NvmExpre.patch index 441ae4c..de247bc 100644 --- a/0001-OvmfPkg-silence-EFI_D_VERBOSE-0x00400000-in-NvmExpre.patch +++ b/0001-OvmfPkg-silence-EFI_D_VERBOSE-0x00400000-in-NvmExpre.patch @@ -14,10 +14,10 @@ Signed-off-by: Laszlo Ersek 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc -index 0206dda..36d3aaa 100644 +index 3f4d42d..048a144 100644 --- a/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc -@@ -593,7 +593,10 @@ +@@ -635,7 +635,10 @@ OvmfPkg/SataControllerDxe/SataControllerDxe.inf MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf @@ -30,10 +30,10 @@ index 0206dda..36d3aaa 100644 MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc -index 06fe141..c05a90a 100644 +index 5688475..fac0cf0 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc -@@ -602,7 +602,10 @@ +@@ -644,7 +644,10 @@ OvmfPkg/SataControllerDxe/SataControllerDxe.inf MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf @@ -46,10 +46,10 @@ index 06fe141..c05a90a 100644 MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc -index e88e70d..eb3ad3f 100644 +index dcf64b9..bc62a64 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc -@@ -600,7 +600,10 @@ +@@ -642,7 +642,10 @@ OvmfPkg/SataControllerDxe/SataControllerDxe.inf MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf diff --git a/0002-OvmfPkg-silence-EFI_D_VERBOSE-0x00400000-in-the-DXE-.patch b/0002-OvmfPkg-silence-EFI_D_VERBOSE-0x00400000-in-the-DXE-.patch index aa3a9eb..9d5168f 100644 --- a/0002-OvmfPkg-silence-EFI_D_VERBOSE-0x00400000-in-the-DXE-.patch +++ b/0002-OvmfPkg-silence-EFI_D_VERBOSE-0x00400000-in-the-DXE-.patch @@ -15,10 +15,10 @@ Signed-off-by: Laszlo Ersek 3 files changed, 6 insertions(+) diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc -index 36d3aaa..bf64882 100644 +index 048a144..c0440d9 100644 --- a/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc -@@ -516,6 +516,8 @@ +@@ -543,6 +543,8 @@ NULL|IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf @@ -26,12 +26,12 @@ index 36d3aaa..bf64882 100644 + gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F } - IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/StatusCodeRuntimeDxe.inf + MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.inf diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc -index c05a90a..345c8ce 100644 +index fac0cf0..6f94bc7 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc -@@ -525,6 +525,8 @@ +@@ -552,6 +552,8 @@ NULL|IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf @@ -39,12 +39,12 @@ index c05a90a..345c8ce 100644 + gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F } - IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/StatusCodeRuntimeDxe.inf + MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.inf diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc -index eb3ad3f..0e02ba8 100644 +index bc62a64..a92bf19 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc -@@ -523,6 +523,8 @@ +@@ -550,6 +550,8 @@ NULL|IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf @@ -52,4 +52,4 @@ index eb3ad3f..0e02ba8 100644 + gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F } - IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/StatusCodeRuntimeDxe.inf + MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.inf diff --git a/0003-OvmfPkg-enable-DEBUG_VERBOSE.patch b/0003-OvmfPkg-enable-DEBUG_VERBOSE.patch index ecf487d..6da6d05 100644 --- a/0003-OvmfPkg-enable-DEBUG_VERBOSE.patch +++ b/0003-OvmfPkg-enable-DEBUG_VERBOSE.patch @@ -12,10 +12,10 @@ Signed-off-by: Laszlo Ersek 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc -index bf64882..aaaaaa8 100644 +index c0440d9..fa9661c 100644 --- a/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc -@@ -392,7 +392,7 @@ +@@ -408,7 +408,7 @@ # DEBUG_VERBOSE 0x00400000 // Detailed debug messages that may # // significantly impact boot performance # DEBUG_ERROR 0x80000000 // Error @@ -25,10 +25,10 @@ index bf64882..aaaaaa8 100644 !ifdef $(SOURCE_DEBUG_ENABLE) gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x17 diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc -index 345c8ce..b4545b3 100644 +index 6f94bc7..667584a 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc -@@ -397,7 +397,7 @@ +@@ -413,7 +413,7 @@ # DEBUG_VERBOSE 0x00400000 // Detailed debug messages that may # // significantly impact boot performance # DEBUG_ERROR 0x80000000 // Error @@ -38,10 +38,10 @@ index 345c8ce..b4545b3 100644 !ifdef $(SOURCE_DEBUG_ENABLE) gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x17 diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc -index 0e02ba8..1836c25 100644 +index a92bf19..5ae8469 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc -@@ -397,7 +397,7 @@ +@@ -413,7 +413,7 @@ # DEBUG_VERBOSE 0x00400000 // Detailed debug messages that may # // significantly impact boot performance # DEBUG_ERROR 0x80000000 // Error diff --git a/0006-EXCLUDE_SHELL_FROM_FD.patch b/0006-EXCLUDE_SHELL_FROM_FD.patch index 1e2f7d6..3a67839 100644 --- a/0006-EXCLUDE_SHELL_FROM_FD.patch +++ b/0006-EXCLUDE_SHELL_FROM_FD.patch @@ -9,10 +9,10 @@ Subject: [PATCH] EXCLUDE_SHELL_FROM_FD 3 files changed, 6 insertions(+) diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf -index 93a51a5..9ae7982 100644 +index 2a5b211..ebdab17 100644 --- a/OvmfPkg/OvmfPkgIa32.fdf +++ b/OvmfPkg/OvmfPkgIa32.fdf -@@ -273,11 +273,13 @@ INF MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf +@@ -281,11 +281,13 @@ INF MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf INF FatPkg/EnhancedFatDxe/Fat.inf @@ -24,13 +24,13 @@ index 93a51a5..9ae7982 100644 !endif +!endif - FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) { - SECTION RAW = MdeModulePkg/Logo/Logo.bmp + INF MdeModulePkg/Logo/LogoDxe.inf + diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf -index aad16a6..f58f18a 100644 +index 1c7df21..adf53f3 100644 --- a/OvmfPkg/OvmfPkgIa32X64.fdf +++ b/OvmfPkg/OvmfPkgIa32X64.fdf -@@ -273,11 +273,13 @@ INF MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf +@@ -281,11 +281,13 @@ INF MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf INF FatPkg/EnhancedFatDxe/Fat.inf @@ -42,13 +42,13 @@ index aad16a6..f58f18a 100644 !endif +!endif - FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) { - SECTION RAW = MdeModulePkg/Logo/Logo.bmp + INF MdeModulePkg/Logo/LogoDxe.inf + diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf -index 387b808..4e0c0ab 100644 +index 3bb11cb..edf1098 100644 --- a/OvmfPkg/OvmfPkgX64.fdf +++ b/OvmfPkg/OvmfPkgX64.fdf -@@ -273,11 +273,13 @@ INF MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf +@@ -281,11 +281,13 @@ INF MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf INF FatPkg/EnhancedFatDxe/Fat.inf @@ -60,5 +60,5 @@ index 387b808..4e0c0ab 100644 !endif +!endif - FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) { - SECTION RAW = MdeModulePkg/Logo/Logo.bmp + INF MdeModulePkg/Logo/LogoDxe.inf + diff --git a/0007-OvmfPkg-EnrollDefaultKeys-application-for-enrolling-.patch b/0007-OvmfPkg-EnrollDefaultKeys-application-for-enrolling-.patch index 6882c12..0b4907d 100644 --- a/0007-OvmfPkg-EnrollDefaultKeys-application-for-enrolling-.patch +++ b/0007-OvmfPkg-EnrollDefaultKeys-application-for-enrolling-.patch @@ -1,4 +1,3 @@ -From da502f7cc283055a65ab3caeaa62eb5c6a6fddb5 Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Mon, 6 Jul 2015 20:22:02 +0200 Subject: [PATCH] OvmfPkg: EnrollDefaultKeys: application for enrolling default @@ -44,21 +43,21 @@ DB: Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Laszlo Ersek --- - OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.c | 963 ++++++++++++++++++++++++ + OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.c | 960 ++++++++++++++++++++++++ OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.inf | 51 ++ OvmfPkg/OvmfPkgIa32.dsc | 4 + OvmfPkg/OvmfPkgIa32X64.dsc | 4 + OvmfPkg/OvmfPkgX64.dsc | 4 + - 5 files changed, 1026 insertions(+) + 5 files changed, 1023 insertions(+) create mode 100644 OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.c create mode 100644 OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.inf diff --git a/OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.c b/OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.c new file mode 100644 -index 0000000..447288f +index 0000000..081212b --- /dev/null +++ b/OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.c -@@ -0,0 +1,963 @@ +@@ -0,0 +1,960 @@ +/** @file + Enroll default PK, KEK, DB. + @@ -724,8 +723,6 @@ index 0000000..447288f + UINT8 *Data; + UINT8 *Position; + -+ Status = EFI_SUCCESS; -+ + // + // compute total size first, for UINT32 range check, and allocation + // @@ -803,11 +800,10 @@ index 0000000..447288f + + RepeatingHeader = (REPEATING_HEADER *)Position; + CopyGuid (&RepeatingHeader->SignatureType, &gEfiCertX509Guid); -+ RepeatingHeader->SignatureListSize = -+ (UINT32)(sizeof *RepeatingHeader + CertSize); ++ RepeatingHeader->SignatureListSize = sizeof *RepeatingHeader + CertSize; + RepeatingHeader->SignatureHeaderSize = 0; + RepeatingHeader->SignatureSize = -+ (UINT32)(sizeof RepeatingHeader->SignatureOwner + CertSize); ++ sizeof RepeatingHeader->SignatureOwner + CertSize; + CopyGuid (&RepeatingHeader->SignatureOwner, OwnerGuid); + Position += sizeof *RepeatingHeader; + @@ -1080,10 +1076,10 @@ index 0000000..ac919bb + UefiLib + UefiRuntimeServicesTableLib diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc -index 8af3267..6fb5c9c 100644 +index fa9661c..e2e6ba3 100644 --- a/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc -@@ -749,6 +749,10 @@ +@@ -764,6 +764,10 @@ !if $(SECURE_BOOT_ENABLE) == TRUE SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf @@ -1095,10 +1091,10 @@ index 8af3267..6fb5c9c 100644 OvmfPkg/PlatformDxe/Platform.inf diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc -index 4bb38d0..e5abaff 100644 +index 667584a..a0ae1aa 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc -@@ -758,6 +758,10 @@ +@@ -773,6 +773,10 @@ !if $(SECURE_BOOT_ENABLE) == TRUE SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf @@ -1110,10 +1106,10 @@ index 4bb38d0..e5abaff 100644 OvmfPkg/PlatformDxe/Platform.inf diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc -index be3aa1f..4c36a7d 100644 +index 5ae8469..87cee52 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc -@@ -756,6 +756,10 @@ +@@ -771,6 +771,10 @@ !if $(SECURE_BOOT_ENABLE) == TRUE SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf @@ -1124,6 +1120,3 @@ index be3aa1f..4c36a7d 100644 !endif OvmfPkg/PlatformDxe/Platform.inf --- -1.8.3.1 - diff --git a/0008-MdeModulePkg-TerminalDxe-add-other-text-resolutions.patch b/0008-MdeModulePkg-TerminalDxe-add-other-text-resolutions.patch index aaf8ba6..304f514 100644 --- a/0008-MdeModulePkg-TerminalDxe-add-other-text-resolutions.patch +++ b/0008-MdeModulePkg-TerminalDxe-add-other-text-resolutions.patch @@ -60,7 +60,7 @@ Signed-off-by: Laszlo Ersek 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.c b/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.c -index 6fde3b2..787bd35 100644 +index 3f445f0..2537e27 100644 --- a/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.c +++ b/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.c @@ -103,7 +103,42 @@ TERMINAL_DEV mTerminalDevTemplate = { diff --git a/0010-prepare-tools_def-for-x86-cross.patch b/0009-Tweak-the-tools_def-to-support-cross-compiling.patch similarity index 64% rename from 0010-prepare-tools_def-for-x86-cross.patch rename to 0009-Tweak-the-tools_def-to-support-cross-compiling.patch index c867a26..a9b8dfb 100644 --- a/0010-prepare-tools_def-for-x86-cross.patch +++ b/0009-Tweak-the-tools_def-to-support-cross-compiling.patch @@ -1,6 +1,19 @@ ---- a/BaseTools/Conf/tools_def.template 2016-04-18 10:18:14.000000000 +0200 -+++ b/BaseTools/Conf/tools_def.template 2016-07-08 13:48:01.394134576 +0200 -@@ -179,24 +179,6 @@ +From 63b708ccad8afd0b887258888a53fd4945cff682 Mon Sep 17 00:00:00 2001 +Message-Id: <63b708ccad8afd0b887258888a53fd4945cff682.1478467625.git.crobinso@redhat.com> +From: Paolo Bonzini +Date: Sun, 6 Nov 2016 13:50:31 -0500 +Subject: [PATCH] Tweak the tools_def to support cross-compiling. + +These files are meant for customization, so this is not upstream. +--- + BaseTools/Conf/tools_def.template | 343 ++++++++++++++++++-------------------- + 1 file changed, 161 insertions(+), 182 deletions(-) + +diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template +index 39fda78..97f5557 100755 +--- a/BaseTools/Conf/tools_def.template ++++ b/BaseTools/Conf/tools_def.template +@@ -178,27 +178,6 @@ DEFINE CYGWIN_BINIA32 = c:/cygwin/opt/tiano/i386-tiano-pe/i386-tiano-pe DEFINE CYGWIN_BINX64 = c:/cygwin/opt/tiano/x86_64-pc-mingw64/x86_64-pc-mingw64/bin/ DEFINE CYGWIN_BINIPF = c:/cygwin/opt/tiano/gcc/ipf/bin/ia64-pc-elf- @@ -21,11 +34,14 @@ - -DEFINE GCC49_IA32_PREFIX = ENV(GCC49_BIN) -DEFINE GCC49_X64_PREFIX = ENV(GCC49_BIN) +- +-DEFINE GCC5_IA32_PREFIX = ENV(GCC5_BIN) +-DEFINE GCC5_X64_PREFIX = ENV(GCC5_BIN) - DEFINE UNIX_IASL_BIN = ENV(IASL_PREFIX)iasl - DEFINE WIN_ASL_BIN_DIR = C:\ASL - DEFINE WIN_IASL_BIN = DEF(WIN_ASL_BIN_DIR)\iasl.exe -@@ -4546,7 +4528,7 @@ + DEFINE WIN_IASL_BIN = ENV(IASL_PREFIX)iasl.exe + DEFINE WIN_ASL_BIN = ENV(IASL_PREFIX)asl.exe +@@ -4590,7 +4569,7 @@ DEFINE GCC5_AARCH64_ASLDLINK_FLAGS = DEF(GCC49_AARCH64_ASLDLINK_FLAGS) #################################################################################### *_GCC44_*_*_FAMILY = GCC @@ -34,15 +50,15 @@ *_GCC44_*_*_DLL = ENV(GCC44_DLL) *_GCC44_*_ASL_PATH = DEF(UNIX_IASL_BIN) -@@ -4561,17 +4543,17 @@ +@@ -4605,17 +4584,17 @@ DEFINE GCC5_AARCH64_ASLDLINK_FLAGS = DEF(GCC49_AARCH64_ASLDLINK_FLAGS) ################## # GCC44 IA32 definitions ################## -*_GCC44_IA32_OBJCOPY_PATH = DEF(GCC44_IA32_PREFIX)objcopy -*_GCC44_IA32_CC_PATH = DEF(GCC44_IA32_PREFIX)gcc -*_GCC44_IA32_SLINK_PATH = DEF(GCC44_IA32_PREFIX)ar --*_GCC44_IA32_DLINK_PATH = DEF(GCC44_IA32_PREFIX)ld --*_GCC44_IA32_ASLDLINK_PATH = DEF(GCC44_IA32_PREFIX)ld +-*_GCC44_IA32_DLINK_PATH = DEF(GCC44_IA32_PREFIX)gcc +-*_GCC44_IA32_ASLDLINK_PATH = DEF(GCC44_IA32_PREFIX)gcc -*_GCC44_IA32_ASM_PATH = DEF(GCC44_IA32_PREFIX)gcc -*_GCC44_IA32_PP_PATH = DEF(GCC44_IA32_PREFIX)gcc -*_GCC44_IA32_VFRPP_PATH = DEF(GCC44_IA32_PREFIX)gcc @@ -52,8 +68,8 @@ +*_GCC44_IA32_OBJCOPY_PATH = ENV(GCC44_IA32_PREFIX)objcopy +*_GCC44_IA32_CC_PATH = ENV(GCC44_IA32_PREFIX)gcc +*_GCC44_IA32_SLINK_PATH = ENV(GCC44_IA32_PREFIX)ar -+*_GCC44_IA32_DLINK_PATH = ENV(GCC44_IA32_PREFIX)ld -+*_GCC44_IA32_ASLDLINK_PATH = ENV(GCC44_IA32_PREFIX)ld ++*_GCC44_IA32_DLINK_PATH = ENV(GCC44_IA32_PREFIX)gcc ++*_GCC44_IA32_ASLDLINK_PATH = ENV(GCC44_IA32_PREFIX)gcc +*_GCC44_IA32_ASM_PATH = ENV(GCC44_IA32_PREFIX)gcc +*_GCC44_IA32_PP_PATH = ENV(GCC44_IA32_PREFIX)gcc +*_GCC44_IA32_VFRPP_PATH = ENV(GCC44_IA32_PREFIX)gcc @@ -62,16 +78,16 @@ +*_GCC44_IA32_RC_PATH = ENV(GCC44_IA32_PREFIX)objcopy *_GCC44_IA32_ASLCC_FLAGS = DEF(GCC_ASLCC_FLAGS) -m32 - *_GCC44_IA32_ASLDLINK_FLAGS = DEF(GCC44_IA32_X64_ASLDLINK_FLAGS) -m elf_i386 -@@ -4586,17 +4568,17 @@ + *_GCC44_IA32_ASLDLINK_FLAGS = DEF(GCC44_IA32_X64_ASLDLINK_FLAGS) -Wl,-m,elf_i386 +@@ -4633,17 +4612,17 @@ RELEASE_GCC44_IA32_CC_FLAGS = DEF(GCC44_IA32_CC_FLAGS) -Os ################## # GCC44 X64 definitions ################## -*_GCC44_X64_OBJCOPY_PATH = DEF(GCC44_X64_PREFIX)objcopy -*_GCC44_X64_CC_PATH = DEF(GCC44_X64_PREFIX)gcc -*_GCC44_X64_SLINK_PATH = DEF(GCC44_X64_PREFIX)ar --*_GCC44_X64_DLINK_PATH = DEF(GCC44_X64_PREFIX)ld --*_GCC44_X64_ASLDLINK_PATH = DEF(GCC44_X64_PREFIX)ld +-*_GCC44_X64_DLINK_PATH = DEF(GCC44_X64_PREFIX)gcc +-*_GCC44_X64_ASLDLINK_PATH = DEF(GCC44_X64_PREFIX)gcc -*_GCC44_X64_ASM_PATH = DEF(GCC44_X64_PREFIX)gcc -*_GCC44_X64_PP_PATH = DEF(GCC44_X64_PREFIX)gcc -*_GCC44_X64_VFRPP_PATH = DEF(GCC44_X64_PREFIX)gcc @@ -81,8 +97,8 @@ +*_GCC44_X64_OBJCOPY_PATH = ENV(GCC44_X64_PREFIX)objcopy +*_GCC44_X64_CC_PATH = ENV(GCC44_X64_PREFIX)gcc +*_GCC44_X64_SLINK_PATH = ENV(GCC44_X64_PREFIX)ar -+*_GCC44_X64_DLINK_PATH = ENV(GCC44_X64_PREFIX)ld -+*_GCC44_X64_ASLDLINK_PATH = ENV(GCC44_X64_PREFIX)ld ++*_GCC44_X64_DLINK_PATH = ENV(GCC44_X64_PREFIX)gcc ++*_GCC44_X64_ASLDLINK_PATH = ENV(GCC44_X64_PREFIX)gcc +*_GCC44_X64_ASM_PATH = ENV(GCC44_X64_PREFIX)gcc +*_GCC44_X64_PP_PATH = ENV(GCC44_X64_PREFIX)gcc +*_GCC44_X64_VFRPP_PATH = ENV(GCC44_X64_PREFIX)gcc @@ -91,8 +107,8 @@ +*_GCC44_X64_RC_PATH = ENV(GCC44_X64_PREFIX)objcopy *_GCC44_X64_ASLCC_FLAGS = DEF(GCC_ASLCC_FLAGS) -m64 - *_GCC44_X64_ASLDLINK_FLAGS = DEF(GCC44_IA32_X64_ASLDLINK_FLAGS) -m elf_x86_64 -@@ -4616,7 +4598,7 @@ + *_GCC44_X64_ASLDLINK_FLAGS = DEF(GCC44_IA32_X64_ASLDLINK_FLAGS) -Wl,-m,elf_x86_64 +@@ -4666,7 +4645,7 @@ RELEASE_GCC44_X64_CC_FLAGS = DEF(GCC44_X64_CC_FLAGS) -Os #################################################################################### *_GCC45_*_*_FAMILY = GCC @@ -101,15 +117,15 @@ *_GCC45_*_*_DLL = ENV(GCC45_DLL) *_GCC45_*_ASL_PATH = DEF(UNIX_IASL_BIN) -@@ -4631,17 +4613,17 @@ +@@ -4681,17 +4660,17 @@ RELEASE_GCC44_X64_CC_FLAGS = DEF(GCC44_X64_CC_FLAGS) -Os ################## # GCC45 IA32 definitions ################## -*_GCC45_IA32_OBJCOPY_PATH = DEF(GCC45_IA32_PREFIX)objcopy -*_GCC45_IA32_CC_PATH = DEF(GCC45_IA32_PREFIX)gcc -*_GCC45_IA32_SLINK_PATH = DEF(GCC45_IA32_PREFIX)ar --*_GCC45_IA32_DLINK_PATH = DEF(GCC45_IA32_PREFIX)ld --*_GCC45_IA32_ASLDLINK_PATH = DEF(GCC45_IA32_PREFIX)ld +-*_GCC45_IA32_DLINK_PATH = DEF(GCC45_IA32_PREFIX)gcc +-*_GCC45_IA32_ASLDLINK_PATH = DEF(GCC45_IA32_PREFIX)gcc -*_GCC45_IA32_ASM_PATH = DEF(GCC45_IA32_PREFIX)gcc -*_GCC45_IA32_PP_PATH = DEF(GCC45_IA32_PREFIX)gcc -*_GCC45_IA32_VFRPP_PATH = DEF(GCC45_IA32_PREFIX)gcc @@ -119,8 +135,8 @@ +*_GCC45_IA32_OBJCOPY_PATH = ENV(GCC45_IA32_PREFIX)objcopy +*_GCC45_IA32_CC_PATH = ENV(GCC45_IA32_PREFIX)gcc +*_GCC45_IA32_SLINK_PATH = ENV(GCC45_IA32_PREFIX)ar -+*_GCC45_IA32_DLINK_PATH = ENV(GCC45_IA32_PREFIX)ld -+*_GCC45_IA32_ASLDLINK_PATH = ENV(GCC45_IA32_PREFIX)ld ++*_GCC45_IA32_DLINK_PATH = ENV(GCC45_IA32_PREFIX)gcc ++*_GCC45_IA32_ASLDLINK_PATH = ENV(GCC45_IA32_PREFIX)gcc +*_GCC45_IA32_ASM_PATH = ENV(GCC45_IA32_PREFIX)gcc +*_GCC45_IA32_PP_PATH = ENV(GCC45_IA32_PREFIX)gcc +*_GCC45_IA32_VFRPP_PATH = ENV(GCC45_IA32_PREFIX)gcc @@ -129,16 +145,16 @@ +*_GCC45_IA32_RC_PATH = ENV(GCC45_IA32_PREFIX)objcopy *_GCC45_IA32_ASLCC_FLAGS = DEF(GCC_ASLCC_FLAGS) -m32 - *_GCC45_IA32_ASLDLINK_FLAGS = DEF(GCC45_IA32_X64_ASLDLINK_FLAGS) -m elf_i386 -@@ -4656,17 +4638,17 @@ + *_GCC45_IA32_ASLDLINK_FLAGS = DEF(GCC45_IA32_X64_ASLDLINK_FLAGS) -Wl,-m,elf_i386 +@@ -4709,17 +4688,17 @@ RELEASE_GCC45_IA32_CC_FLAGS = DEF(GCC45_IA32_CC_FLAGS) -Os ################## # GCC45 X64 definitions ################## -*_GCC45_X64_OBJCOPY_PATH = DEF(GCC45_X64_PREFIX)objcopy -*_GCC45_X64_CC_PATH = DEF(GCC45_X64_PREFIX)gcc -*_GCC45_X64_SLINK_PATH = DEF(GCC45_X64_PREFIX)ar --*_GCC45_X64_DLINK_PATH = DEF(GCC45_X64_PREFIX)ld --*_GCC45_X64_ASLDLINK_PATH = DEF(GCC45_X64_PREFIX)ld +-*_GCC45_X64_DLINK_PATH = DEF(GCC45_X64_PREFIX)gcc +-*_GCC45_X64_ASLDLINK_PATH = DEF(GCC45_X64_PREFIX)gcc -*_GCC45_X64_ASM_PATH = DEF(GCC45_X64_PREFIX)gcc -*_GCC45_X64_PP_PATH = DEF(GCC45_X64_PREFIX)gcc -*_GCC45_X64_VFRPP_PATH = DEF(GCC45_X64_PREFIX)gcc @@ -148,8 +164,8 @@ +*_GCC45_X64_OBJCOPY_PATH = ENV(GCC45_X64_PREFIX)objcopy +*_GCC45_X64_CC_PATH = ENV(GCC45_X64_PREFIX)gcc +*_GCC45_X64_SLINK_PATH = ENV(GCC45_X64_PREFIX)ar -+*_GCC45_X64_DLINK_PATH = ENV(GCC45_X64_PREFIX)ld -+*_GCC45_X64_ASLDLINK_PATH = ENV(GCC45_X64_PREFIX)ld ++*_GCC45_X64_DLINK_PATH = ENV(GCC45_X64_PREFIX)gcc ++*_GCC45_X64_ASLDLINK_PATH = ENV(GCC45_X64_PREFIX)gcc +*_GCC45_X64_ASM_PATH = ENV(GCC45_X64_PREFIX)gcc +*_GCC45_X64_PP_PATH = ENV(GCC45_X64_PREFIX)gcc +*_GCC45_X64_VFRPP_PATH = ENV(GCC45_X64_PREFIX)gcc @@ -158,8 +174,8 @@ +*_GCC45_X64_RC_PATH = ENV(GCC45_X64_PREFIX)objcopy *_GCC45_X64_ASLCC_FLAGS = DEF(GCC_ASLCC_FLAGS) -m64 - *_GCC45_X64_ASLDLINK_FLAGS = DEF(GCC45_IA32_X64_ASLDLINK_FLAGS) -m elf_x86_64 -@@ -4686,7 +4668,7 @@ + *_GCC45_X64_ASLDLINK_FLAGS = DEF(GCC45_IA32_X64_ASLDLINK_FLAGS) -Wl,-m,elf_x86_64 +@@ -4742,7 +4721,7 @@ RELEASE_GCC45_X64_CC_FLAGS = DEF(GCC45_X64_CC_FLAGS) -Os #################################################################################### *_GCC46_*_*_FAMILY = GCC @@ -168,15 +184,15 @@ *_GCC46_*_*_DLL = ENV(GCC46_DLL) *_GCC46_*_ASL_PATH = DEF(UNIX_IASL_BIN) -@@ -4701,17 +4683,17 @@ +@@ -4757,17 +4736,17 @@ RELEASE_GCC45_X64_CC_FLAGS = DEF(GCC45_X64_CC_FLAGS) -Os ################## # GCC46 IA32 definitions ################## -*_GCC46_IA32_OBJCOPY_PATH = DEF(GCC46_IA32_PREFIX)objcopy -*_GCC46_IA32_CC_PATH = DEF(GCC46_IA32_PREFIX)gcc -*_GCC46_IA32_SLINK_PATH = DEF(GCC46_IA32_PREFIX)ar --*_GCC46_IA32_DLINK_PATH = DEF(GCC46_IA32_PREFIX)ld --*_GCC46_IA32_ASLDLINK_PATH = DEF(GCC46_IA32_PREFIX)ld +-*_GCC46_IA32_DLINK_PATH = DEF(GCC46_IA32_PREFIX)gcc +-*_GCC46_IA32_ASLDLINK_PATH = DEF(GCC46_IA32_PREFIX)gcc -*_GCC46_IA32_ASM_PATH = DEF(GCC46_IA32_PREFIX)gcc -*_GCC46_IA32_PP_PATH = DEF(GCC46_IA32_PREFIX)gcc -*_GCC46_IA32_VFRPP_PATH = DEF(GCC46_IA32_PREFIX)gcc @@ -186,8 +202,8 @@ +*_GCC46_IA32_OBJCOPY_PATH = ENV(GCC46_IA32_PREFIX)objcopy +*_GCC46_IA32_CC_PATH = ENV(GCC46_IA32_PREFIX)gcc +*_GCC46_IA32_SLINK_PATH = ENV(GCC46_IA32_PREFIX)ar -+*_GCC46_IA32_DLINK_PATH = ENV(GCC46_IA32_PREFIX)ld -+*_GCC46_IA32_ASLDLINK_PATH = ENV(GCC46_IA32_PREFIX)ld ++*_GCC46_IA32_DLINK_PATH = ENV(GCC46_IA32_PREFIX)gcc ++*_GCC46_IA32_ASLDLINK_PATH = ENV(GCC46_IA32_PREFIX)gcc +*_GCC46_IA32_ASM_PATH = ENV(GCC46_IA32_PREFIX)gcc +*_GCC46_IA32_PP_PATH = ENV(GCC46_IA32_PREFIX)gcc +*_GCC46_IA32_VFRPP_PATH = ENV(GCC46_IA32_PREFIX)gcc @@ -196,16 +212,16 @@ +*_GCC46_IA32_RC_PATH = ENV(GCC46_IA32_PREFIX)objcopy *_GCC46_IA32_ASLCC_FLAGS = DEF(GCC_ASLCC_FLAGS) -m32 - *_GCC46_IA32_ASLDLINK_FLAGS = DEF(GCC46_IA32_X64_ASLDLINK_FLAGS) -m elf_i386 -@@ -4728,17 +4710,17 @@ + *_GCC46_IA32_ASLDLINK_FLAGS = DEF(GCC46_IA32_X64_ASLDLINK_FLAGS) -Wl,-m,elf_i386 +@@ -4785,17 +4764,17 @@ RELEASE_GCC46_IA32_CC_FLAGS = DEF(GCC46_IA32_CC_FLAGS) -Os -Wno-unused-but ################## # GCC46 X64 definitions ################## -*_GCC46_X64_OBJCOPY_PATH = DEF(GCC46_X64_PREFIX)objcopy -*_GCC46_X64_CC_PATH = DEF(GCC46_X64_PREFIX)gcc -*_GCC46_X64_SLINK_PATH = DEF(GCC46_X64_PREFIX)ar --*_GCC46_X64_DLINK_PATH = DEF(GCC46_X64_PREFIX)ld --*_GCC46_X64_ASLDLINK_PATH = DEF(GCC46_X64_PREFIX)ld +-*_GCC46_X64_DLINK_PATH = DEF(GCC46_X64_PREFIX)gcc +-*_GCC46_X64_ASLDLINK_PATH = DEF(GCC46_X64_PREFIX)gcc -*_GCC46_X64_ASM_PATH = DEF(GCC46_X64_PREFIX)gcc -*_GCC46_X64_PP_PATH = DEF(GCC46_X64_PREFIX)gcc -*_GCC46_X64_VFRPP_PATH = DEF(GCC46_X64_PREFIX)gcc @@ -215,8 +231,8 @@ +*_GCC46_X64_OBJCOPY_PATH = ENV(GCC46_X64_PREFIX)objcopy +*_GCC46_X64_CC_PATH = ENV(GCC46_X64_PREFIX)gcc +*_GCC46_X64_SLINK_PATH = ENV(GCC46_X64_PREFIX)ar -+*_GCC46_X64_DLINK_PATH = ENV(GCC46_X64_PREFIX)ld -+*_GCC46_X64_ASLDLINK_PATH = ENV(GCC46_X64_PREFIX)ld ++*_GCC46_X64_DLINK_PATH = ENV(GCC46_X64_PREFIX)gcc ++*_GCC46_X64_ASLDLINK_PATH = ENV(GCC46_X64_PREFIX)gcc +*_GCC46_X64_ASM_PATH = ENV(GCC46_X64_PREFIX)gcc +*_GCC46_X64_PP_PATH = ENV(GCC46_X64_PREFIX)gcc +*_GCC46_X64_VFRPP_PATH = ENV(GCC46_X64_PREFIX)gcc @@ -225,8 +241,8 @@ +*_GCC46_X64_RC_PATH = ENV(GCC46_X64_PREFIX)objcopy *_GCC46_X64_ASLCC_FLAGS = DEF(GCC_ASLCC_FLAGS) -m64 - *_GCC46_X64_ASLDLINK_FLAGS = DEF(GCC46_IA32_X64_ASLDLINK_FLAGS) -m elf_x86_64 -@@ -4791,7 +4773,7 @@ + *_GCC46_X64_ASLDLINK_FLAGS = DEF(GCC46_IA32_X64_ASLDLINK_FLAGS) -Wl,-m,elf_x86_64 +@@ -4851,7 +4830,7 @@ RELEASE_GCC46_ARM_CC_FLAGS = DEF(GCC46_ARM_CC_FLAGS) -Wno-unused-but-set-v #################################################################################### *_GCC47_*_*_FAMILY = GCC @@ -235,15 +251,15 @@ *_GCC47_*_*_DLL = ENV(GCC47_DLL) *_GCC47_*_ASL_PATH = DEF(UNIX_IASL_BIN) -@@ -4806,17 +4788,17 @@ +@@ -4866,17 +4845,17 @@ RELEASE_GCC46_ARM_CC_FLAGS = DEF(GCC46_ARM_CC_FLAGS) -Wno-unused-but-set-v ################## # GCC47 IA32 definitions ################## -*_GCC47_IA32_OBJCOPY_PATH = DEF(GCC47_IA32_PREFIX)objcopy -*_GCC47_IA32_CC_PATH = DEF(GCC47_IA32_PREFIX)gcc -*_GCC47_IA32_SLINK_PATH = DEF(GCC47_IA32_PREFIX)ar --*_GCC47_IA32_DLINK_PATH = DEF(GCC47_IA32_PREFIX)ld --*_GCC47_IA32_ASLDLINK_PATH = DEF(GCC47_IA32_PREFIX)ld +-*_GCC47_IA32_DLINK_PATH = DEF(GCC47_IA32_PREFIX)gcc +-*_GCC47_IA32_ASLDLINK_PATH = DEF(GCC47_IA32_PREFIX)gcc -*_GCC47_IA32_ASM_PATH = DEF(GCC47_IA32_PREFIX)gcc -*_GCC47_IA32_PP_PATH = DEF(GCC47_IA32_PREFIX)gcc -*_GCC47_IA32_VFRPP_PATH = DEF(GCC47_IA32_PREFIX)gcc @@ -253,8 +269,8 @@ +*_GCC47_IA32_OBJCOPY_PATH = ENV(GCC47_IA32_PREFIX)objcopy +*_GCC47_IA32_CC_PATH = ENV(GCC47_IA32_PREFIX)gcc +*_GCC47_IA32_SLINK_PATH = ENV(GCC47_IA32_PREFIX)ar -+*_GCC47_IA32_DLINK_PATH = ENV(GCC47_IA32_PREFIX)ld -+*_GCC47_IA32_ASLDLINK_PATH = ENV(GCC47_IA32_PREFIX)ld ++*_GCC47_IA32_DLINK_PATH = ENV(GCC47_IA32_PREFIX)gcc ++*_GCC47_IA32_ASLDLINK_PATH = ENV(GCC47_IA32_PREFIX)gcc +*_GCC47_IA32_ASM_PATH = ENV(GCC47_IA32_PREFIX)gcc +*_GCC47_IA32_PP_PATH = ENV(GCC47_IA32_PREFIX)gcc +*_GCC47_IA32_VFRPP_PATH = ENV(GCC47_IA32_PREFIX)gcc @@ -263,16 +279,16 @@ +*_GCC47_IA32_RC_PATH = ENV(GCC47_IA32_PREFIX)objcopy *_GCC47_IA32_ASLCC_FLAGS = DEF(GCC_ASLCC_FLAGS) -m32 - *_GCC47_IA32_ASLDLINK_FLAGS = DEF(GCC47_IA32_X64_ASLDLINK_FLAGS) -m elf_i386 -@@ -4833,17 +4815,17 @@ + *_GCC47_IA32_ASLDLINK_FLAGS = DEF(GCC47_IA32_X64_ASLDLINK_FLAGS) -Wl,-m,elf_i386 +@@ -4894,17 +4873,17 @@ RELEASE_GCC47_IA32_CC_FLAGS = DEF(GCC47_IA32_CC_FLAGS) -Os -Wno-unused-but ################## # GCC47 X64 definitions ################## -*_GCC47_X64_OBJCOPY_PATH = DEF(GCC47_X64_PREFIX)objcopy -*_GCC47_X64_CC_PATH = DEF(GCC47_X64_PREFIX)gcc -*_GCC47_X64_SLINK_PATH = DEF(GCC47_X64_PREFIX)ar --*_GCC47_X64_DLINK_PATH = DEF(GCC47_X64_PREFIX)ld --*_GCC47_X64_ASLDLINK_PATH = DEF(GCC47_X64_PREFIX)ld +-*_GCC47_X64_DLINK_PATH = DEF(GCC47_X64_PREFIX)gcc +-*_GCC47_X64_ASLDLINK_PATH = DEF(GCC47_X64_PREFIX)gcc -*_GCC47_X64_ASM_PATH = DEF(GCC47_X64_PREFIX)gcc -*_GCC47_X64_PP_PATH = DEF(GCC47_X64_PREFIX)gcc -*_GCC47_X64_VFRPP_PATH = DEF(GCC47_X64_PREFIX)gcc @@ -282,8 +298,8 @@ +*_GCC47_X64_OBJCOPY_PATH = ENV(GCC47_X64_PREFIX)objcopy +*_GCC47_X64_CC_PATH = ENV(GCC47_X64_PREFIX)gcc +*_GCC47_X64_SLINK_PATH = ENV(GCC47_X64_PREFIX)ar -+*_GCC47_X64_DLINK_PATH = ENV(GCC47_X64_PREFIX)ld -+*_GCC47_X64_ASLDLINK_PATH = ENV(GCC47_X64_PREFIX)ld ++*_GCC47_X64_DLINK_PATH = ENV(GCC47_X64_PREFIX)gcc ++*_GCC47_X64_ASLDLINK_PATH = ENV(GCC47_X64_PREFIX)gcc +*_GCC47_X64_ASM_PATH = ENV(GCC47_X64_PREFIX)gcc +*_GCC47_X64_PP_PATH = ENV(GCC47_X64_PREFIX)gcc +*_GCC47_X64_VFRPP_PATH = ENV(GCC47_X64_PREFIX)gcc @@ -292,8 +308,8 @@ +*_GCC47_X64_RC_PATH = ENV(GCC47_X64_PREFIX)objcopy *_GCC47_X64_ASLCC_FLAGS = DEF(GCC_ASLCC_FLAGS) -m64 - *_GCC47_X64_ASLDLINK_FLAGS = DEF(GCC47_IA32_X64_ASLDLINK_FLAGS) -m elf_x86_64 -@@ -4923,7 +4905,7 @@ + *_GCC47_X64_ASLDLINK_FLAGS = DEF(GCC47_IA32_X64_ASLDLINK_FLAGS) -Wl,-m,elf_x86_64 +@@ -4988,7 +4967,7 @@ RELEASE_GCC47_AARCH64_CC_FLAGS = DEF(GCC47_AARCH64_CC_FLAGS) -Wno-unused-but-s #################################################################################### *_GCC48_*_*_FAMILY = GCC @@ -302,15 +318,15 @@ *_GCC48_*_*_DLL = ENV(GCC48_DLL) *_GCC48_*_ASL_PATH = DEF(UNIX_IASL_BIN) -@@ -4938,17 +4920,17 @@ +@@ -5003,17 +4982,17 @@ RELEASE_GCC47_AARCH64_CC_FLAGS = DEF(GCC47_AARCH64_CC_FLAGS) -Wno-unused-but-s ################## # GCC48 IA32 definitions ################## -*_GCC48_IA32_OBJCOPY_PATH = DEF(GCC48_IA32_PREFIX)objcopy -*_GCC48_IA32_CC_PATH = DEF(GCC48_IA32_PREFIX)gcc -*_GCC48_IA32_SLINK_PATH = DEF(GCC48_IA32_PREFIX)ar --*_GCC48_IA32_DLINK_PATH = DEF(GCC48_IA32_PREFIX)ld --*_GCC48_IA32_ASLDLINK_PATH = DEF(GCC48_IA32_PREFIX)ld +-*_GCC48_IA32_DLINK_PATH = DEF(GCC48_IA32_PREFIX)gcc +-*_GCC48_IA32_ASLDLINK_PATH = DEF(GCC48_IA32_PREFIX)gcc -*_GCC48_IA32_ASM_PATH = DEF(GCC48_IA32_PREFIX)gcc -*_GCC48_IA32_PP_PATH = DEF(GCC48_IA32_PREFIX)gcc -*_GCC48_IA32_VFRPP_PATH = DEF(GCC48_IA32_PREFIX)gcc @@ -320,8 +336,8 @@ +*_GCC48_IA32_OBJCOPY_PATH = ENV(GCC48_IA32_PREFIX)objcopy +*_GCC48_IA32_CC_PATH = ENV(GCC48_IA32_PREFIX)gcc +*_GCC48_IA32_SLINK_PATH = ENV(GCC48_IA32_PREFIX)ar -+*_GCC48_IA32_DLINK_PATH = ENV(GCC48_IA32_PREFIX)ld -+*_GCC48_IA32_ASLDLINK_PATH = ENV(GCC48_IA32_PREFIX)ld ++*_GCC48_IA32_DLINK_PATH = ENV(GCC48_IA32_PREFIX)gcc ++*_GCC48_IA32_ASLDLINK_PATH = ENV(GCC48_IA32_PREFIX)gcc +*_GCC48_IA32_ASM_PATH = ENV(GCC48_IA32_PREFIX)gcc +*_GCC48_IA32_PP_PATH = ENV(GCC48_IA32_PREFIX)gcc +*_GCC48_IA32_VFRPP_PATH = ENV(GCC48_IA32_PREFIX)gcc @@ -330,16 +346,16 @@ +*_GCC48_IA32_RC_PATH = ENV(GCC48_IA32_PREFIX)objcopy *_GCC48_IA32_ASLCC_FLAGS = DEF(GCC_ASLCC_FLAGS) -m32 - *_GCC48_IA32_ASLDLINK_FLAGS = DEF(GCC48_IA32_X64_ASLDLINK_FLAGS) -m elf_i386 -@@ -4965,17 +4947,17 @@ + *_GCC48_IA32_ASLDLINK_FLAGS = DEF(GCC48_IA32_X64_ASLDLINK_FLAGS) -Wl,-m,elf_i386 +@@ -5031,17 +5010,17 @@ RELEASE_GCC48_IA32_CC_FLAGS = DEF(GCC48_IA32_CC_FLAGS) -Os -Wno-unused-but ################## # GCC48 X64 definitions ################## -*_GCC48_X64_OBJCOPY_PATH = DEF(GCC48_X64_PREFIX)objcopy -*_GCC48_X64_CC_PATH = DEF(GCC48_X64_PREFIX)gcc -*_GCC48_X64_SLINK_PATH = DEF(GCC48_X64_PREFIX)ar --*_GCC48_X64_DLINK_PATH = DEF(GCC48_X64_PREFIX)ld --*_GCC48_X64_ASLDLINK_PATH = DEF(GCC48_X64_PREFIX)ld +-*_GCC48_X64_DLINK_PATH = DEF(GCC48_X64_PREFIX)gcc +-*_GCC48_X64_ASLDLINK_PATH = DEF(GCC48_X64_PREFIX)gcc -*_GCC48_X64_ASM_PATH = DEF(GCC48_X64_PREFIX)gcc -*_GCC48_X64_PP_PATH = DEF(GCC48_X64_PREFIX)gcc -*_GCC48_X64_VFRPP_PATH = DEF(GCC48_X64_PREFIX)gcc @@ -349,8 +365,8 @@ +*_GCC48_X64_OBJCOPY_PATH = ENV(GCC48_X64_PREFIX)objcopy +*_GCC48_X64_CC_PATH = ENV(GCC48_X64_PREFIX)gcc +*_GCC48_X64_SLINK_PATH = ENV(GCC48_X64_PREFIX)ar -+*_GCC48_X64_DLINK_PATH = ENV(GCC48_X64_PREFIX)ld -+*_GCC48_X64_ASLDLINK_PATH = ENV(GCC48_X64_PREFIX)ld ++*_GCC48_X64_DLINK_PATH = ENV(GCC48_X64_PREFIX)gcc ++*_GCC48_X64_ASLDLINK_PATH = ENV(GCC48_X64_PREFIX)gcc +*_GCC48_X64_ASM_PATH = ENV(GCC48_X64_PREFIX)gcc +*_GCC48_X64_PP_PATH = ENV(GCC48_X64_PREFIX)gcc +*_GCC48_X64_VFRPP_PATH = ENV(GCC48_X64_PREFIX)gcc @@ -359,8 +375,8 @@ +*_GCC48_X64_RC_PATH = ENV(GCC48_X64_PREFIX)objcopy *_GCC48_X64_ASLCC_FLAGS = DEF(GCC_ASLCC_FLAGS) -m64 - *_GCC48_X64_ASLDLINK_FLAGS = DEF(GCC48_IA32_X64_ASLDLINK_FLAGS) -m elf_x86_64 -@@ -5055,7 +5037,7 @@ + *_GCC48_X64_ASLDLINK_FLAGS = DEF(GCC48_IA32_X64_ASLDLINK_FLAGS) -Wl,-m,elf_x86_64 +@@ -5125,7 +5104,7 @@ RELEASE_GCC48_AARCH64_CC_FLAGS = DEF(GCC48_AARCH64_CC_FLAGS) -Wno-unused-but-s #################################################################################### *_GCC49_*_*_FAMILY = GCC @@ -369,15 +385,15 @@ *_GCC49_*_*_DLL = ENV(GCC49_DLL) *_GCC49_*_ASL_PATH = DEF(UNIX_IASL_BIN) -@@ -5070,17 +5052,17 @@ +@@ -5140,17 +5119,17 @@ RELEASE_GCC48_AARCH64_CC_FLAGS = DEF(GCC48_AARCH64_CC_FLAGS) -Wno-unused-but-s ################## # GCC49 IA32 definitions ################## -*_GCC49_IA32_OBJCOPY_PATH = DEF(GCC49_IA32_PREFIX)objcopy -*_GCC49_IA32_CC_PATH = DEF(GCC49_IA32_PREFIX)gcc -*_GCC49_IA32_SLINK_PATH = DEF(GCC49_IA32_PREFIX)ar --*_GCC49_IA32_DLINK_PATH = DEF(GCC49_IA32_PREFIX)ld --*_GCC49_IA32_ASLDLINK_PATH = DEF(GCC49_IA32_PREFIX)ld +-*_GCC49_IA32_DLINK_PATH = DEF(GCC49_IA32_PREFIX)gcc +-*_GCC49_IA32_ASLDLINK_PATH = DEF(GCC49_IA32_PREFIX)gcc -*_GCC49_IA32_ASM_PATH = DEF(GCC49_IA32_PREFIX)gcc -*_GCC49_IA32_PP_PATH = DEF(GCC49_IA32_PREFIX)gcc -*_GCC49_IA32_VFRPP_PATH = DEF(GCC49_IA32_PREFIX)gcc @@ -387,8 +403,8 @@ +*_GCC49_IA32_OBJCOPY_PATH = ENV(GCC49_IA32_PREFIX)objcopy +*_GCC49_IA32_CC_PATH = ENV(GCC49_IA32_PREFIX)gcc +*_GCC49_IA32_SLINK_PATH = ENV(GCC49_IA32_PREFIX)ar -+*_GCC49_IA32_DLINK_PATH = ENV(GCC49_IA32_PREFIX)ld -+*_GCC49_IA32_ASLDLINK_PATH = ENV(GCC49_IA32_PREFIX)ld ++*_GCC49_IA32_DLINK_PATH = ENV(GCC49_IA32_PREFIX)gcc ++*_GCC49_IA32_ASLDLINK_PATH = ENV(GCC49_IA32_PREFIX)gcc +*_GCC49_IA32_ASM_PATH = ENV(GCC49_IA32_PREFIX)gcc +*_GCC49_IA32_PP_PATH = ENV(GCC49_IA32_PREFIX)gcc +*_GCC49_IA32_VFRPP_PATH = ENV(GCC49_IA32_PREFIX)gcc @@ -397,16 +413,16 @@ +*_GCC49_IA32_RC_PATH = ENV(GCC49_IA32_PREFIX)objcopy *_GCC49_IA32_ASLCC_FLAGS = DEF(GCC_ASLCC_FLAGS) -m32 - *_GCC49_IA32_ASLDLINK_FLAGS = DEF(GCC49_IA32_X64_ASLDLINK_FLAGS) -m elf_i386 -@@ -5097,17 +5079,17 @@ + *_GCC49_IA32_ASLDLINK_FLAGS = DEF(GCC49_IA32_X64_ASLDLINK_FLAGS) -Wl,-m,elf_i386 +@@ -5168,17 +5147,17 @@ RELEASE_GCC49_IA32_CC_FLAGS = DEF(GCC49_IA32_CC_FLAGS) -Os -Wno-unused-but ################## # GCC49 X64 definitions ################## -*_GCC49_X64_OBJCOPY_PATH = DEF(GCC49_X64_PREFIX)objcopy -*_GCC49_X64_CC_PATH = DEF(GCC49_X64_PREFIX)gcc -*_GCC49_X64_SLINK_PATH = DEF(GCC49_X64_PREFIX)ar --*_GCC49_X64_DLINK_PATH = DEF(GCC49_X64_PREFIX)ld --*_GCC49_X64_ASLDLINK_PATH = DEF(GCC49_X64_PREFIX)ld +-*_GCC49_X64_DLINK_PATH = DEF(GCC49_X64_PREFIX)gcc +-*_GCC49_X64_ASLDLINK_PATH = DEF(GCC49_X64_PREFIX)gcc -*_GCC49_X64_ASM_PATH = DEF(GCC49_X64_PREFIX)gcc -*_GCC49_X64_PP_PATH = DEF(GCC49_X64_PREFIX)gcc -*_GCC49_X64_VFRPP_PATH = DEF(GCC49_X64_PREFIX)gcc @@ -416,8 +432,8 @@ +*_GCC49_X64_OBJCOPY_PATH = ENV(GCC49_X64_PREFIX)objcopy +*_GCC49_X64_CC_PATH = ENV(GCC49_X64_PREFIX)gcc +*_GCC49_X64_SLINK_PATH = ENV(GCC49_X64_PREFIX)ar -+*_GCC49_X64_DLINK_PATH = ENV(GCC49_X64_PREFIX)ld -+*_GCC49_X64_ASLDLINK_PATH = ENV(GCC49_X64_PREFIX)ld ++*_GCC49_X64_DLINK_PATH = ENV(GCC49_X64_PREFIX)gcc ++*_GCC49_X64_ASLDLINK_PATH = ENV(GCC49_X64_PREFIX)gcc +*_GCC49_X64_ASM_PATH = ENV(GCC49_X64_PREFIX)gcc +*_GCC49_X64_PP_PATH = ENV(GCC49_X64_PREFIX)gcc +*_GCC49_X64_VFRPP_PATH = ENV(GCC49_X64_PREFIX)gcc @@ -426,4 +442,74 @@ +*_GCC49_X64_RC_PATH = ENV(GCC49_X64_PREFIX)objcopy *_GCC49_X64_ASLCC_FLAGS = DEF(GCC_ASLCC_FLAGS) -m64 - *_GCC49_X64_ASLDLINK_FLAGS = DEF(GCC49_IA32_X64_ASLDLINK_FLAGS) -m elf_x86_64 + *_GCC49_X64_ASLDLINK_FLAGS = DEF(GCC49_IA32_X64_ASLDLINK_FLAGS) -Wl,-m,elf_x86_64 +@@ -5268,7 +5247,7 @@ RELEASE_GCC49_AARCH64_DLINK_FLAGS = DEF(GCC49_AARCH64_DLINK_FLAGS) + #################################################################################### + *_GCC5_*_*_FAMILY = GCC + +-*_GCC5_*_MAKE_PATH = DEF(GCC5_IA32_PREFIX)make ++*_GCC5_*_MAKE_PATH = make + *_GCC5_*_*_DLL = ENV(GCC5_DLL) + *_GCC5_*_ASL_PATH = DEF(UNIX_IASL_BIN) + +@@ -5283,17 +5262,17 @@ RELEASE_GCC49_AARCH64_DLINK_FLAGS = DEF(GCC49_AARCH64_DLINK_FLAGS) + ################## + # GCC5 IA32 definitions + ################## +-*_GCC5_IA32_OBJCOPY_PATH = DEF(GCC5_IA32_PREFIX)objcopy +-*_GCC5_IA32_CC_PATH = DEF(GCC5_IA32_PREFIX)gcc +-*_GCC5_IA32_SLINK_PATH = DEF(GCC5_IA32_PREFIX)gcc-ar +-*_GCC5_IA32_DLINK_PATH = DEF(GCC5_IA32_PREFIX)gcc +-*_GCC5_IA32_ASLDLINK_PATH = DEF(GCC5_IA32_PREFIX)gcc +-*_GCC5_IA32_ASM_PATH = DEF(GCC5_IA32_PREFIX)gcc +-*_GCC5_IA32_PP_PATH = DEF(GCC5_IA32_PREFIX)gcc +-*_GCC5_IA32_VFRPP_PATH = DEF(GCC5_IA32_PREFIX)gcc +-*_GCC5_IA32_ASLCC_PATH = DEF(GCC5_IA32_PREFIX)gcc +-*_GCC5_IA32_ASLPP_PATH = DEF(GCC5_IA32_PREFIX)gcc +-*_GCC5_IA32_RC_PATH = DEF(GCC5_IA32_PREFIX)objcopy ++*_GCC5_IA32_OBJCOPY_PATH = ENV(GCC5_IA32_PREFIX)objcopy ++*_GCC5_IA32_CC_PATH = ENV(GCC5_IA32_PREFIX)gcc ++*_GCC5_IA32_SLINK_PATH = ENV(GCC5_IA32_PREFIX)gcc-ar ++*_GCC5_IA32_DLINK_PATH = ENV(GCC5_IA32_PREFIX)gcc ++*_GCC5_IA32_ASLDLINK_PATH = ENV(GCC5_IA32_PREFIX)gcc ++*_GCC5_IA32_ASM_PATH = ENV(GCC5_IA32_PREFIX)gcc ++*_GCC5_IA32_PP_PATH = ENV(GCC5_IA32_PREFIX)gcc ++*_GCC5_IA32_VFRPP_PATH = ENV(GCC5_IA32_PREFIX)gcc ++*_GCC5_IA32_ASLCC_PATH = ENV(GCC5_IA32_PREFIX)gcc ++*_GCC5_IA32_ASLPP_PATH = ENV(GCC5_IA32_PREFIX)gcc ++*_GCC5_IA32_RC_PATH = ENV(GCC5_IA32_PREFIX)objcopy + + *_GCC5_IA32_ASLCC_FLAGS = DEF(GCC_ASLCC_FLAGS) -m32 -fno-lto + *_GCC5_IA32_ASLDLINK_FLAGS = DEF(GCC5_IA32_X64_ASLDLINK_FLAGS) -Wl,-m,elf_i386 +@@ -5315,17 +5294,17 @@ RELEASE_GCC5_IA32_DLINK_FLAGS = DEF(GCC5_IA32_X64_DLINK_FLAGS) -flto -Os -Wl, + ################## + # GCC5 X64 definitions + ################## +-*_GCC5_X64_OBJCOPY_PATH = DEF(GCC5_X64_PREFIX)objcopy +-*_GCC5_X64_CC_PATH = DEF(GCC5_X64_PREFIX)gcc +-*_GCC5_X64_SLINK_PATH = DEF(GCC5_X64_PREFIX)gcc-ar +-*_GCC5_X64_DLINK_PATH = DEF(GCC5_X64_PREFIX)gcc +-*_GCC5_X64_ASLDLINK_PATH = DEF(GCC5_X64_PREFIX)gcc +-*_GCC5_X64_ASM_PATH = DEF(GCC5_X64_PREFIX)gcc +-*_GCC5_X64_PP_PATH = DEF(GCC5_X64_PREFIX)gcc +-*_GCC5_X64_VFRPP_PATH = DEF(GCC5_X64_PREFIX)gcc +-*_GCC5_X64_ASLCC_PATH = DEF(GCC5_X64_PREFIX)gcc +-*_GCC5_X64_ASLPP_PATH = DEF(GCC5_X64_PREFIX)gcc +-*_GCC5_X64_RC_PATH = DEF(GCC5_X64_PREFIX)objcopy ++*_GCC5_X64_OBJCOPY_PATH = ENV(GCC5_X64_PREFIX)objcopy ++*_GCC5_X64_CC_PATH = ENV(GCC5_X64_PREFIX)gcc ++*_GCC5_X64_SLINK_PATH = ENV(GCC5_X64_PREFIX)gcc-ar ++*_GCC5_X64_DLINK_PATH = ENV(GCC5_X64_PREFIX)gcc ++*_GCC5_X64_ASLDLINK_PATH = ENV(GCC5_X64_PREFIX)gcc ++*_GCC5_X64_ASM_PATH = ENV(GCC5_X64_PREFIX)gcc ++*_GCC5_X64_PP_PATH = ENV(GCC5_X64_PREFIX)gcc ++*_GCC5_X64_VFRPP_PATH = ENV(GCC5_X64_PREFIX)gcc ++*_GCC5_X64_ASLCC_PATH = ENV(GCC5_X64_PREFIX)gcc ++*_GCC5_X64_ASLPP_PATH = ENV(GCC5_X64_PREFIX)gcc ++*_GCC5_X64_RC_PATH = ENV(GCC5_X64_PREFIX)objcopy + + *_GCC5_X64_ASLCC_FLAGS = DEF(GCC_ASLCC_FLAGS) -m64 -fno-lto + *_GCC5_X64_ASLDLINK_FLAGS = DEF(GCC5_IA32_X64_ASLDLINK_FLAGS) -Wl,-m,elf_x86_64 +-- +2.9.3 + diff --git a/0009-pick-up-any-display-device-not-only-vga.patch b/0009-pick-up-any-display-device-not-only-vga.patch deleted file mode 100644 index 732d76d..0000000 --- a/0009-pick-up-any-display-device-not-only-vga.patch +++ /dev/null @@ -1,21 +0,0 @@ -From: Gerd Hoffmann -Date: Thu, 13 Mar 2014 08:08:41 +0100 -Subject: [PATCH] pick up any display device, not only vga - ---- - OvmfPkg/Library/PlatformBdsLib/BdsPlatform.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/OvmfPkg/Library/PlatformBdsLib/BdsPlatform.c b/OvmfPkg/Library/PlatformBdsLib/BdsPlatform.c -index 0bc02ba..5024caf 100644 ---- a/OvmfPkg/Library/PlatformBdsLib/BdsPlatform.c -+++ b/OvmfPkg/Library/PlatformBdsLib/BdsPlatform.c -@@ -586,7 +586,7 @@ DetectAndPreparePlatformPciDevicePath ( - // - // Here we decide which VGA device to enable in PCI bus - // -- if (IS_PCI_VGA (Pci)) { -+ if (IS_PCI_DISPLAY (Pci)) { - // - // Add them to ConOut. - // diff --git a/EDKII_openssl-1.0.2g-no-srp.patch b/EDKII_openssl-1.0.2j-no-srp.patch similarity index 91% rename from EDKII_openssl-1.0.2g-no-srp.patch rename to EDKII_openssl-1.0.2j-no-srp.patch index 57bdb00..0735b73 100644 --- a/EDKII_openssl-1.0.2g-no-srp.patch +++ b/EDKII_openssl-1.0.2j-no-srp.patch @@ -1,5 +1,5 @@ diff --git a/Configure b/Configure -index c98107a..c122709 100755 +index c39f71a..98dd1d0 100755 --- a/Configure +++ b/Configure @@ -609,6 +609,9 @@ my %table=( @@ -12,7 +12,7 @@ index c98107a..c122709 100755 # UWIN "UWIN", "cc:-DTERMIOS -DL_ENDIAN -O -Wall:::UWIN::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${no_asm}:win32", -@@ -1088,7 +1091,7 @@ if (defined($disabled{"tls1"})) +@@ -1083,7 +1086,7 @@ if (defined($disabled{"md5"}) || defined($disabled{"sha"}) } if (defined($disabled{"ec"}) || defined($disabled{"dsa"}) @@ -22,20 +22,20 @@ index c98107a..c122709 100755 $disabled{"gost"} = "forced"; } diff --git a/apps/apps.c b/apps/apps.c -index b1dd970..8278c28 100644 +index 9fdc3e0..6c183b0 100644 --- a/apps/apps.c +++ b/apps/apps.c -@@ -2374,6 +2374,8 @@ int args_verify(char ***pargs, int *pargc, +@@ -2375,6 +2375,8 @@ int args_verify(char ***pargs, int *pargc, flags |= X509_V_FLAG_PARTIAL_CHAIN; else if (!strcmp(arg, "-no_alt_chains")) flags |= X509_V_FLAG_NO_ALT_CHAINS; + else if (!strcmp(arg, "-no_check_time")) + flags |= X509_V_FLAG_NO_CHECK_TIME; + else if (!strcmp(arg, "-allow_proxy_certs")) + flags |= X509_V_FLAG_ALLOW_PROXY_CERTS; else - return 0; - diff --git a/crypto/asn1/a_strex.c b/crypto/asn1/a_strex.c -index 35fd44c..9f39bff 100644 +index 2d562f9..91203b7 100644 --- a/crypto/asn1/a_strex.c +++ b/crypto/asn1/a_strex.c @@ -104,6 +104,7 @@ static int send_bio_chars(void *arg, const void *buf, int len) @@ -254,7 +254,7 @@ index d5a5514..bede55c 100644 goto err; diff --git a/crypto/bn/bn_prime.c b/crypto/bn/bn_prime.c -index 1d25687..e933ead 100644 +index 1d25687..ad641c3 100644 --- a/crypto/bn/bn_prime.c +++ b/crypto/bn/bn_prime.c @@ -131,7 +131,7 @@ @@ -277,7 +277,7 @@ index 1d25687..e933ead 100644 + mods = OPENSSL_malloc(sizeof(*mods) * NUMPRIMES); + if (mods == NULL) -+ goto err; ++ goto err; ctx = BN_CTX_new(); if (ctx == NULL) goto err; @@ -311,7 +311,7 @@ index 1d25687..e933ead 100644 again: diff --git a/crypto/conf/conf.h b/crypto/conf/conf.h -index 8d926d5..41cf38e 100644 +index 8d926d5..c29e97d 100644 --- a/crypto/conf/conf.h +++ b/crypto/conf/conf.h @@ -118,8 +118,10 @@ typedef void conf_finish_func (CONF_IMODULE *md); @@ -329,9 +329,9 @@ index 8d926d5..41cf38e 100644 long CONF_get_number(LHASH_OF(CONF_VALUE) *conf, const char *group, const char *name); void CONF_free(LHASH_OF(CONF_VALUE) *conf); -+#ifndef OPENSSL_NO_FP_API ++# ifndef OPENSSL_NO_FP_API int CONF_dump_fp(LHASH_OF(CONF_VALUE) *conf, FILE *out); -+#endif ++# endif int CONF_dump_bio(LHASH_OF(CONF_VALUE) *conf, BIO *out); void OPENSSL_config(const char *config_name); @@ -349,9 +349,9 @@ index 8d926d5..41cf38e 100644 char *NCONF_get_string(const CONF *conf, const char *group, const char *name); int NCONF_get_number_e(const CONF *conf, const char *group, const char *name, long *result); -+#ifndef OPENSSL_NO_FP_API ++# ifndef OPENSSL_NO_FP_API int NCONF_dump_fp(const CONF *conf, FILE *out); -+#endif ++# endif int NCONF_dump_bio(const CONF *conf, BIO *out); # if 0 /* The following function has no error @@ -359,10 +359,10 @@ index 8d926d5..41cf38e 100644 int CONF_modules_load(const CONF *cnf, const char *appname, unsigned long flags); -+#ifndef OPENSSL_NO_STDIO ++# ifndef OPENSSL_NO_STDIO int CONF_modules_load_file(const char *filename, const char *appname, unsigned long flags); -+#endif ++# endif void CONF_modules_unload(int all); void CONF_modules_finish(void); void CONF_modules_free(void); @@ -426,7 +426,7 @@ index 5281384..952b545 100644 #ifndef OPENSSL_NO_FP_API int NCONF_load_fp(CONF *conf, FILE *fp, long *eline) diff --git a/crypto/conf/conf_mod.c b/crypto/conf/conf_mod.c -index 9acfca4..5e0a482 100644 +index e0c9a67..13d93ea 100644 --- a/crypto/conf/conf_mod.c +++ b/crypto/conf/conf_mod.c @@ -159,6 +159,7 @@ int CONF_modules_load(const CONF *cnf, const char *appname, @@ -684,10 +684,10 @@ index a5bd901..6488879 100644 /* BEGIN ERROR CODES */ /* diff --git a/crypto/dh/dh_kdf.c b/crypto/dh/dh_kdf.c -index a882cb2..4eddb9a 100644 +index a882cb2..aace5fb 100644 --- a/crypto/dh/dh_kdf.c +++ b/crypto/dh/dh_kdf.c -@@ -51,13 +51,18 @@ +@@ -51,6 +51,9 @@ * ==================================================================== */ @@ -697,22 +697,21 @@ index a882cb2..4eddb9a 100644 #include #include #include - #include +@@ -58,6 +61,7 @@ #include -+ /* Key derivation from X9.42/RFC2631 */ +/* Uses CMS functions, hence the #ifdef wrapper. */ #define DH_KDF_MAX (1L << 30) -@@ -185,3 +190,4 @@ int DH_KDF_X9_42(unsigned char *out, size_t outlen, +@@ -185,3 +189,4 @@ int DH_KDF_X9_42(unsigned char *out, size_t outlen, EVP_MD_CTX_cleanup(&mctx); return rv; } +#endif diff --git a/crypto/dh/dh_pmeth.c b/crypto/dh/dh_pmeth.c -index b58e3fa..c6288f6 100644 +index b58e3fa..926be98 100644 --- a/crypto/dh/dh_pmeth.c +++ b/crypto/dh/dh_pmeth.c @@ -207,7 +207,11 @@ static int pkey_dh_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2) @@ -727,7 +726,7 @@ index b58e3fa..c6288f6 100644 return -2; dctx->kdf_type = p1; return 1; -@@ -448,7 +452,10 @@ static int pkey_dh_derive(EVP_PKEY_CTX *ctx, unsigned char *key, +@@ -448,7 +452,9 @@ static int pkey_dh_derive(EVP_PKEY_CTX *ctx, unsigned char *key, return ret; *keylen = ret; return 1; @@ -735,11 +734,10 @@ index b58e3fa..c6288f6 100644 + } +#ifndef OPENSSL_NO_CMS + else if (dctx->kdf_type == EVP_PKEY_DH_KDF_X9_42) { -+ unsigned char *Z = NULL; size_t Zlen = 0; if (!dctx->kdf_outlen || !dctx->kdf_oid) -@@ -479,7 +486,8 @@ static int pkey_dh_derive(EVP_PKEY_CTX *ctx, unsigned char *key, +@@ -479,7 +485,8 @@ static int pkey_dh_derive(EVP_PKEY_CTX *ctx, unsigned char *key, } return ret; } @@ -749,21 +747,6 @@ index b58e3fa..c6288f6 100644 } const EVP_PKEY_METHOD dh_pkey_meth = { -diff --git a/crypto/ec/ec_ameth.c b/crypto/ec/ec_ameth.c -index 83e208c..4869098 100644 ---- a/crypto/ec/ec_ameth.c -+++ b/crypto/ec/ec_ameth.c -@@ -67,8 +67,10 @@ - #include - #include "asn1_locl.h" - -+#ifndef OPENSSL_NO_CMS - static int ecdh_cms_decrypt(CMS_RecipientInfo *ri); - static int ecdh_cms_encrypt(CMS_RecipientInfo *ri); -+#endif - - static int eckey_param2type(int *pptype, void **ppval, EC_KEY *ec_key) - { diff --git a/crypto/engine/eng_int.h b/crypto/engine/eng_int.h index 46f163b..b4a72a0 100644 --- a/crypto/engine/eng_int.h @@ -945,7 +928,7 @@ index 7a1c85d..7162c0f 100644 #undef BN_LLONG diff --git a/crypto/pem/pem.h b/crypto/pem/pem.h -index d3b23fc..87b0b6a 100644 +index aac72fb..d271ec8 100644 --- a/crypto/pem/pem.h +++ b/crypto/pem/pem.h @@ -324,6 +324,7 @@ int PEM_write_bio_##name(BIO *bp, type *x, const EVP_CIPHER *enc, \ @@ -980,17 +963,16 @@ index d3b23fc..87b0b6a 100644 int i2d_PKCS8PrivateKey_fp(FILE *fp, EVP_PKEY *x, const EVP_CIPHER *enc, char *kstr, int klen, pem_password_cb *cb, void *u); -@@ -510,7 +514,7 @@ EVP_PKEY *d2i_PKCS8PrivateKey_fp(FILE *fp, EVP_PKEY **x, pem_password_cb *cb, +@@ -510,6 +514,7 @@ EVP_PKEY *d2i_PKCS8PrivateKey_fp(FILE *fp, EVP_PKEY **x, pem_password_cb *cb, int PEM_write_PKCS8PrivateKey(FILE *fp, EVP_PKEY *x, const EVP_CIPHER *enc, char *kstr, int klen, pem_password_cb *cd, void *u); -- +#endif + EVP_PKEY *PEM_read_bio_Parameters(BIO *bp, EVP_PKEY **x); int PEM_write_bio_Parameters(BIO *bp, EVP_PKEY *x); - diff --git a/crypto/pem/pem_lib.c b/crypto/pem/pem_lib.c -index a29821a..5525efd 100644 +index c82b3c0..56c77b1 100644 --- a/crypto/pem/pem_lib.c +++ b/crypto/pem/pem_lib.c @@ -84,7 +84,7 @@ int pem_check_suffix(const char *pem_str, const char *suffix); @@ -1003,38 +985,35 @@ index a29821a..5525efd 100644 * We should not ever call the default callback routine from windows. */ diff --git a/crypto/pem/pem_pk8.c b/crypto/pem/pem_pk8.c -index 5747c73..fe465cc 100644 +index 5747c73..9edca4d 100644 --- a/crypto/pem/pem_pk8.c +++ b/crypto/pem/pem_pk8.c -@@ -69,10 +69,12 @@ +@@ -69,9 +69,11 @@ static int do_pk8pkey(BIO *bp, EVP_PKEY *x, int isder, int nid, const EVP_CIPHER *enc, char *kstr, int klen, pem_password_cb *cb, void *u); -+ +#ifndef OPENSSL_NO_FP_API static int do_pk8pkey_fp(FILE *bp, EVP_PKEY *x, int isder, int nid, const EVP_CIPHER *enc, char *kstr, int klen, pem_password_cb *cb, void *u); -- +#endif + /* * These functions write a private key in PKCS#8 format: it is a "drop in" - * replacement for PEM_write_bio_PrivateKey() and friends. As usual if 'enc' diff --git a/crypto/pkcs7/pk7_smime.c b/crypto/pkcs7/pk7_smime.c -index dc9b484..0bc3d43 100644 +index dc9b484..e75c4b2 100644 --- a/crypto/pkcs7/pk7_smime.c +++ b/crypto/pkcs7/pk7_smime.c -@@ -64,6 +64,9 @@ +@@ -64,6 +64,8 @@ #include #include -+ +#define BUFFERSIZE 4096 + static int pkcs7_copy_existing_digest(PKCS7 *p7, PKCS7_SIGNER_INFO *si); PKCS7 *PKCS7_sign(X509 *signcert, EVP_PKEY *pkey, STACK_OF(X509) *certs, -@@ -254,7 +257,7 @@ int PKCS7_verify(PKCS7 *p7, STACK_OF(X509) *certs, X509_STORE *store, +@@ -254,7 +256,7 @@ int PKCS7_verify(PKCS7 *p7, STACK_OF(X509) *certs, X509_STORE *store, STACK_OF(PKCS7_SIGNER_INFO) *sinfos; PKCS7_SIGNER_INFO *si; X509_STORE_CTX cert_ctx; @@ -1043,7 +1022,7 @@ index dc9b484..0bc3d43 100644 int i, j = 0, k, ret = 0; BIO *p7bio = NULL; BIO *tmpin = NULL, *tmpout = NULL; -@@ -373,8 +376,12 @@ int PKCS7_verify(PKCS7 *p7, STACK_OF(X509) *certs, X509_STORE *store, +@@ -373,8 +375,12 @@ int PKCS7_verify(PKCS7 *p7, STACK_OF(X509) *certs, X509_STORE *store, tmpout = out; /* We now have to 'read' from p7bio to calculate digests etc. */ @@ -1057,7 +1036,7 @@ index dc9b484..0bc3d43 100644 if (i <= 0) break; if (tmpout) -@@ -405,6 +412,7 @@ int PKCS7_verify(PKCS7 *p7, STACK_OF(X509) *certs, X509_STORE *store, +@@ -405,6 +411,7 @@ int PKCS7_verify(PKCS7 *p7, STACK_OF(X509) *certs, X509_STORE *store, ret = 1; err: @@ -1065,7 +1044,7 @@ index dc9b484..0bc3d43 100644 if (tmpin == indata) { if (indata) BIO_pop(p7bio); -@@ -523,7 +531,7 @@ int PKCS7_decrypt(PKCS7 *p7, EVP_PKEY *pkey, X509 *cert, BIO *data, int flags) +@@ -523,7 +530,7 @@ int PKCS7_decrypt(PKCS7 *p7, EVP_PKEY *pkey, X509 *cert, BIO *data, int flags) { BIO *tmpmem; int ret, i; @@ -1074,7 +1053,7 @@ index dc9b484..0bc3d43 100644 if (!p7) { PKCS7err(PKCS7_F_PKCS7_DECRYPT, PKCS7_R_INVALID_NULL_POINTER); -@@ -567,24 +575,29 @@ int PKCS7_decrypt(PKCS7 *p7, EVP_PKEY *pkey, X509 *cert, BIO *data, int flags) +@@ -567,24 +574,30 @@ int PKCS7_decrypt(PKCS7 *p7, EVP_PKEY *pkey, X509 *cert, BIO *data, int flags) } BIO_free_all(bread); return ret; @@ -1116,6 +1095,7 @@ index dc9b484..0bc3d43 100644 - BIO_free_all(tmpmem); - return ret; } ++ +err: + OPENSSL_free(buf); + BIO_free_all(tmpmem); @@ -1135,7 +1115,7 @@ index 737aebf..f23f348 100644 { return (-1); diff --git a/crypto/rand/rand_unix.c b/crypto/rand/rand_unix.c -index 266111e..f60fac6 100644 +index 6c5b65d..11ee152 100644 --- a/crypto/rand/rand_unix.c +++ b/crypto/rand/rand_unix.c @@ -116,7 +116,7 @@ @@ -1156,73 +1136,8 @@ index 266111e..f60fac6 100644 int RAND_poll(void) { return 0; -diff --git a/crypto/rsa/rsa_ameth.c b/crypto/rsa/rsa_ameth.c -index 4e06218..ddead3d 100644 ---- a/crypto/rsa/rsa_ameth.c -+++ b/crypto/rsa/rsa_ameth.c -@@ -68,10 +68,12 @@ - #endif - #include "asn1_locl.h" - -+#ifndef OPENSSL_NO_CMS - static int rsa_cms_sign(CMS_SignerInfo *si); - static int rsa_cms_verify(CMS_SignerInfo *si); - static int rsa_cms_decrypt(CMS_RecipientInfo *ri); - static int rsa_cms_encrypt(CMS_RecipientInfo *ri); -+#endif - - static int rsa_pub_encode(X509_PUBKEY *pk, const EVP_PKEY *pkey) - { -@@ -665,6 +667,7 @@ static int rsa_pss_to_ctx(EVP_MD_CTX *ctx, EVP_PKEY_CTX *pkctx, - return rv; - } - -+#ifndef OPENSSL_NO_CMS - static int rsa_cms_verify(CMS_SignerInfo *si) - { - int nid, nid2; -@@ -683,6 +686,7 @@ static int rsa_cms_verify(CMS_SignerInfo *si) - } - return 0; - } -+#endif - - /* - * Customised RSA item verification routine. This is called when a signature -@@ -705,6 +709,7 @@ static int rsa_item_verify(EVP_MD_CTX *ctx, const ASN1_ITEM *it, void *asn, - return -1; - } - -+#ifndef OPENSSL_NO_CMS - static int rsa_cms_sign(CMS_SignerInfo *si) - { - int pad_mode = RSA_PKCS1_PADDING; -@@ -729,6 +734,7 @@ static int rsa_cms_sign(CMS_SignerInfo *si) - X509_ALGOR_set0(alg, OBJ_nid2obj(NID_rsassaPss), V_ASN1_SEQUENCE, os); - return 1; - } -+#endif - - static int rsa_item_sign(EVP_MD_CTX *ctx, const ASN1_ITEM *it, void *asn, - X509_ALGOR *alg1, X509_ALGOR *alg2, -@@ -762,6 +768,7 @@ static int rsa_item_sign(EVP_MD_CTX *ctx, const ASN1_ITEM *it, void *asn, - return 2; - } - -+#ifndef OPENSSL_NO_CMS - static RSA_OAEP_PARAMS *rsa_oaep_decode(const X509_ALGOR *alg, - X509_ALGOR **pmaskHash) - { -@@ -920,6 +927,7 @@ static int rsa_cms_encrypt(CMS_RecipientInfo *ri) - ASN1_STRING_free(os); - return rv; - } -+#endif - - const EVP_PKEY_ASN1_METHOD rsa_asn1_meths[] = { - { diff --git a/crypto/ts/ts.h b/crypto/ts/ts.h -index 16eccbb..a9fe40e 100644 +index 2daa1b2..5205bc5 100644 --- a/crypto/ts/ts.h +++ b/crypto/ts/ts.h @@ -281,8 +281,10 @@ TS_REQ *d2i_TS_REQ(TS_REQ **a, const unsigned char **pp, long length); @@ -1281,7 +1196,7 @@ index 16eccbb..a9fe40e 100644 TS_ACCURACY *TS_ACCURACY_new(void); void TS_ACCURACY_free(TS_ACCURACY *a); -@@ -728,15 +736,18 @@ int TS_MSG_IMPRINT_print_bio(BIO *bio, TS_MSG_IMPRINT *msg); +@@ -731,15 +739,18 @@ int TS_MSG_IMPRINT_print_bio(BIO *bio, TS_MSG_IMPRINT *msg); * ts/ts_conf.c */ @@ -1300,7 +1215,7 @@ index 16eccbb..a9fe40e 100644 int TS_CONF_set_signer_cert(CONF *conf, const char *section, const char *cert, TS_RESP_CTX *ctx); int TS_CONF_set_certs(CONF *conf, const char *section, const char *certs, -@@ -744,6 +755,7 @@ int TS_CONF_set_certs(CONF *conf, const char *section, const char *certs, +@@ -747,6 +758,7 @@ int TS_CONF_set_certs(CONF *conf, const char *section, const char *certs, int TS_CONF_set_signer_key(CONF *conf, const char *section, const char *key, const char *pass, TS_RESP_CTX *ctx); @@ -1308,7 +1223,7 @@ index 16eccbb..a9fe40e 100644 int TS_CONF_set_def_policy(CONF *conf, const char *section, const char *policy, TS_RESP_CTX *ctx); int TS_CONF_set_policies(CONF *conf, const char *section, TS_RESP_CTX *ctx); -@@ -784,6 +796,11 @@ void ERR_load_TS_strings(void); +@@ -787,6 +799,11 @@ void ERR_load_TS_strings(void); # define TS_F_TS_CHECK_SIGNING_CERTS 103 # define TS_F_TS_CHECK_STATUS_INFO 104 # define TS_F_TS_COMPUTE_IMPRINT 145 @@ -1320,7 +1235,7 @@ index 16eccbb..a9fe40e 100644 # define TS_F_TS_CONF_SET_DEFAULT_ENGINE 146 # define TS_F_TS_GET_STATUS_TEXT 105 # define TS_F_TS_MSG_IMPRINT_SET_ALGO 118 -@@ -822,6 +839,8 @@ void ERR_load_TS_strings(void); +@@ -825,6 +842,8 @@ void ERR_load_TS_strings(void); /* Reason codes. */ # define TS_R_BAD_PKCS7_TYPE 132 # define TS_R_BAD_TYPE 133 @@ -1329,7 +1244,7 @@ index 16eccbb..a9fe40e 100644 # define TS_R_CERTIFICATE_VERIFY_ERROR 100 # define TS_R_COULD_NOT_SET_ENGINE 127 # define TS_R_COULD_NOT_SET_TIME 115 -@@ -854,6 +873,8 @@ void ERR_load_TS_strings(void); +@@ -857,6 +876,8 @@ void ERR_load_TS_strings(void); # define TS_R_UNACCEPTABLE_POLICY 125 # define TS_R_UNSUPPORTED_MD_ALGORITHM 126 # define TS_R_UNSUPPORTED_VERSION 113 @@ -1470,7 +1385,7 @@ index 0f29011..80dd40e 100644 int verify) { diff --git a/crypto/x509/by_dir.c b/crypto/x509/by_dir.c -index 9ee8f8d..64b052e 100644 +index bbc3189..29695f9 100644 --- a/crypto/x509/by_dir.c +++ b/crypto/x509/by_dir.c @@ -69,6 +69,8 @@ @@ -1482,17 +1397,17 @@ index 9ee8f8d..64b052e 100644 #include #include -@@ -434,3 +436,5 @@ static int get_cert_by_subject(X509_LOOKUP *xl, int type, X509_NAME *name, +@@ -438,3 +440,5 @@ static int get_cert_by_subject(X509_LOOKUP *xl, int type, X509_NAME *name, BUF_MEM_free(b); return (ok); } + +#endif /* OPENSSL_NO_STDIO */ diff --git a/crypto/x509/x509_vfy.c b/crypto/x509/x509_vfy.c -index 4d34dba..25e8a89 100644 +index 8334b3f..d075f66 100644 --- a/crypto/x509/x509_vfy.c +++ b/crypto/x509/x509_vfy.c -@@ -950,6 +950,8 @@ static int check_crl_time(X509_STORE_CTX *ctx, X509_CRL *crl, int notify) +@@ -1064,6 +1064,8 @@ static int check_crl_time(X509_STORE_CTX *ctx, X509_CRL *crl, int notify) ctx->current_crl = crl; if (ctx->param->flags & X509_V_FLAG_USE_CHECK_TIME) ptime = &ctx->param->check_time; @@ -1501,7 +1416,7 @@ index 4d34dba..25e8a89 100644 else ptime = NULL; -@@ -1673,6 +1675,8 @@ static int check_cert_time(X509_STORE_CTX *ctx, X509 *x) +@@ -1805,6 +1807,8 @@ static int check_cert_time(X509_STORE_CTX *ctx, X509 *x) if (ctx->param->flags & X509_V_FLAG_USE_CHECK_TIME) ptime = &ctx->param->check_time; @@ -1511,10 +1426,10 @@ index 4d34dba..25e8a89 100644 ptime = NULL; diff --git a/crypto/x509/x509_vfy.h b/crypto/x509/x509_vfy.h -index 2663e1c..3790ef5 100644 +index 5062682..e90d931 100644 --- a/crypto/x509/x509_vfy.h +++ b/crypto/x509/x509_vfy.h -@@ -438,6 +438,8 @@ void X509_STORE_CTX_set_depth(X509_STORE_CTX *ctx, int depth); +@@ -443,6 +443,8 @@ void X509_STORE_CTX_set_depth(X509_STORE_CTX *ctx, int depth); * will force the behaviour to match that of previous versions. */ # define X509_V_FLAG_NO_ALT_CHAINS 0x100000 @@ -1523,11 +1438,10 @@ index 2663e1c..3790ef5 100644 # define X509_VP_FLAG_DEFAULT 0x1 # define X509_VP_FLAG_OVERWRITE 0x2 -@@ -490,9 +492,10 @@ void X509_STORE_CTX_cleanup(X509_STORE_CTX *ctx); - X509_STORE *X509_STORE_CTX_get0_store(X509_STORE_CTX *ctx); +@@ -496,8 +498,10 @@ X509_STORE *X509_STORE_CTX_get0_store(X509_STORE_CTX *ctx); X509_LOOKUP *X509_STORE_add_lookup(X509_STORE *v, X509_LOOKUP_METHOD *m); -- + +#ifndef OPENSSL_NO_STDIO X509_LOOKUP_METHOD *X509_LOOKUP_hash_dir(void); X509_LOOKUP_METHOD *X509_LOOKUP_file(void); @@ -1883,10 +1797,10 @@ index f6b3ff2..1dcbe36 100755 SEED,- SHA,- diff --git a/ssl/d1_both.c b/ssl/d1_both.c -index d1fc716..d5f661a 100644 +index 9bc6153..b5648eb 100644 --- a/ssl/d1_both.c +++ b/ssl/d1_both.c -@@ -1053,7 +1053,7 @@ int dtls1_send_change_cipher_spec(SSL *s, int a, int b) +@@ -1068,7 +1068,7 @@ int dtls1_send_change_cipher_spec(SSL *s, int a, int b) int dtls1_read_failed(SSL *s, int code) { if (code > 0) { @@ -1896,7 +1810,7 @@ index d1fc716..d5f661a 100644 } diff --git a/ssl/ssl_asn1.c b/ssl/ssl_asn1.c -index 35cc27c..a1f5335 100644 +index 499f0e8..5672f99 100644 --- a/ssl/ssl_asn1.c +++ b/ssl/ssl_asn1.c @@ -418,7 +418,7 @@ SSL_SESSION *d2i_SSL_SESSION(SSL_SESSION **a, const unsigned char **pp, @@ -1931,19 +1845,18 @@ index 35cc27c..a1f5335 100644 c.error = SSL_R_BAD_LENGTH; - c.line = __LINE__; + c.line = OPENSSL_LINE; - goto err; - } else { - ret->sid_ctx_length = os.length; + OPENSSL_free(os.data); + os.data = NULL; + os.length = 0; diff --git a/ssl/ssl_cert.c b/ssl/ssl_cert.c -index a73f866..d534c0a 100644 +index f48ebae..ac4f08c 100644 --- a/ssl/ssl_cert.c +++ b/ssl/ssl_cert.c -@@ -855,12 +855,13 @@ int SSL_CTX_add_client_CA(SSL_CTX *ctx, X509 *x) +@@ -857,12 +857,12 @@ int SSL_CTX_add_client_CA(SSL_CTX *ctx, X509 *x) return (add_client_CA(&(ctx->client_CA), x)); } +#ifndef OPENSSL_NO_STDIO -+ static int xname_cmp(const X509_NAME *const *a, const X509_NAME *const *b) { return (X509_NAME_cmp(*a, *b)); @@ -1953,7 +1866,7 @@ index a73f866..d534c0a 100644 /** * Load CA certs from a file into a ::STACK. Note that it is somewhat misnamed; * it doesn't really have anything to do with clients (except that a common use -@@ -928,7 +929,6 @@ STACK_OF(X509_NAME) *SSL_load_client_CA_file(const char *file) +@@ -930,7 +930,6 @@ STACK_OF(X509_NAME) *SSL_load_client_CA_file(const char *file) ERR_clear_error(); return (ret); } @@ -1961,7 +1874,7 @@ index a73f866..d534c0a 100644 /** * Add a file of certs to a stack. -@@ -1048,6 +1048,7 @@ int SSL_add_dir_cert_subjects_to_stack(STACK_OF(X509_NAME) *stack, +@@ -1050,6 +1049,7 @@ int SSL_add_dir_cert_subjects_to_stack(STACK_OF(X509_NAME) *stack, CRYPTO_w_unlock(CRYPTO_LOCK_READDIR); return ret; } @@ -2008,10 +1921,10 @@ index 8d3709d..2bb403b 100644 static int ssl_conf_cmd_skip_prefix(SSL_CONF_CTX *cctx, const char **pcmd) diff --git a/ssl/t1_enc.c b/ssl/t1_enc.c -index 514fcb3..2a54cc9 100644 +index b6d1ee9..75f38cd 100644 --- a/ssl/t1_enc.c +++ b/ssl/t1_enc.c -@@ -780,9 +780,7 @@ int tls1_enc(SSL *s, int send) +@@ -779,9 +779,7 @@ int tls1_enc(SSL *s, int send) * we can't write into the input stream: Can this ever * happen?? (steve) */ @@ -2041,7 +1954,7 @@ index baa3b59..1ee3f02 100644 if ($? == 0) { diff --git a/util/libeay.num b/util/libeay.num -index e5b3c6e..8d4185c 100755 +index 2094ab3..992abb2 100755 --- a/util/libeay.num +++ b/util/libeay.num @@ -4370,7 +4370,7 @@ DH_compute_key_padded 4732 EXIST::FUNCTION:DH @@ -2054,7 +1967,7 @@ index e5b3c6e..8d4185c 100755 EVP_des_ede3_wrap 4737 EXIST::FUNCTION:DES RSA_OAEP_PARAMS_it 4738 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:RSA diff --git a/util/mkdef.pl b/util/mkdef.pl -index c57c7f7..d4c3386 100755 +index b9b159a..9841498 100755 --- a/util/mkdef.pl +++ b/util/mkdef.pl @@ -97,6 +97,8 @@ my @known_algorithms = ( "RC2", "RC4", "RC5", "IDEA", "DES", "BF", @@ -2066,7 +1979,7 @@ index c57c7f7..d4c3386 100755 # RFC3779 "RFC3779", # TLS -@@ -142,7 +144,7 @@ my $no_md2; my $no_md4; my $no_md5; my $no_sha; my $no_ripemd; my $no_mdc2; +@@ -144,7 +146,7 @@ my $no_md2; my $no_md4; my $no_md5; my $no_sha; my $no_ripemd; my $no_mdc2; my $no_rsa; my $no_dsa; my $no_dh; my $no_hmac=0; my $no_aes; my $no_krb5; my $no_ec; my $no_ecdsa; my $no_ecdh; my $no_engine; my $no_hw; my $no_fp_api; my $no_static_engine=1; my $no_gmp; my $no_deprecated; @@ -2074,8 +1987,8 @@ index c57c7f7..d4c3386 100755 +my $no_sct; my $no_rfc3779; my $no_psk; my $no_tlsext; my $no_cms; my $no_capieng; my $no_jpake; my $no_srp; my $no_ssl2; my $no_ec2m; my $no_nistp_gcc; my $no_nextprotoneg; my $no_sctp; my $no_srtp; my $no_ssl_trace; - my $no_unit_test; my $no_ssl3_method; -@@ -233,6 +235,7 @@ foreach (@ARGV, split(/ /, $options)) + my $no_unit_test; my $no_ssl3_method; my $no_ssl2_method; +@@ -235,6 +237,7 @@ foreach (@ARGV, split(/ /, $options)) elsif (/^no-engine$/) { $no_engine=1; } elsif (/^no-hw$/) { $no_hw=1; } elsif (/^no-gmp$/) { $no_gmp=1; } @@ -2083,7 +1996,7 @@ index c57c7f7..d4c3386 100755 elsif (/^no-rfc3779$/) { $no_rfc3779=1; } elsif (/^no-tlsext$/) { $no_tlsext=1; } elsif (/^no-cms$/) { $no_cms=1; } -@@ -1206,6 +1209,7 @@ sub is_valid +@@ -1209,6 +1212,7 @@ sub is_valid if ($keyword eq "FP_API" && $no_fp_api) { return 0; } if ($keyword eq "STATIC_ENGINE" && $no_static_engine) { return 0; } if ($keyword eq "GMP" && $no_gmp) { return 0; } @@ -2092,7 +2005,7 @@ index c57c7f7..d4c3386 100755 if ($keyword eq "TLSEXT" && $no_tlsext) { return 0; } if ($keyword eq "PSK" && $no_psk) { return 0; } diff --git a/util/mkerr.pl b/util/mkerr.pl -index 09ebebe..cd57ade 100644 +index c197f3a..97b295c 100644 --- a/util/mkerr.pl +++ b/util/mkerr.pl @@ -89,7 +89,7 @@ Options: @@ -2104,7 +2017,7 @@ index 09ebebe..cd57ade 100644 while the code facilitates the use of these in an environment where the error support routines are dynamically loaded at runtime. -@@ -474,7 +474,7 @@ EOF +@@ -482,7 +482,7 @@ EOF ${staticloader}void ERR_load_${lib}_strings(void); ${staticloader}void ERR_unload_${lib}_strings(void); ${staticloader}void ERR_${lib}_error(int function, int reason, char *file, int line); diff --git a/edk2.spec b/edk2.spec index 1123e5e..720774e 100644 --- a/edk2.spec +++ b/edk2.spec @@ -1,10 +1,10 @@ -%global edk2_date 20160418 -%global edk2_githash a8c39ba -%global openssl_version 1.0.2g +%global edk2_date 20161105 +%global edk2_githash 3b25ca8 +%global openssl_version 1.0.2j Name: edk2 Version: %{edk2_date}git%{edk2_githash} -Release: 5%{dist} +Release: 1%{dist} Summary: EFI Development Kit II Group: Applications/Emulators @@ -14,13 +14,14 @@ Source0: edk2-%{edk2_date}-%{edk2_githash}.tar.gz # We have to remove certain patented algorithms from the openssl source # tarball with the hobble-openssl script which is included below. # The original openssl upstream tarball cannot be shipped in the .src.rpm. -Source1: openssl-%{openssl_version}-hobbled.tar.gz +Source1: openssl-%{openssl_version}-hobbled.tar.xz Source2: hobble-openssl Source3: build-iso.sh Source9: update-tarball.sh -# Version of the OpenSSL patch that does not include the removed srp.* files. -# This is not a Patch file because we manually replace and apply it. -Source10: EDKII_openssl-1.0.2g-no-srp.patch + +# This is the version of the OpenSSL patch that EDK2 applies, but +# with all changes to srp.* files removed. +Source10: EDKII_openssl-1.0.2j-no-srp.patch # Debug output tweaks, not for upstream Patch0001: 0001-OvmfPkg-silence-EFI_D_VERBOSE-0x00400000-in-NvmExpre.patch @@ -36,11 +37,9 @@ Patch0006: 0006-EXCLUDE_SHELL_FROM_FD.patch Patch0007: 0007-OvmfPkg-EnrollDefaultKeys-application-for-enrolling-.patch # More text console resolutions. Upstreaming attempted, but failed Patch0008: 0008-MdeModulePkg-TerminalDxe-add-other-text-resolutions.patch -# Support qemu 'secondary-vga'. Not send upstream yet -Patch0009: 0009-pick-up-any-display-device-not-only-vga.patch -# Tweak the tools_def to support cross-compiling. These files are meant -# for customization, so this is not upstream. -Patch0010: 0010-prepare-tools_def-for-x86-cross.patch +# Tweak the tools_def to support cross-compiling. +# These files are meant for customization, so this is not upstream. +Patch0009: 0009-Tweak-the-tools_def-to-support-cross-compiling.patch # # actual firmware builds support cross-compiling. edk2-tools @@ -303,6 +302,9 @@ cp -a arm %{buildroot}/usr/share/%{name} %changelog +* Sun Nov 06 2016 Cole Robinson - 20161105git3b25ca8-1 +- Rebase to git master + * Fri Sep 9 2016 Tom Callaway - 20160418gita8c39ba-5 - replace legally problematic openssl source with "hobbled" tarball diff --git a/sources b/sources index e9b1065..c8c7a26 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -2ba075ea9168725aede3d43486cb4c62 edk2-20160418-a8c39ba.tar.gz -aff2adcb97ea24b98fff2a1a0f3d8162 openssl-1.0.2g-hobbled.tar.gz +6213e454f215921818fe90e65561186b edk2-20161105-3b25ca8.tar.gz +088e893a390e253a8897c3cb1b488a83 openssl-1.0.2j-hobbled.tar.xz