Fossil SCM

Add configurations "enable-capieng" (use Windows Certificate Store) and "no-weak-ssl-ciphers" (disable RC4 support)

jan.nijtmans 2018-08-24 08:25 openssl-1.1
Commit b5a11142ee080ccf2cf6025890916ad8063b9ede2f54b083580013a0376a8402
Parent cbdbc0a0ceaba9f…
4 files changed +4 -4 +2 -2 +5 -5 +4 -4
~ src/makemake.tcl ~ win/Makefile.mingw ~ win/Makefile.mingw.mistachkin ~ win/Makefile.msc
M src/makemake.tcl
+4 -4
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -695,11 +695,11 @@
695695
 endif
696696
697697
 #### Disable creation of the OpenSSL shared libraries. Also, disable support
698698
 # for SSLv3 (i.e. thereby forcing the use of TLS).
699699
 #
700
-SSLCONFIG += no-ssl3 no-shared
700
+SSLCONFIG += no-ssl3 enable-capieng no-weak-ssl-ciphers no-shared
701701
702702
 #### When using zlib, make sure that OpenSSL is configured to use the zlib
703703
 # that Fossil knows about (i.e. the one within the source tree).
704704
 #
705705
 ifndef FOSSIL_ENABLE_MINIZ
@@ -1577,11 +1577,11 @@
15771577
 SSLLFLAGS = /nologo /opt:ref /debug
15781578
 SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib crypt32.lib
15791579
 !if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64"
15801580
 !message Using 'x64' platform for OpenSSL...
15811581
 # BUGBUG (OpenSSL): Using "no-ssl*" here breaks the build.
1582
-# SSLCONFIG = VC-WIN64A no-asm no-ssl3
1582
+# SSLCONFIG = VC-WIN64A no-asm no-ssl3 enable-capieng no-weak-ssl-ciphers
15831583
 SSLCONFIG = VC-WIN64A no-asm
15841584
 !if $(FOSSIL_DYNAMIC_BUILD)!=0
15851585
 SSLCONFIG = $(SSLCONFIG) shared
15861586
 !else
15871587
 SSLCONFIG = $(SSLCONFIG) no-shared
@@ -1597,11 +1597,11 @@
15971597
 SSLCFLAGS = -DOPENSSL_NO_SSL3
15981598
 !endif
15991599
 !elseif "$(PLATFORM)"=="ia64"
16001600
 !message Using 'ia64' platform for OpenSSL...
16011601
 # BUGBUG (OpenSSL): Using "no-ssl*" here breaks the build.
1602
-# SSLCONFIG = VC-WIN64I no-asm no-ssl3
1602
+# SSLCONFIG = VC-WIN64I no-asm no-ssl3 enable-capieng no-weak-ssl-ciphers
16031603
 SSLCONFIG = VC-WIN64I no-asm
16041604
 !if $(FOSSIL_DYNAMIC_BUILD)!=0
16051605
 SSLCONFIG = $(SSLCONFIG) shared
16061606
 !else
16071607
 SSLCONFIG = $(SSLCONFIG) no-shared
@@ -1617,11 +1617,11 @@
16171617
 SSLCFLAGS = -DOPENSSL_NO_SSL3
16181618
 !endif
16191619
 !else
16201620
 !message Assuming 'x86' platform for OpenSSL...
16211621
 # BUGBUG (OpenSSL): Using "no-ssl*" here breaks the build.
1622
-# SSLCONFIG = VC-WIN32 no-asm no-ssl3
1622
+# SSLCONFIG = VC-WIN32 no-asm no-ssl3 enable-capieng no-weak-ssl-ciphers
16231623
 SSLCONFIG = VC-WIN32 no-asm
16241624
 !if $(FOSSIL_DYNAMIC_BUILD)!=0
16251625
 SSLCONFIG = $(SSLCONFIG) shared
16261626
 !else
