From 7f667f5761e73de70befb8bedb5586cf6a988ec9 Mon Sep 17 00:00:00 2001 From: Dave Page Date: Thu, 8 Aug 2019 15:07:01 +0100 Subject: [PATCH] Add support for OpenSSL 1.1.1 to the Windows installer build. --- Make.bat | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/Make.bat b/Make.bat index e916ba037..11b6f6d82 100644 --- a/Make.bat +++ b/Make.bat @@ -280,8 +280,15 @@ REM Main build sequence Ends ECHO Staging PostgreSQL components... COPY "%PGDIR%\bin\libpq.dll" "%PGBUILDPATH%\runtime" > nul || EXIT /B 1 - COPY "%PGDIR%\bin\ssleay32.dll" "%PGBUILDPATH%\runtime" > nul || EXIT /B 1 - COPY "%PGDIR%\bin\libeay32.dll" "%PGBUILDPATH%\runtime" > nul || EXIT /B 1 + IF EXIST "%PGDIR%\bin\libcrypto-1_1.dll" ( + REM OpenSSL 1.1.1 + COPY "%PGDIR%\bin\libcrypto-1_1.dll" "%PGBUILDPATH%\runtime" > nul || EXIT /B 1 + COPY "%PGDIR%\bin\libssl-1_1.dll" "%PGBUILDPATH%\runtime" > nul || EXIT /B 1 + ) ELSE ( + REM OpenSSL 1.0.2 + COPY "%PGDIR%\bin\ssleay32.dll" "%PGBUILDPATH%\runtime" > nul || EXIT /B 1 + COPY "%PGDIR%\bin\libeay32.dll" "%PGBUILDPATH%\runtime" > nul || EXIT /B 1 + ) IF EXIST "%PGDIR%\bin\libintl-*.dll" COPY "%PGDIR%\bin\libintl-*.dll" "%PGBUILDPATH%\runtime" > nul || EXIT /B 1 IF EXIST "%PGDIR%\bin\libiconv-*.dll" COPY "%PGDIR%\bin\libiconv-*.dll" "%PGBUILDPATH%\runtime" > nul || EXIT /B 1 IF EXIST "%PGDIR%\bin\zlib.dll" COPY "%PGDIR%\bin\zlib.dll" "%PGBUILDPATH%\runtime" > nul || EXIT /B 1