Skip to content

Commit 5d97c13

Browse files
committed
Add OSSL_WINCTX support to the installer
Reviewed-by: Richard Levitte <levitte@openssl.org> Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from #6)
1 parent 13a776b commit 5d97c13

3 files changed

Lines changed: 6 additions & 4 deletions

File tree

.github/workflows/windows-installer.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
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
@@ -72,7 +72,7 @@ jobs:
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
@@ -82,7 +82,7 @@ jobs:
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:

windows-installer/Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ NSISOPTS=$(NSISOPTS) /DBUILD64=$(INSTBUILD64)
1212
!IFDEF INSTLICENSE
1313
NSISOPTS=$(NSISOPTS) /DLICENSE_FILE=$(INSTLICENSE)
1414
!ENDIF
15+
!IFDEF INSTCTX
16+
NSISOPTS=$(NSISOPTS) /DCTX=$(INSTCTX)
1517

1618
openssl-installer: openssl.nsi
1719
echo $(NSISOPTS)

windows-installer/openssl.nsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ Section
8282
SectionEnd
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
8888
Section "Uninstall"

0 commit comments

Comments
 (0)