16271627
 SSLCONFIG = $(SSLCONFIG) no-shared
16281628
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -695,11 +695,11 @@
695 endif
696
697 #### Disable creation of the OpenSSL shared libraries. Also, disable support
698 # for SSLv3 (i.e. thereby forcing the use of TLS).
699 #
700 SSLCONFIG += no-ssl3 no-shared
701
702 #### When using zlib, make sure that OpenSSL is configured to use the zlib
703 # that Fossil knows about (i.e. the one within the source tree).
704 #
705 ifndef FOSSIL_ENABLE_MINIZ
@@ -1577,11 +1577,11 @@
1577 SSLLFLAGS = /nologo /opt:ref /debug
1578 SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib crypt32.lib
1579 !if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64"
1580 !message Using 'x64' platform for OpenSSL...
1581 # BUGBUG (OpenSSL): Using "no-ssl*" here breaks the build.
1582 # SSLCONFIG = VC-WIN64A no-asm no-ssl3
1583 SSLCONFIG = VC-WIN64A no-asm
1584 !if $(FOSSIL_DYNAMIC_BUILD)!=0
1585 SSLCONFIG = $(SSLCONFIG) shared
1586 !else
1587 SSLCONFIG = $(SSLCONFIG) no-shared
@@ -1597,11 +1597,11 @@
1597 SSLCFLAGS = -DOPENSSL_NO_SSL3
1598 !endif
1599 !elseif "$(PLATFORM)"=="ia64"
1600 !message Using 'ia64' platform for OpenSSL...
1601 # BUGBUG (OpenSSL): Using "no-ssl*" here breaks the build.
1602 # SSLCONFIG = VC-WIN64I no-asm no-ssl3
1603 SSLCONFIG = VC-WIN64I no-asm
1604 !if $(FOSSIL_DYNAMIC_BUILD)!=0
1605 SSLCONFIG = $(SSLCONFIG) shared
1606 !else
1607 SSLCONFIG = $(SSLCONFIG) no-shared
@@ -1617,11 +1617,11 @@
1617 SSLCFLAGS = -DOPENSSL_NO_SSL3
1618 !endif
1619 !else
1620 !message Assuming 'x86' platform for OpenSSL...
1621 # BUGBUG (OpenSSL): Using "no-ssl*" here breaks the build.
1622 # SSLCONFIG = VC-WIN32 no-asm no-ssl3
1623 SSLCONFIG = VC-WIN32 no-asm
1624 !if $(FOSSIL_DYNAMIC_BUILD)!=0
1625 SSLCONFIG = $(SSLCONFIG) shared
1626 !else
1627 SSLCONFIG = $(SSLCONFIG) no-shared
1628
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -695,11 +695,11 @@
695 endif
696
697 #### Disable creation of the OpenSSL shared libraries. Also, disable support
698 # for SSLv3 (i.e. thereby forcing the use of TLS).
699 #
700 SSLCONFIG += no-ssl3 enable-capieng no-weak-ssl-ciphers no-shared
701
702 #### When using zlib, make sure that OpenSSL is configured to use the zlib
703 # that Fossil knows about (i.e. the one within the source tree).
704 #
705 ifndef FOSSIL_ENABLE_MINIZ
@@ -1577,11 +1577,11 @@
1577 SSLLFLAGS = /nologo /opt:ref /debug
1578 SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib crypt32.lib
1579 !if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64"
1580 !message Using 'x64' platform for OpenSSL...
1581 # BUGBUG (OpenSSL): Using "no-ssl*" here breaks the build.
1582 # SSLCONFIG = VC-WIN64A no-asm no-ssl3 enable-capieng no-weak-ssl-ciphers
1583 SSLCONFIG = VC-WIN64A no-asm
1584 !if $(FOSSIL_DYNAMIC_BUILD)!=0
1585 SSLCONFIG = $(SSLCONFIG) shared
1586 !else
1587 SSLCONFIG = $(SSLCONFIG) no-shared
@@ -1597,11 +1597,11 @@
1597 SSLCFLAGS = -DOPENSSL_NO_SSL3
1598 !endif
1599 !elseif "$(PLATFORM)"=="ia64"
1600 !message Using 'ia64' platform for OpenSSL...
1601 # BUGBUG (OpenSSL): Using "no-ssl*" here breaks the build.
1602 # SSLCONFIG = VC-WIN64I no-asm no-ssl3 enable-capieng no-weak-ssl-ciphers
1603 SSLCONFIG = VC-WIN64I no-asm
1604 !if $(FOSSIL_DYNAMIC_BUILD)!=0
1605 SSLCONFIG = $(SSLCONFIG) shared
1606 !else
1607 SSLCONFIG = $(SSLCONFIG) no-shared
@@ -1617,11 +1617,11 @@
1617 SSLCFLAGS = -DOPENSSL_NO_SSL3
1618 !endif
1619 !else
1620 !message Assuming 'x86' platform for OpenSSL...
1621 # BUGBUG (OpenSSL): Using "no-ssl*" here breaks the build.
1622 # SSLCONFIG = VC-WIN32 no-asm no-ssl3 enable-capieng no-weak-ssl-ciphers
1623 SSLCONFIG = VC-WIN32 no-asm
1624 !if $(FOSSIL_DYNAMIC_BUILD)!=0
1625 SSLCONFIG = $(SSLCONFIG) shared
1626 !else
1627 SSLCONFIG = $(SSLCONFIG) no-shared
1628
M win/Makefile.mingw
+2 -2
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -160,11 +160,11 @@
160160
 endif
