File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change 5555 - name : config x64
5656 working-directory : openssl/_build64
5757 run : |
58- perl ..\Configure --banner=Configured no-makedepend enable-fips VC-WIN64A
58+ perl ..\Configure --banner=Configured no-makedepend enable-fips VC-WIN64A -DOSSL_WINCTX=openssl
5959 perl configdata.pm --dump
6060 - name : build x64 binaries
6161 working-directory : openssl/_build64
7272 - name : config x32
7373 working-directory : openssl/_build32
7474 run : |
75- perl ..\Configure --banner=Configured no-makedepend enable-fips VC-WIN32
75+ perl ..\Configure --banner=Configured no-makedepend enable-fips VC-WIN32 -DOSSL_WINCTX=openssl
7676 perl configdata.pm --dump
7777 - name : build x32 binaries
7878 working-directory : openssl/_build32
8282 run : nmake /S DESTDIR=..\_install32 install
8383 - name : build installer
8484 working-directory : windows-installer
85- run : nmake INSTVERSION=${{ github.event.inputs.version }} INSTBUILD32=../openssl/_install32 INSTBUILD64=../openssl/_install64 INSTLICENSE=../openssl/LICENSE.txt openssl-installer
85+ run : nmake INSTVERSION=${{ github.event.inputs.version }} INSTCTX=openssl INSTBUILD32=../openssl/_install32 INSTBUILD64=../openssl/_install64 INSTLICENSE=../openssl/LICENSE.txt openssl-installer
8686 - name : Upload installer as artifact
8787 uses : actions/upload-artifact@v4
8888 with :
Original file line number Diff line number Diff line change @@ -12,6 +12,8 @@ NSISOPTS=$(NSISOPTS) /DBUILD64=$(INSTBUILD64)
1212!IFDEF INSTLICENSE
1313NSISOPTS =$(NSISOPTS ) /DLICENSE_FILE=$(INSTLICENSE )
1414!ENDIF
15+ !IFDEF INSTCTX
16+ NSISOPTS =$(NSISOPTS ) /DCTX=$(INSTCTX )
1517
1618openssl-installer : openssl.nsi
1719 echo $(NSISOPTS )
Original file line number Diff line number Diff line change @@ -82,7 +82,7 @@ Section
8282SectionEnd
8383
8484!define env_hklm ' HKLM "SYSTEM\CurrentControlSet\Control\Session Manager\Environment"'
85- !define openssl_hklm ' HKLM "SOFTWARE\OpenSSL"'
85+ !define openssl_hklm ' HKLM "SOFTWARE\OpenSSL-${VERSION}-${CTX} "'
8686
8787# This is run on uninstall
8888Section " Uninstall"
You can’t perform that action at this time.
0 commit comments