161161
162162
 #### Disable creation of the OpenSSL shared libraries. Also, disable support
163163
 # for SSLv3 (i.e. thereby forcing the use of TLS).
164164
 #
165
-SSLCONFIG += no-ssl3 no-shared
165
+SSLCONFIG += no-ssl3 enable-capieng no-weak-ssl-ciphers no-shared
166166
167167
 #### When using zlib, make sure that OpenSSL is configured to use the zlib
168168
 # that Fossil knows about (i.e. the one within the source tree).
169169
 #
170170
 ifndef FOSSIL_ENABLE_MINIZ
@@ -174,11 +174,11 @@
174174
 #### The directories where the OpenSSL include and library files are located.
175175
 # The recommended usage here is to use the Sysinternals junction tool
176176
 # to create a hard link between an "openssl-1.x" sub-directory of the
177177
 # Fossil source code directory and the target OpenSSL source directory.
178178
 #
179
-OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.1.1-pre8
179
+OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.1.1-pre9
180180
 OPENSSLINCDIR = $(OPENSSLDIR)/include
181181
 OPENSSLLIBDIR = $(OPENSSLDIR)
182182
183183
 #### Either the directory where the Tcl library is installed or the Tcl
184184
 # source code directory resides (depending on the value of the macro
185185
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -160,11 +160,11 @@
160 endif
161
162 #### Disable creation of the OpenSSL shared libraries. Also, disable support
163 # for SSLv3 (i.e. thereby forcing the use of TLS).
164 #
165 SSLCONFIG += no-ssl3 no-shared
166
167 #### When using zlib, make sure that OpenSSL is configured to use the zlib
168 # that Fossil knows about (i.e. the one within the source tree).
169 #
170 ifndef FOSSIL_ENABLE_MINIZ
@@ -174,11 +174,11 @@
174 #### The directories where the OpenSSL include and library files are located.
175 # The recommended usage here is to use the Sysinternals junction tool
176 # to create a hard link between an "openssl-1.x" sub-directory of the
177 # Fossil source code directory and the target OpenSSL source directory.
178 #
179 OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.1.1-pre8
180 OPENSSLINCDIR = $(OPENSSLDIR)/include
181 OPENSSLLIBDIR = $(OPENSSLDIR)
182
183 #### Either the directory where the Tcl library is installed or the Tcl
184 # source code directory resides (depending on the value of the macro
185
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -160,11 +160,11 @@
160 endif
161
162 #### Disable creation of the OpenSSL shared libraries. Also, disable support
163 # for SSLv3 (i.e. thereby forcing the use of TLS).
164 #
165 SSLCONFIG += no-ssl3 enable-capieng no-weak-ssl-ciphers no-shared
166
167 #### When using zlib, make sure that OpenSSL is configured to use the zlib
168 # that Fossil knows about (i.e. the one within the source tree).
169 #
170 ifndef FOSSIL_ENABLE_MINIZ
@@ -174,11 +174,11 @@
174 #### The directories where the OpenSSL include and library files are located.
175 # The recommended usage here is to use the Sysinternals junction tool
176 # to create a hard link between an "openssl-1.x" sub-directory of the
177 # Fossil source code directory and the target OpenSSL source directory.
178 #
179 OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.1.1-pre9
180 OPENSSLINCDIR = $(OPENSSLDIR)/include
181 OPENSSLLIBDIR = $(OPENSSLDIR)
182
183 #### Either the directory where the Tcl library is installed or the Tcl
184 # source code directory resides (depending on the value of the macro
185
M win/Makefile.mingw.mistachkin
+5 -5
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -17,14 +17,14 @@
1717
 #
1818
1919
 #### Select one of MinGW, MinGW-w64 (32-bit) or MinGW-w64 (64-bit) compilers.
2020
 # By default, this is an empty string (i.e. use the native compiler).
2121
 #
22
-PREFIX =
22
+# PREFIX =
2323
 # PREFIX = mingw32-
2424
 # PREFIX = i686-pc-mingw32-
25
-# PREFIX = i686-w64-mingw32-
25
+PREFIX = i686-w64-mingw32-
2626
 # PREFIX = x86_64-w64-mingw32-
2727
2828
 #### The toplevel directory of the source tree. Fossil can be built
2929
 # in a directory that is separate from the source tree. Just change
3030
 # the following to point from the build directory to the src/ folder.
@@ -63,15 +63,15 @@
6363
 FOSSIL_ENABLE_SSL = 1
6464
6565
 #### Automatically build OpenSSL when building Fossil (causes rebuild
6666
 # issues when building incrementally).
6767
 #
68
-# FOSSIL_BUILD_SSL = 1
68
+FOSSIL_BUILD_SSL = 1
6969
7070
 #### Enable relative paths in external diff/gdiff
7171
 #
72
-# FOSSIL_ENABLE_EXEC_REL_PATHS = 1
72
+FOSSIL_ENABLE_EXEC_REL_PATHS = 1
7373
7474
 #### Enable legacy treatment of mv/rm (skip checkout files)
7575
 #
7676
 FOSSIL_ENABLE_LEGACY_MV_RM = 1
7777
@@ -160,11 +160,11 @@
160160
 endif
161161
162162
 #### Disable creation of the OpenSSL shared libraries. Also, disable support
163163
 # for SSLv3 (i.e. thereby forcing the use of TLS).
164164
 #
165
-SSLCONFIG += no-ssl3 no-shared
165
+SSLCONFIG += no-ssl3 enable-capieng no-weak-ssl-ciphers no-shared
166166
167167
 #### When using zlib, make sure that OpenSSL is configured to use the zlib
168168
 # that Fossil knows about (i.e. the one within the source tree).
169169
 #
170170
 ifndef FOSSIL_ENABLE_MINIZ
171171
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -17,14 +17,14 @@
17 #
18
19 #### Select one of MinGW, MinGW-w64 (32-bit) or MinGW-w64 (64-bit) compilers.
20 # By default, this is an empty string (i.e. use the native compiler).
21 #
22 PREFIX =
23 # PREFIX = mingw32-
24 # PREFIX = i686-pc-mingw32-
25 # PREFIX = i686-w64-mingw32-
26 # PREFIX = x86_64-w64-mingw32-
27
28 #### The toplevel directory of the source tree. Fossil can be built
29 # in a directory that is separate from the source tree. Just change
30 # the following to point from the build directory to the src/ folder.
@@ -63,15 +63,15 @@
63 FOSSIL_ENABLE_SSL = 1
64
65 #### Automatically build OpenSSL when building Fossil (causes rebuild
66 # issues when building incrementally).
67 #
68 # FOSSIL_BUILD_SSL = 1
69
70 #### Enable relative paths in external diff/gdiff
71 #
72 # FOSSIL_ENABLE_EXEC_REL_PATHS = 1
73
74 #### Enable legacy treatment of mv/rm (skip checkout files)
75 #
76 FOSSIL_ENABLE_LEGACY_MV_RM = 1
77
@@ -160,11 +160,11 @@
160 endif
161
162 #### Disable creation of the OpenSSL shared libraries. Also, disable support
163 # for SSLv3 (i.e. thereby forcing the use of TLS).
164 #
165 SSLCONFIG += no-ssl3 no-shared
166
167 #### When using zlib, make sure that OpenSSL is configured to use the zlib
168 # that Fossil knows about (i.e. the one within the source tree).
169 #
170 ifndef FOSSIL_ENABLE_MINIZ
171
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -17,14 +17,14 @@
17 #
18
19 #### Select one of MinGW, MinGW-w64 (32-bit) or MinGW-w64 (64-bit) compilers.
20 # By default, this is an empty string (i.e. use the native compiler).
21 #
22 # PREFIX =
23 # PREFIX = mingw32-
24 # PREFIX = i686-pc-mingw32-
25 PREFIX = i686-w64-mingw32-
26 # PREFIX = x86_64-w64-mingw32-
27
28 #### The toplevel directory of the source tree. Fossil can be built
29 # in a directory that is separate from the source tree. Just change
30 # the following to point from the build directory to the src/ folder.
@@ -63,15 +63,15 @@
63 FOSSIL_ENABLE_SSL = 1
64
65 #### Automatically build OpenSSL when building Fossil (causes rebuild
66 # issues when building incrementally).
67 #
68 FOSSIL_BUILD_SSL = 1
69
70 #### Enable relative paths in external diff/gdiff
71 #
72 FOSSIL_ENABLE_EXEC_REL_PATHS = 1
73
74 #### Enable legacy treatment of mv/rm (skip checkout files)
75 #
76 FOSSIL_ENABLE_LEGACY_MV_RM = 1
77
@@ -160,11 +160,11 @@
160 endif
161
162 #### Disable creation of the OpenSSL shared libraries. Also, disable support
163 # for SSLv3 (i.e. thereby forcing the use of TLS).
164 #
165 SSLCONFIG += no-ssl3 enable-capieng no-weak-ssl-ciphers no-shared
166
167 #### When using zlib, make sure that OpenSSL is configured to use the zlib
168 # that Fossil knows about (i.e. the one within the source tree).
169 #
170 ifndef FOSSIL_ENABLE_MINIZ
171
M win/Makefile.msc
+4 -4
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -98,11 +98,11 @@
9898
 !ifndef USE_SEE
9999
 USE_SEE = 0
100100
 !endif
101101
102102
 !if $(FOSSIL_ENABLE_SSL)!=0
103
-SSLDIR = $(B)\compat\openssl-1.1.1-pre8
103
+SSLDIR = $(B)\compat\openssl-1.1.1-pre9
104104
 SSLINCDIR = $(SSLDIR)\inc32
105105
 !if $(FOSSIL_DYNAMIC_BUILD)!=0
106106
 SSLLIBDIR = $(SSLDIR)\out32dll
107107
 !else
108108
 SSLLIBDIR = $(SSLDIR)\out32
@@ -110,11 +110,11 @@
110110
 SSLLFLAGS = /nologo /opt:ref /debug
111111
 SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib crypt32.lib
112112
 !if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64"
113113
 !message Using 'x64' platform for OpenSSL...
114114
 # BUGBUG (OpenSSL): Using "no-ssl*" here breaks the build.
115
-# SSLCONFIG = VC-WIN64A no-asm no-ssl3
115
+# SSLCONFIG = VC-WIN64A no-asm no-ssl3 enable-capieng no-weak-ssl-ciphers
116116
 SSLCONFIG = VC-WIN64A no-asm
117117
 !if $(FOSSIL_DYNAMIC_BUILD)!=0
118118
 SSLCONFIG = $(SSLCONFIG) shared
119119
 !else
120120
 SSLCONFIG = $(SSLCONFIG) no-shared
@@ -130,11 +130,11 @@
130130
 SSLCFLAGS = -DOPENSSL_NO_SSL3
131131
 !endif
132132
 !elseif "$(PLATFORM)"=="ia64"
133133
 !message Using 'ia64' platform for OpenSSL...
134134
 # BUGBUG (OpenSSL): Using "no-ssl*" here breaks the build.
135
-# SSLCONFIG = VC-WIN64I no-asm no-ssl3
135
+# SSLCONFIG = VC-WIN64I no-asm no-ssl3 enable-capieng no-weak-ssl-ciphers
136136
 SSLCONFIG = VC-WIN64I no-asm
137137
 !if $(FOSSIL_DYNAMIC_BUILD)!=0
138138
 SSLCONFIG = $(SSLCONFIG) shared
139139
 !else
140140
 SSLCONFIG = $(SSLCONFIG) no-shared
@@ -150,11 +150,11 @@
150150
 SSLCFLAGS = -DOPENSSL_NO_SSL3
151151
 !endif
152152
 !else
153153
 !message Assuming 'x86' platform for OpenSSL...
154154
 # BUGBUG (OpenSSL): Using "no-ssl*" here breaks the build.
155
-# SSLCONFIG = VC-WIN32 no-asm no-ssl3
155
+# SSLCONFIG = VC-WIN32 no-asm no-ssl3 enable-capieng no-weak-ssl-ciphers
156156
 SSLCONFIG = VC-WIN32 no-asm
157157
 !if $(FOSSIL_DYNAMIC_BUILD)!=0
158158
 SSLCONFIG = $(SSLCONFIG) shared
159159
 !else
160160
 SSLCONFIG = $(SSLCONFIG) no-shared
161161
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -98,11 +98,11 @@
98 !ifndef USE_SEE
99 USE_SEE = 0
100 !endif
101
102 !if $(FOSSIL_ENABLE_SSL)!=0
103 SSLDIR = $(B)\compat\openssl-1.1.1-pre8
104 SSLINCDIR = $(SSLDIR)\inc32
105 !if $(FOSSIL_DYNAMIC_BUILD)!=0
106 SSLLIBDIR = $(SSLDIR)\out32dll
107 !else
108 SSLLIBDIR = $(SSLDIR)\out32
@@ -110,11 +110,11 @@
110 SSLLFLAGS = /nologo /opt:ref /debug
111 SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib crypt32.lib
112 !if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64"
113 !message Using 'x64' platform for OpenSSL...
114 # BUGBUG (OpenSSL): Using "no-ssl*" here breaks the build.
115 # SSLCONFIG = VC-WIN64A no-asm no-ssl3
116 SSLCONFIG = VC-WIN64A no-asm
117 !if $(FOSSIL_DYNAMIC_BUILD)!=0
118 SSLCONFIG = $(SSLCONFIG) shared
119 !else
120 SSLCONFIG = $(SSLCONFIG) no-shared
@@ -130,11 +130,11 @@
130 SSLCFLAGS = -DOPENSSL_NO_SSL3
131 !endif
132 !elseif "$(PLATFORM)"=="ia64"
133 !message Using 'ia64' platform for OpenSSL...
134 # BUGBUG (OpenSSL): Using "no-ssl*" here breaks the build.
135 # SSLCONFIG = VC-WIN64I no-asm no-ssl3
136 SSLCONFIG = VC-WIN64I no-asm
137 !if $(FOSSIL_DYNAMIC_BUILD)!=0
138 SSLCONFIG = $(SSLCONFIG) shared
139 !else
140 SSLCONFIG = $(SSLCONFIG) no-shared
@@ -150,11 +150,11 @@
150 SSLCFLAGS = -DOPENSSL_NO_SSL3
151 !endif
152 !else
153 !message Assuming 'x86' platform for OpenSSL...
154 # BUGBUG (OpenSSL): Using "no-ssl*" here breaks the build.
155 # SSLCONFIG = VC-WIN32 no-asm no-ssl3
156 SSLCONFIG = VC-WIN32 no-asm
157 !if $(FOSSIL_DYNAMIC_BUILD)!=0
158 SSLCONFIG = $(SSLCONFIG) shared
159 !else
160 SSLCONFIG = $(SSLCONFIG) no-shared
161
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -98,11 +98,11 @@
98 !ifndef USE_SEE
99 USE_SEE = 0
100 !endif
101
102 !if $(FOSSIL_ENABLE_SSL)!=0
103 SSLDIR = $(B)\compat\openssl-1.1.1-pre9
104 SSLINCDIR = $(SSLDIR)\inc32
105 !if $(FOSSIL_DYNAMIC_BUILD)!=0
106 SSLLIBDIR = $(SSLDIR)\out32dll
107 !else
108 SSLLIBDIR = $(SSLDIR)\out32
@@ -110,11 +110,11 @@
110 SSLLFLAGS = /nologo /opt:ref /debug
111 SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib crypt32.lib
112 !if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64"
113 !message Using 'x64' platform for OpenSSL...
114 # BUGBUG (OpenSSL): Using "no-ssl*" here breaks the build.
115 # SSLCONFIG = VC-WIN64A no-asm no-ssl3 enable-capieng no-weak-ssl-ciphers
116 SSLCONFIG = VC-WIN64A no-asm
117 !if $(FOSSIL_DYNAMIC_BUILD)!=0
118 SSLCONFIG = $(SSLCONFIG) shared
119 !else
120 SSLCONFIG = $(SSLCONFIG) no-shared
@@ -130,11 +130,11 @@
130 SSLCFLAGS = -DOPENSSL_NO_SSL3
131 !endif
132 !elseif "$(PLATFORM)"=="ia64"
133 !message Using 'ia64' platform for OpenSSL...
134 # BUGBUG (OpenSSL): Using "no-ssl*" here breaks the build.
135 # SSLCONFIG = VC-WIN64I no-asm no-ssl3 enable-capieng no-weak-ssl-ciphers
136 SSLCONFIG = VC-WIN64I no-asm
137 !if $(FOSSIL_DYNAMIC_BUILD)!=0
138 SSLCONFIG = $(SSLCONFIG) shared
139 !else
140 SSLCONFIG = $(SSLCONFIG) no-shared
@@ -150,11 +150,11 @@
150 SSLCFLAGS = -DOPENSSL_NO_SSL3
151 !endif
152 !else
153 !message Assuming 'x86' platform for OpenSSL...
154 # BUGBUG (OpenSSL): Using "no-ssl*" here breaks the build.
155 # SSLCONFIG = VC-WIN32 no-asm no-ssl3 enable-capieng no-weak-ssl-ciphers
156 SSLCONFIG = VC-WIN32 no-asm
157 !if $(FOSSIL_DYNAMIC_BUILD)!=0
158 SSLCONFIG = $(SSLCONFIG) shared
159 !else
160 SSLCONFIG = $(SSLCONFIG) no-shared
161

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button