Fossil SCM
Merge trunk. Upgrade to OpenSSL 1.1.0f. Note that this branch only adapts the Windows buildfiles, no source-code or anything else, since Openssl 1.1.0 is (almost, not significant for fossil) upwards compatible.
Commit
4a516fb72cd277cfbc54c44346ed58d702dc2c07cc596b28c157f6f80499cec5
Parent
e76f3bbe45dcefd…
10 files changed
+10
-10
+10
-10
+3
-3
+3
-3
+3
-3
+3
-3
+7
-7
+7
-7
+1
-1
+1
-1
+10
-10
| --- src/makemake.tcl | ||
| +++ src/makemake.tcl | ||
| @@ -660,13 +660,13 @@ | ||
| 660 | 660 | ZLIBCONFIG = |
| 661 | 661 | ZLIBTARGETS = |
| 662 | 662 | endif |
| 663 | 663 | |
| 664 | 664 | #### Disable creation of the OpenSSL shared libraries. Also, disable support |
| 665 | -# for both SSLv2 and SSLv3 (i.e. thereby forcing the use of TLS). | |
| 665 | +# for SSLv3 (i.e. thereby forcing the use of TLS). | |
| 666 | 666 | # |
| 667 | -SSLCONFIG += no-ssl2 no-ssl3 no-shared | |
| 667 | +SSLCONFIG += no-ssl3 no-shared | |
| 668 | 668 | |
| 669 | 669 | #### When using zlib, make sure that OpenSSL is configured to use the zlib |
| 670 | 670 | # that Fossil knows about (i.e. the one within the source tree). |
| 671 | 671 | # |
| 672 | 672 | ifndef FOSSIL_ENABLE_MINIZ |
| @@ -676,11 +676,11 @@ | ||
| 676 | 676 | #### The directories where the OpenSSL include and library files are located. |
| 677 | 677 | # The recommended usage here is to use the Sysinternals junction tool |
| 678 | 678 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 679 | 679 | # Fossil source code directory and the target OpenSSL source directory. |
| 680 | 680 | # |
| 681 | -OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2k | |
| 681 | +OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.1.0f | |
| 682 | 682 | OPENSSLINCDIR = $(OPENSSLDIR)/include |
| 683 | 683 | OPENSSLLIBDIR = $(OPENSSLDIR) |
| 684 | 684 | |
| 685 | 685 | #### Either the directory where the Tcl library is installed or the Tcl |
| 686 | 686 | # source code directory resides (depending on the value of the macro |
| @@ -1507,11 +1507,11 @@ | ||
| 1507 | 1507 | !ifndef USE_SEE |
| 1508 | 1508 | USE_SEE = 0 |
| 1509 | 1509 | !endif |
| 1510 | 1510 | |
| 1511 | 1511 | !if $(FOSSIL_ENABLE_SSL)!=0 |
| 1512 | -SSLDIR = $(B)\compat\openssl-1.0.2k | |
| 1512 | +SSLDIR = $(B)\compat\openssl-1.1.0f | |
| 1513 | 1513 | SSLINCDIR = $(SSLDIR)\inc32 |
| 1514 | 1514 | !if $(FOSSIL_DYNAMIC_BUILD)!=0 |
| 1515 | 1515 | SSLLIBDIR = $(SSLDIR)\out32dll |
| 1516 | 1516 | !else |
| 1517 | 1517 | SSLLIBDIR = $(SSLDIR)\out32 |
| @@ -1519,11 +1519,11 @@ | ||
| 1519 | 1519 | SSLLFLAGS = /nologo /opt:ref /debug |
| 1520 | 1520 | SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib crypt32.lib |
| 1521 | 1521 | !if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64" |
| 1522 | 1522 | !message Using 'x64' platform for OpenSSL... |
| 1523 | 1523 | # BUGBUG (OpenSSL): Using "no-ssl*" here breaks the build. |
| 1524 | -# SSLCONFIG = VC-WIN64A no-asm no-ssl2 no-ssl3 | |
| 1524 | +# SSLCONFIG = VC-WIN64A no-asm no-ssl3 | |
| 1525 | 1525 | SSLCONFIG = VC-WIN64A no-asm |
| 1526 | 1526 | !if $(FOSSIL_DYNAMIC_BUILD)!=0 |
| 1527 | 1527 | SSLCONFIG = $(SSLCONFIG) shared |
| 1528 | 1528 | !else |
| 1529 | 1529 | SSLCONFIG = $(SSLCONFIG) no-shared |
| @@ -1534,16 +1534,16 @@ | ||
| 1534 | 1534 | !else |
| 1535 | 1535 | SSLNMAKE = ms\nt.mak all |
| 1536 | 1536 | !endif |
| 1537 | 1537 | # BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds. |
| 1538 | 1538 | !if $(FOSSIL_DYNAMIC_BUILD)==0 |
| 1539 | -SSLCFLAGS = -DOPENSSL_NO_SSL2 -DOPENSSL_NO_SSL3 | |
| 1539 | +SSLCFLAGS = -DOPENSSL_NO_SSL3 | |
| 1540 | 1540 | !endif |
| 1541 | 1541 | !elseif "$(PLATFORM)"=="ia64" |
| 1542 | 1542 | !message Using 'ia64' platform for OpenSSL... |
| 1543 | 1543 | # BUGBUG (OpenSSL): Using "no-ssl*" here breaks the build. |
| 1544 | -# SSLCONFIG = VC-WIN64I no-asm no-ssl2 no-ssl3 | |
| 1544 | +# SSLCONFIG = VC-WIN64I no-asm no-ssl3 | |
| 1545 | 1545 | SSLCONFIG = VC-WIN64I no-asm |
| 1546 | 1546 | !if $(FOSSIL_DYNAMIC_BUILD)!=0 |
| 1547 | 1547 | SSLCONFIG = $(SSLCONFIG) shared |
| 1548 | 1548 | !else |
| 1549 | 1549 | SSLCONFIG = $(SSLCONFIG) no-shared |
| @@ -1554,16 +1554,16 @@ | ||
| 1554 | 1554 | !else |
| 1555 | 1555 | SSLNMAKE = ms\nt.mak all |
| 1556 | 1556 | !endif |
| 1557 | 1557 | # BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds. |
| 1558 | 1558 | !if $(FOSSIL_DYNAMIC_BUILD)==0 |
| 1559 | -SSLCFLAGS = -DOPENSSL_NO_SSL2 -DOPENSSL_NO_SSL3 | |
| 1559 | +SSLCFLAGS = -DOPENSSL_NO_SSL3 | |
| 1560 | 1560 | !endif |
| 1561 | 1561 | !else |
| 1562 | 1562 | !message Assuming 'x86' platform for OpenSSL... |
| 1563 | 1563 | # BUGBUG (OpenSSL): Using "no-ssl*" here breaks the build. |
| 1564 | -# SSLCONFIG = VC-WIN32 no-asm no-ssl2 no-ssl3 | |
| 1564 | +# SSLCONFIG = VC-WIN32 no-asm no-ssl3 | |
| 1565 | 1565 | SSLCONFIG = VC-WIN32 no-asm |
| 1566 | 1566 | !if $(FOSSIL_DYNAMIC_BUILD)!=0 |
| 1567 | 1567 | SSLCONFIG = $(SSLCONFIG) shared |
| 1568 | 1568 | !else |
| 1569 | 1569 | SSLCONFIG = $(SSLCONFIG) no-shared |
| @@ -1574,11 +1574,11 @@ | ||
| 1574 | 1574 | !else |
| 1575 | 1575 | SSLNMAKE = ms\nt.mak all |
| 1576 | 1576 | !endif |
| 1577 | 1577 | # BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds. |
| 1578 | 1578 | !if $(FOSSIL_DYNAMIC_BUILD)==0 |
| 1579 | -SSLCFLAGS = -DOPENSSL_NO_SSL2 -DOPENSSL_NO_SSL3 | |
| 1579 | +SSLCFLAGS = -DOPENSSL_NO_SSL3 | |
| 1580 | 1580 | !endif |
| 1581 | 1581 | !endif |
| 1582 | 1582 | !endif |
| 1583 | 1583 | |
| 1584 | 1584 | !if $(FOSSIL_ENABLE_TCL)!=0 |
| 1585 | 1585 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -660,13 +660,13 @@ | |
| 660 | ZLIBCONFIG = |
| 661 | ZLIBTARGETS = |
| 662 | endif |
| 663 | |
| 664 | #### Disable creation of the OpenSSL shared libraries. Also, disable support |
| 665 | # for both SSLv2 and SSLv3 (i.e. thereby forcing the use of TLS). |
| 666 | # |
| 667 | SSLCONFIG += no-ssl2 no-ssl3 no-shared |
| 668 | |
| 669 | #### When using zlib, make sure that OpenSSL is configured to use the zlib |
| 670 | # that Fossil knows about (i.e. the one within the source tree). |
| 671 | # |
| 672 | ifndef FOSSIL_ENABLE_MINIZ |
| @@ -676,11 +676,11 @@ | |
| 676 | #### The directories where the OpenSSL include and library files are located. |
| 677 | # The recommended usage here is to use the Sysinternals junction tool |
| 678 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 679 | # Fossil source code directory and the target OpenSSL source directory. |
| 680 | # |
| 681 | OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2k |
| 682 | OPENSSLINCDIR = $(OPENSSLDIR)/include |
| 683 | OPENSSLLIBDIR = $(OPENSSLDIR) |
| 684 | |
| 685 | #### Either the directory where the Tcl library is installed or the Tcl |
| 686 | # source code directory resides (depending on the value of the macro |
| @@ -1507,11 +1507,11 @@ | |
| 1507 | !ifndef USE_SEE |
| 1508 | USE_SEE = 0 |
| 1509 | !endif |
| 1510 | |
| 1511 | !if $(FOSSIL_ENABLE_SSL)!=0 |
| 1512 | SSLDIR = $(B)\compat\openssl-1.0.2k |
| 1513 | SSLINCDIR = $(SSLDIR)\inc32 |
| 1514 | !if $(FOSSIL_DYNAMIC_BUILD)!=0 |
| 1515 | SSLLIBDIR = $(SSLDIR)\out32dll |
| 1516 | !else |
| 1517 | SSLLIBDIR = $(SSLDIR)\out32 |
| @@ -1519,11 +1519,11 @@ | |
| 1519 | SSLLFLAGS = /nologo /opt:ref /debug |
| 1520 | SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib crypt32.lib |
| 1521 | !if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64" |
| 1522 | !message Using 'x64' platform for OpenSSL... |
| 1523 | # BUGBUG (OpenSSL): Using "no-ssl*" here breaks the build. |
| 1524 | # SSLCONFIG = VC-WIN64A no-asm no-ssl2 no-ssl3 |
| 1525 | SSLCONFIG = VC-WIN64A no-asm |
| 1526 | !if $(FOSSIL_DYNAMIC_BUILD)!=0 |
| 1527 | SSLCONFIG = $(SSLCONFIG) shared |
| 1528 | !else |
| 1529 | SSLCONFIG = $(SSLCONFIG) no-shared |
| @@ -1534,16 +1534,16 @@ | |
| 1534 | !else |
| 1535 | SSLNMAKE = ms\nt.mak all |
| 1536 | !endif |
| 1537 | # BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds. |
| 1538 | !if $(FOSSIL_DYNAMIC_BUILD)==0 |
| 1539 | SSLCFLAGS = -DOPENSSL_NO_SSL2 -DOPENSSL_NO_SSL3 |
| 1540 | !endif |
| 1541 | !elseif "$(PLATFORM)"=="ia64" |
| 1542 | !message Using 'ia64' platform for OpenSSL... |
| 1543 | # BUGBUG (OpenSSL): Using "no-ssl*" here breaks the build. |
| 1544 | # SSLCONFIG = VC-WIN64I no-asm no-ssl2 no-ssl3 |
| 1545 | SSLCONFIG = VC-WIN64I no-asm |
| 1546 | !if $(FOSSIL_DYNAMIC_BUILD)!=0 |
| 1547 | SSLCONFIG = $(SSLCONFIG) shared |
| 1548 | !else |
| 1549 | SSLCONFIG = $(SSLCONFIG) no-shared |
| @@ -1554,16 +1554,16 @@ | |
| 1554 | !else |
| 1555 | SSLNMAKE = ms\nt.mak all |
| 1556 | !endif |
| 1557 | # BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds. |
| 1558 | !if $(FOSSIL_DYNAMIC_BUILD)==0 |
| 1559 | SSLCFLAGS = -DOPENSSL_NO_SSL2 -DOPENSSL_NO_SSL3 |
| 1560 | !endif |
| 1561 | !else |
| 1562 | !message Assuming 'x86' platform for OpenSSL... |
| 1563 | # BUGBUG (OpenSSL): Using "no-ssl*" here breaks the build. |
| 1564 | # SSLCONFIG = VC-WIN32 no-asm no-ssl2 no-ssl3 |
| 1565 | SSLCONFIG = VC-WIN32 no-asm |
| 1566 | !if $(FOSSIL_DYNAMIC_BUILD)!=0 |
| 1567 | SSLCONFIG = $(SSLCONFIG) shared |
| 1568 | !else |
| 1569 | SSLCONFIG = $(SSLCONFIG) no-shared |
| @@ -1574,11 +1574,11 @@ | |
| 1574 | !else |
| 1575 | SSLNMAKE = ms\nt.mak all |
| 1576 | !endif |
| 1577 | # BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds. |
| 1578 | !if $(FOSSIL_DYNAMIC_BUILD)==0 |
| 1579 | SSLCFLAGS = -DOPENSSL_NO_SSL2 -DOPENSSL_NO_SSL3 |
| 1580 | !endif |
| 1581 | !endif |
| 1582 | !endif |
| 1583 | |
| 1584 | !if $(FOSSIL_ENABLE_TCL)!=0 |
| 1585 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -660,13 +660,13 @@ | |
| 660 | ZLIBCONFIG = |
| 661 | ZLIBTARGETS = |
| 662 | endif |
| 663 | |
| 664 | #### Disable creation of the OpenSSL shared libraries. Also, disable support |
| 665 | # for SSLv3 (i.e. thereby forcing the use of TLS). |
| 666 | # |
| 667 | SSLCONFIG += no-ssl3 no-shared |
| 668 | |
| 669 | #### When using zlib, make sure that OpenSSL is configured to use the zlib |
| 670 | # that Fossil knows about (i.e. the one within the source tree). |
| 671 | # |
| 672 | ifndef FOSSIL_ENABLE_MINIZ |
| @@ -676,11 +676,11 @@ | |
| 676 | #### The directories where the OpenSSL include and library files are located. |
| 677 | # The recommended usage here is to use the Sysinternals junction tool |
| 678 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 679 | # Fossil source code directory and the target OpenSSL source directory. |
| 680 | # |
| 681 | OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.1.0f |
| 682 | OPENSSLINCDIR = $(OPENSSLDIR)/include |
| 683 | OPENSSLLIBDIR = $(OPENSSLDIR) |
| 684 | |
| 685 | #### Either the directory where the Tcl library is installed or the Tcl |
| 686 | # source code directory resides (depending on the value of the macro |
| @@ -1507,11 +1507,11 @@ | |
| 1507 | !ifndef USE_SEE |
| 1508 | USE_SEE = 0 |
| 1509 | !endif |
| 1510 | |
| 1511 | !if $(FOSSIL_ENABLE_SSL)!=0 |
| 1512 | SSLDIR = $(B)\compat\openssl-1.1.0f |
| 1513 | SSLINCDIR = $(SSLDIR)\inc32 |
| 1514 | !if $(FOSSIL_DYNAMIC_BUILD)!=0 |
| 1515 | SSLLIBDIR = $(SSLDIR)\out32dll |
| 1516 | !else |
| 1517 | SSLLIBDIR = $(SSLDIR)\out32 |
| @@ -1519,11 +1519,11 @@ | |
| 1519 | SSLLFLAGS = /nologo /opt:ref /debug |
| 1520 | SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib crypt32.lib |
| 1521 | !if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64" |
| 1522 | !message Using 'x64' platform for OpenSSL... |
| 1523 | # BUGBUG (OpenSSL): Using "no-ssl*" here breaks the build. |
| 1524 | # SSLCONFIG = VC-WIN64A no-asm no-ssl3 |
| 1525 | SSLCONFIG = VC-WIN64A no-asm |
| 1526 | !if $(FOSSIL_DYNAMIC_BUILD)!=0 |
| 1527 | SSLCONFIG = $(SSLCONFIG) shared |
| 1528 | !else |
| 1529 | SSLCONFIG = $(SSLCONFIG) no-shared |
| @@ -1534,16 +1534,16 @@ | |
| 1534 | !else |
| 1535 | SSLNMAKE = ms\nt.mak all |
| 1536 | !endif |
| 1537 | # BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds. |
| 1538 | !if $(FOSSIL_DYNAMIC_BUILD)==0 |
| 1539 | SSLCFLAGS = -DOPENSSL_NO_SSL3 |
| 1540 | !endif |
| 1541 | !elseif "$(PLATFORM)"=="ia64" |
| 1542 | !message Using 'ia64' platform for OpenSSL... |
| 1543 | # BUGBUG (OpenSSL): Using "no-ssl*" here breaks the build. |
| 1544 | # SSLCONFIG = VC-WIN64I no-asm no-ssl3 |
| 1545 | SSLCONFIG = VC-WIN64I no-asm |
| 1546 | !if $(FOSSIL_DYNAMIC_BUILD)!=0 |
| 1547 | SSLCONFIG = $(SSLCONFIG) shared |
| 1548 | !else |
| 1549 | SSLCONFIG = $(SSLCONFIG) no-shared |
| @@ -1554,16 +1554,16 @@ | |
| 1554 | !else |
| 1555 | SSLNMAKE = ms\nt.mak all |
| 1556 | !endif |
| 1557 | # BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds. |
| 1558 | !if $(FOSSIL_DYNAMIC_BUILD)==0 |
| 1559 | SSLCFLAGS = -DOPENSSL_NO_SSL3 |
| 1560 | !endif |
| 1561 | !else |
| 1562 | !message Assuming 'x86' platform for OpenSSL... |
| 1563 | # BUGBUG (OpenSSL): Using "no-ssl*" here breaks the build. |
| 1564 | # SSLCONFIG = VC-WIN32 no-asm no-ssl3 |
| 1565 | SSLCONFIG = VC-WIN32 no-asm |
| 1566 | !if $(FOSSIL_DYNAMIC_BUILD)!=0 |
| 1567 | SSLCONFIG = $(SSLCONFIG) shared |
| 1568 | !else |
| 1569 | SSLCONFIG = $(SSLCONFIG) no-shared |
| @@ -1574,11 +1574,11 @@ | |
| 1574 | !else |
| 1575 | SSLNMAKE = ms\nt.mak all |
| 1576 | !endif |
| 1577 | # BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds. |
| 1578 | !if $(FOSSIL_DYNAMIC_BUILD)==0 |
| 1579 | SSLCFLAGS = -DOPENSSL_NO_SSL3 |
| 1580 | !endif |
| 1581 | !endif |
| 1582 | !endif |
| 1583 | |
| 1584 | !if $(FOSSIL_ENABLE_TCL)!=0 |
| 1585 |
+10
-10
| --- src/makemake.tcl | ||
| +++ src/makemake.tcl | ||
| @@ -660,13 +660,13 @@ | ||
| 660 | 660 | ZLIBCONFIG = |
| 661 | 661 | ZLIBTARGETS = |
| 662 | 662 | endif |
| 663 | 663 | |
| 664 | 664 | #### Disable creation of the OpenSSL shared libraries. Also, disable support |
| 665 | -# for both SSLv2 and SSLv3 (i.e. thereby forcing the use of TLS). | |
| 665 | +# for SSLv3 (i.e. thereby forcing the use of TLS). | |
| 666 | 666 | # |
| 667 | -SSLCONFIG += no-ssl2 no-ssl3 no-shared | |
| 667 | +SSLCONFIG += no-ssl3 no-shared | |
| 668 | 668 | |
| 669 | 669 | #### When using zlib, make sure that OpenSSL is configured to use the zlib |
| 670 | 670 | # that Fossil knows about (i.e. the one within the source tree). |
| 671 | 671 | # |
| 672 | 672 | ifndef FOSSIL_ENABLE_MINIZ |
| @@ -676,11 +676,11 @@ | ||
| 676 | 676 | #### The directories where the OpenSSL include and library files are located. |
| 677 | 677 | # The recommended usage here is to use the Sysinternals junction tool |
| 678 | 678 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 679 | 679 | # Fossil source code directory and the target OpenSSL source directory. |
| 680 | 680 | # |
| 681 | -OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2k | |
| 681 | +OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.1.0f | |
| 682 | 682 | OPENSSLINCDIR = $(OPENSSLDIR)/include |
| 683 | 683 | OPENSSLLIBDIR = $(OPENSSLDIR) |
| 684 | 684 | |
| 685 | 685 | #### Either the directory where the Tcl library is installed or the Tcl |
| 686 | 686 | # source code directory resides (depending on the value of the macro |
| @@ -1507,11 +1507,11 @@ | ||
| 1507 | 1507 | !ifndef USE_SEE |
| 1508 | 1508 | USE_SEE = 0 |
| 1509 | 1509 | !endif |
| 1510 | 1510 | |
| 1511 | 1511 | !if $(FOSSIL_ENABLE_SSL)!=0 |
| 1512 | -SSLDIR = $(B)\compat\openssl-1.0.2k | |
| 1512 | +SSLDIR = $(B)\compat\openssl-1.1.0f | |
| 1513 | 1513 | SSLINCDIR = $(SSLDIR)\inc32 |
| 1514 | 1514 | !if $(FOSSIL_DYNAMIC_BUILD)!=0 |
| 1515 | 1515 | SSLLIBDIR = $(SSLDIR)\out32dll |
| 1516 | 1516 | !else |
| 1517 | 1517 | SSLLIBDIR = $(SSLDIR)\out32 |
| @@ -1519,11 +1519,11 @@ | ||
| 1519 | 1519 | SSLLFLAGS = /nologo /opt:ref /debug |
| 1520 | 1520 | SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib crypt32.lib |
| 1521 | 1521 | !if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64" |
| 1522 | 1522 | !message Using 'x64' platform for OpenSSL... |
| 1523 | 1523 | # BUGBUG (OpenSSL): Using "no-ssl*" here breaks the build. |
| 1524 | -# SSLCONFIG = VC-WIN64A no-asm no-ssl2 no-ssl3 | |
| 1524 | +# SSLCONFIG = VC-WIN64A no-asm no-ssl3 | |
| 1525 | 1525 | SSLCONFIG = VC-WIN64A no-asm |
| 1526 | 1526 | !if $(FOSSIL_DYNAMIC_BUILD)!=0 |
| 1527 | 1527 | SSLCONFIG = $(SSLCONFIG) shared |
| 1528 | 1528 | !else |
| 1529 | 1529 | SSLCONFIG = $(SSLCONFIG) no-shared |
| @@ -1534,16 +1534,16 @@ | ||
| 1534 | 1534 | !else |
| 1535 | 1535 | SSLNMAKE = ms\nt.mak all |
| 1536 | 1536 | !endif |
| 1537 | 1537 | # BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds. |
| 1538 | 1538 | !if $(FOSSIL_DYNAMIC_BUILD)==0 |
| 1539 | -SSLCFLAGS = -DOPENSSL_NO_SSL2 -DOPENSSL_NO_SSL3 | |
| 1539 | +SSLCFLAGS = -DOPENSSL_NO_SSL3 | |
| 1540 | 1540 | !endif |
| 1541 | 1541 | !elseif "$(PLATFORM)"=="ia64" |
| 1542 | 1542 | !message Using 'ia64' platform for OpenSSL... |
| 1543 | 1543 | # BUGBUG (OpenSSL): Using "no-ssl*" here breaks the build. |
| 1544 | -# SSLCONFIG = VC-WIN64I no-asm no-ssl2 no-ssl3 | |
| 1544 | +# SSLCONFIG = VC-WIN64I no-asm no-ssl3 | |
| 1545 | 1545 | SSLCONFIG = VC-WIN64I no-asm |
| 1546 | 1546 | !if $(FOSSIL_DYNAMIC_BUILD)!=0 |
| 1547 | 1547 | SSLCONFIG = $(SSLCONFIG) shared |
| 1548 | 1548 | !else |
| 1549 | 1549 | SSLCONFIG = $(SSLCONFIG) no-shared |
| @@ -1554,16 +1554,16 @@ | ||
| 1554 | 1554 | !else |
| 1555 | 1555 | SSLNMAKE = ms\nt.mak all |
| 1556 | 1556 | !endif |
| 1557 | 1557 | # BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds. |
| 1558 | 1558 | !if $(FOSSIL_DYNAMIC_BUILD)==0 |
| 1559 | -SSLCFLAGS = -DOPENSSL_NO_SSL2 -DOPENSSL_NO_SSL3 | |
| 1559 | +SSLCFLAGS = -DOPENSSL_NO_SSL3 | |
| 1560 | 1560 | !endif |
| 1561 | 1561 | !else |
| 1562 | 1562 | !message Assuming 'x86' platform for OpenSSL... |
| 1563 | 1563 | # BUGBUG (OpenSSL): Using "no-ssl*" here breaks the build. |
| 1564 | -# SSLCONFIG = VC-WIN32 no-asm no-ssl2 no-ssl3 | |
| 1564 | +# SSLCONFIG = VC-WIN32 no-asm no-ssl3 | |
| 1565 | 1565 | SSLCONFIG = VC-WIN32 no-asm |
| 1566 | 1566 | !if $(FOSSIL_DYNAMIC_BUILD)!=0 |
| 1567 | 1567 | SSLCONFIG = $(SSLCONFIG) shared |
| 1568 | 1568 | !else |
| 1569 | 1569 | SSLCONFIG = $(SSLCONFIG) no-shared |
| @@ -1574,11 +1574,11 @@ | ||
| 1574 | 1574 | !else |
| 1575 | 1575 | SSLNMAKE = ms\nt.mak all |
| 1576 | 1576 | !endif |
| 1577 | 1577 | # BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds. |
| 1578 | 1578 | !if $(FOSSIL_DYNAMIC_BUILD)==0 |
| 1579 | -SSLCFLAGS = -DOPENSSL_NO_SSL2 -DOPENSSL_NO_SSL3 | |
| 1579 | +SSLCFLAGS = -DOPENSSL_NO_SSL3 | |
| 1580 | 1580 | !endif |
| 1581 | 1581 | !endif |
| 1582 | 1582 | !endif |
| 1583 | 1583 | |
| 1584 | 1584 | !if $(FOSSIL_ENABLE_TCL)!=0 |
| 1585 | 1585 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -660,13 +660,13 @@ | |
| 660 | ZLIBCONFIG = |
| 661 | ZLIBTARGETS = |
| 662 | endif |
| 663 | |
| 664 | #### Disable creation of the OpenSSL shared libraries. Also, disable support |
| 665 | # for both SSLv2 and SSLv3 (i.e. thereby forcing the use of TLS). |
| 666 | # |
| 667 | SSLCONFIG += no-ssl2 no-ssl3 no-shared |
| 668 | |
| 669 | #### When using zlib, make sure that OpenSSL is configured to use the zlib |
| 670 | # that Fossil knows about (i.e. the one within the source tree). |
| 671 | # |
| 672 | ifndef FOSSIL_ENABLE_MINIZ |
| @@ -676,11 +676,11 @@ | |
| 676 | #### The directories where the OpenSSL include and library files are located. |
| 677 | # The recommended usage here is to use the Sysinternals junction tool |
| 678 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 679 | # Fossil source code directory and the target OpenSSL source directory. |
| 680 | # |
| 681 | OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2k |
| 682 | OPENSSLINCDIR = $(OPENSSLDIR)/include |
| 683 | OPENSSLLIBDIR = $(OPENSSLDIR) |
| 684 | |
| 685 | #### Either the directory where the Tcl library is installed or the Tcl |
| 686 | # source code directory resides (depending on the value of the macro |
| @@ -1507,11 +1507,11 @@ | |
| 1507 | !ifndef USE_SEE |
| 1508 | USE_SEE = 0 |
| 1509 | !endif |
| 1510 | |
| 1511 | !if $(FOSSIL_ENABLE_SSL)!=0 |
| 1512 | SSLDIR = $(B)\compat\openssl-1.0.2k |
| 1513 | SSLINCDIR = $(SSLDIR)\inc32 |
| 1514 | !if $(FOSSIL_DYNAMIC_BUILD)!=0 |
| 1515 | SSLLIBDIR = $(SSLDIR)\out32dll |
| 1516 | !else |
| 1517 | SSLLIBDIR = $(SSLDIR)\out32 |
| @@ -1519,11 +1519,11 @@ | |
| 1519 | SSLLFLAGS = /nologo /opt:ref /debug |
| 1520 | SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib crypt32.lib |
| 1521 | !if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64" |
| 1522 | !message Using 'x64' platform for OpenSSL... |
| 1523 | # BUGBUG (OpenSSL): Using "no-ssl*" here breaks the build. |
| 1524 | # SSLCONFIG = VC-WIN64A no-asm no-ssl2 no-ssl3 |
| 1525 | SSLCONFIG = VC-WIN64A no-asm |
| 1526 | !if $(FOSSIL_DYNAMIC_BUILD)!=0 |
| 1527 | SSLCONFIG = $(SSLCONFIG) shared |
| 1528 | !else |
| 1529 | SSLCONFIG = $(SSLCONFIG) no-shared |
| @@ -1534,16 +1534,16 @@ | |
| 1534 | !else |
| 1535 | SSLNMAKE = ms\nt.mak all |
| 1536 | !endif |
| 1537 | # BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds. |
| 1538 | !if $(FOSSIL_DYNAMIC_BUILD)==0 |
| 1539 | SSLCFLAGS = -DOPENSSL_NO_SSL2 -DOPENSSL_NO_SSL3 |
| 1540 | !endif |
| 1541 | !elseif "$(PLATFORM)"=="ia64" |
| 1542 | !message Using 'ia64' platform for OpenSSL... |
| 1543 | # BUGBUG (OpenSSL): Using "no-ssl*" here breaks the build. |
| 1544 | # SSLCONFIG = VC-WIN64I no-asm no-ssl2 no-ssl3 |
| 1545 | SSLCONFIG = VC-WIN64I no-asm |
| 1546 | !if $(FOSSIL_DYNAMIC_BUILD)!=0 |
| 1547 | SSLCONFIG = $(SSLCONFIG) shared |
| 1548 | !else |
| 1549 | SSLCONFIG = $(SSLCONFIG) no-shared |
| @@ -1554,16 +1554,16 @@ | |
| 1554 | !else |
| 1555 | SSLNMAKE = ms\nt.mak all |
| 1556 | !endif |
| 1557 | # BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds. |
| 1558 | !if $(FOSSIL_DYNAMIC_BUILD)==0 |
| 1559 | SSLCFLAGS = -DOPENSSL_NO_SSL2 -DOPENSSL_NO_SSL3 |
| 1560 | !endif |
| 1561 | !else |
| 1562 | !message Assuming 'x86' platform for OpenSSL... |
| 1563 | # BUGBUG (OpenSSL): Using "no-ssl*" here breaks the build. |
| 1564 | # SSLCONFIG = VC-WIN32 no-asm no-ssl2 no-ssl3 |
| 1565 | SSLCONFIG = VC-WIN32 no-asm |
| 1566 | !if $(FOSSIL_DYNAMIC_BUILD)!=0 |
| 1567 | SSLCONFIG = $(SSLCONFIG) shared |
| 1568 | !else |
| 1569 | SSLCONFIG = $(SSLCONFIG) no-shared |
| @@ -1574,11 +1574,11 @@ | |
| 1574 | !else |
| 1575 | SSLNMAKE = ms\nt.mak all |
| 1576 | !endif |
| 1577 | # BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds. |
| 1578 | !if $(FOSSIL_DYNAMIC_BUILD)==0 |
| 1579 | SSLCFLAGS = -DOPENSSL_NO_SSL2 -DOPENSSL_NO_SSL3 |
| 1580 | !endif |
| 1581 | !endif |
| 1582 | !endif |
| 1583 | |
| 1584 | !if $(FOSSIL_ENABLE_TCL)!=0 |
| 1585 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -660,13 +660,13 @@ | |
| 660 | ZLIBCONFIG = |
| 661 | ZLIBTARGETS = |
| 662 | endif |
| 663 | |
| 664 | #### Disable creation of the OpenSSL shared libraries. Also, disable support |
| 665 | # for SSLv3 (i.e. thereby forcing the use of TLS). |
| 666 | # |
| 667 | SSLCONFIG += no-ssl3 no-shared |
| 668 | |
| 669 | #### When using zlib, make sure that OpenSSL is configured to use the zlib |
| 670 | # that Fossil knows about (i.e. the one within the source tree). |
| 671 | # |
| 672 | ifndef FOSSIL_ENABLE_MINIZ |
| @@ -676,11 +676,11 @@ | |
| 676 | #### The directories where the OpenSSL include and library files are located. |
| 677 | # The recommended usage here is to use the Sysinternals junction tool |
| 678 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 679 | # Fossil source code directory and the target OpenSSL source directory. |
| 680 | # |
| 681 | OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.1.0f |
| 682 | OPENSSLINCDIR = $(OPENSSLDIR)/include |
| 683 | OPENSSLLIBDIR = $(OPENSSLDIR) |
| 684 | |
| 685 | #### Either the directory where the Tcl library is installed or the Tcl |
| 686 | # source code directory resides (depending on the value of the macro |
| @@ -1507,11 +1507,11 @@ | |
| 1507 | !ifndef USE_SEE |
| 1508 | USE_SEE = 0 |
| 1509 | !endif |
| 1510 | |
| 1511 | !if $(FOSSIL_ENABLE_SSL)!=0 |
| 1512 | SSLDIR = $(B)\compat\openssl-1.1.0f |
| 1513 | SSLINCDIR = $(SSLDIR)\inc32 |
| 1514 | !if $(FOSSIL_DYNAMIC_BUILD)!=0 |
| 1515 | SSLLIBDIR = $(SSLDIR)\out32dll |
| 1516 | !else |
| 1517 | SSLLIBDIR = $(SSLDIR)\out32 |
| @@ -1519,11 +1519,11 @@ | |
| 1519 | SSLLFLAGS = /nologo /opt:ref /debug |
| 1520 | SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib crypt32.lib |
| 1521 | !if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64" |
| 1522 | !message Using 'x64' platform for OpenSSL... |
| 1523 | # BUGBUG (OpenSSL): Using "no-ssl*" here breaks the build. |
| 1524 | # SSLCONFIG = VC-WIN64A no-asm no-ssl3 |
| 1525 | SSLCONFIG = VC-WIN64A no-asm |
| 1526 | !if $(FOSSIL_DYNAMIC_BUILD)!=0 |
| 1527 | SSLCONFIG = $(SSLCONFIG) shared |
| 1528 | !else |
| 1529 | SSLCONFIG = $(SSLCONFIG) no-shared |
| @@ -1534,16 +1534,16 @@ | |
| 1534 | !else |
| 1535 | SSLNMAKE = ms\nt.mak all |
| 1536 | !endif |
| 1537 | # BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds. |
| 1538 | !if $(FOSSIL_DYNAMIC_BUILD)==0 |
| 1539 | SSLCFLAGS = -DOPENSSL_NO_SSL3 |
| 1540 | !endif |
| 1541 | !elseif "$(PLATFORM)"=="ia64" |
| 1542 | !message Using 'ia64' platform for OpenSSL... |
| 1543 | # BUGBUG (OpenSSL): Using "no-ssl*" here breaks the build. |
| 1544 | # SSLCONFIG = VC-WIN64I no-asm no-ssl3 |
| 1545 | SSLCONFIG = VC-WIN64I no-asm |
| 1546 | !if $(FOSSIL_DYNAMIC_BUILD)!=0 |
| 1547 | SSLCONFIG = $(SSLCONFIG) shared |
| 1548 | !else |
| 1549 | SSLCONFIG = $(SSLCONFIG) no-shared |
| @@ -1554,16 +1554,16 @@ | |
| 1554 | !else |
| 1555 | SSLNMAKE = ms\nt.mak all |
| 1556 | !endif |
| 1557 | # BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds. |
| 1558 | !if $(FOSSIL_DYNAMIC_BUILD)==0 |
| 1559 | SSLCFLAGS = -DOPENSSL_NO_SSL3 |
| 1560 | !endif |
| 1561 | !else |
| 1562 | !message Assuming 'x86' platform for OpenSSL... |
| 1563 | # BUGBUG (OpenSSL): Using "no-ssl*" here breaks the build. |
| 1564 | # SSLCONFIG = VC-WIN32 no-asm no-ssl3 |
| 1565 | SSLCONFIG = VC-WIN32 no-asm |
| 1566 | !if $(FOSSIL_DYNAMIC_BUILD)!=0 |
| 1567 | SSLCONFIG = $(SSLCONFIG) shared |
| 1568 | !else |
| 1569 | SSLCONFIG = $(SSLCONFIG) no-shared |
| @@ -1574,11 +1574,11 @@ | |
| 1574 | !else |
| 1575 | SSLNMAKE = ms\nt.mak all |
| 1576 | !endif |
| 1577 | # BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds. |
| 1578 | !if $(FOSSIL_DYNAMIC_BUILD)==0 |
| 1579 | SSLCFLAGS = -DOPENSSL_NO_SSL3 |
| 1580 | !endif |
| 1581 | !endif |
| 1582 | !endif |
| 1583 | |
| 1584 | !if $(FOSSIL_ENABLE_TCL)!=0 |
| 1585 |
+3
-3
| --- win/Makefile.mingw | ||
| +++ win/Makefile.mingw | ||
| @@ -154,13 +154,13 @@ | ||
| 154 | 154 | ZLIBCONFIG = |
| 155 | 155 | ZLIBTARGETS = |
| 156 | 156 | endif |
| 157 | 157 | |
| 158 | 158 | #### Disable creation of the OpenSSL shared libraries. Also, disable support |
| 159 | -# for both SSLv2 and SSLv3 (i.e. thereby forcing the use of TLS). | |
| 159 | +# for SSLv3 (i.e. thereby forcing the use of TLS). | |
| 160 | 160 | # |
| 161 | -SSLCONFIG += no-ssl2 no-ssl3 no-shared | |
| 161 | +SSLCONFIG += no-ssl3 no-shared | |
| 162 | 162 | |
| 163 | 163 | #### When using zlib, make sure that OpenSSL is configured to use the zlib |
| 164 | 164 | # that Fossil knows about (i.e. the one within the source tree). |
| 165 | 165 | # |
| 166 | 166 | ifndef FOSSIL_ENABLE_MINIZ |
| @@ -170,11 +170,11 @@ | ||
| 170 | 170 | #### The directories where the OpenSSL include and library files are located. |
| 171 | 171 | # The recommended usage here is to use the Sysinternals junction tool |
| 172 | 172 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 173 | 173 | # Fossil source code directory and the target OpenSSL source directory. |
| 174 | 174 | # |
| 175 | -OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2k | |
| 175 | +OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.1.0f | |
| 176 | 176 | OPENSSLINCDIR = $(OPENSSLDIR)/include |
| 177 | 177 | OPENSSLLIBDIR = $(OPENSSLDIR) |
| 178 | 178 | |
| 179 | 179 | #### Either the directory where the Tcl library is installed or the Tcl |
| 180 | 180 | # source code directory resides (depending on the value of the macro |
| 181 | 181 |
| --- win/Makefile.mingw | |
| +++ win/Makefile.mingw | |
| @@ -154,13 +154,13 @@ | |
| 154 | ZLIBCONFIG = |
| 155 | ZLIBTARGETS = |
| 156 | endif |
| 157 | |
| 158 | #### Disable creation of the OpenSSL shared libraries. Also, disable support |
| 159 | # for both SSLv2 and SSLv3 (i.e. thereby forcing the use of TLS). |
| 160 | # |
| 161 | SSLCONFIG += no-ssl2 no-ssl3 no-shared |
| 162 | |
| 163 | #### When using zlib, make sure that OpenSSL is configured to use the zlib |
| 164 | # that Fossil knows about (i.e. the one within the source tree). |
| 165 | # |
| 166 | ifndef FOSSIL_ENABLE_MINIZ |
| @@ -170,11 +170,11 @@ | |
| 170 | #### The directories where the OpenSSL include and library files are located. |
| 171 | # The recommended usage here is to use the Sysinternals junction tool |
| 172 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 173 | # Fossil source code directory and the target OpenSSL source directory. |
| 174 | # |
| 175 | OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2k |
| 176 | OPENSSLINCDIR = $(OPENSSLDIR)/include |
| 177 | OPENSSLLIBDIR = $(OPENSSLDIR) |
| 178 | |
| 179 | #### Either the directory where the Tcl library is installed or the Tcl |
| 180 | # source code directory resides (depending on the value of the macro |
| 181 |
| --- win/Makefile.mingw | |
| +++ win/Makefile.mingw | |
| @@ -154,13 +154,13 @@ | |
| 154 | ZLIBCONFIG = |
| 155 | ZLIBTARGETS = |
| 156 | endif |
| 157 | |
| 158 | #### Disable creation of the OpenSSL shared libraries. Also, disable support |
| 159 | # for SSLv3 (i.e. thereby forcing the use of TLS). |
| 160 | # |
| 161 | SSLCONFIG += no-ssl3 no-shared |
| 162 | |
| 163 | #### When using zlib, make sure that OpenSSL is configured to use the zlib |
| 164 | # that Fossil knows about (i.e. the one within the source tree). |
| 165 | # |
| 166 | ifndef FOSSIL_ENABLE_MINIZ |
| @@ -170,11 +170,11 @@ | |
| 170 | #### The directories where the OpenSSL include and library files are located. |
| 171 | # The recommended usage here is to use the Sysinternals junction tool |
| 172 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 173 | # Fossil source code directory and the target OpenSSL source directory. |
| 174 | # |
| 175 | OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.1.0f |
| 176 | OPENSSLINCDIR = $(OPENSSLDIR)/include |
| 177 | OPENSSLLIBDIR = $(OPENSSLDIR) |
| 178 | |
| 179 | #### Either the directory where the Tcl library is installed or the Tcl |
| 180 | # source code directory resides (depending on the value of the macro |
| 181 |
+3
-3
| --- win/Makefile.mingw | ||
| +++ win/Makefile.mingw | ||
| @@ -154,13 +154,13 @@ | ||
| 154 | 154 | ZLIBCONFIG = |
| 155 | 155 | ZLIBTARGETS = |
| 156 | 156 | endif |
| 157 | 157 | |
| 158 | 158 | #### Disable creation of the OpenSSL shared libraries. Also, disable support |
| 159 | -# for both SSLv2 and SSLv3 (i.e. thereby forcing the use of TLS). | |
| 159 | +# for SSLv3 (i.e. thereby forcing the use of TLS). | |
| 160 | 160 | # |
| 161 | -SSLCONFIG += no-ssl2 no-ssl3 no-shared | |
| 161 | +SSLCONFIG += no-ssl3 no-shared | |
| 162 | 162 | |
| 163 | 163 | #### When using zlib, make sure that OpenSSL is configured to use the zlib |
| 164 | 164 | # that Fossil knows about (i.e. the one within the source tree). |
| 165 | 165 | # |
| 166 | 166 | ifndef FOSSIL_ENABLE_MINIZ |
| @@ -170,11 +170,11 @@ | ||
| 170 | 170 | #### The directories where the OpenSSL include and library files are located. |
| 171 | 171 | # The recommended usage here is to use the Sysinternals junction tool |
| 172 | 172 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 173 | 173 | # Fossil source code directory and the target OpenSSL source directory. |
| 174 | 174 | # |
| 175 | -OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2k | |
| 175 | +OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.1.0f | |
| 176 | 176 | OPENSSLINCDIR = $(OPENSSLDIR)/include |
| 177 | 177 | OPENSSLLIBDIR = $(OPENSSLDIR) |
| 178 | 178 | |
| 179 | 179 | #### Either the directory where the Tcl library is installed or the Tcl |
| 180 | 180 | # source code directory resides (depending on the value of the macro |
| 181 | 181 |
| --- win/Makefile.mingw | |
| +++ win/Makefile.mingw | |
| @@ -154,13 +154,13 @@ | |
| 154 | ZLIBCONFIG = |
| 155 | ZLIBTARGETS = |
| 156 | endif |
| 157 | |
| 158 | #### Disable creation of the OpenSSL shared libraries. Also, disable support |
| 159 | # for both SSLv2 and SSLv3 (i.e. thereby forcing the use of TLS). |
| 160 | # |
| 161 | SSLCONFIG += no-ssl2 no-ssl3 no-shared |
| 162 | |
| 163 | #### When using zlib, make sure that OpenSSL is configured to use the zlib |
| 164 | # that Fossil knows about (i.e. the one within the source tree). |
| 165 | # |
| 166 | ifndef FOSSIL_ENABLE_MINIZ |
| @@ -170,11 +170,11 @@ | |
| 170 | #### The directories where the OpenSSL include and library files are located. |
| 171 | # The recommended usage here is to use the Sysinternals junction tool |
| 172 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 173 | # Fossil source code directory and the target OpenSSL source directory. |
| 174 | # |
| 175 | OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2k |
| 176 | OPENSSLINCDIR = $(OPENSSLDIR)/include |
| 177 | OPENSSLLIBDIR = $(OPENSSLDIR) |
| 178 | |
| 179 | #### Either the directory where the Tcl library is installed or the Tcl |
| 180 | # source code directory resides (depending on the value of the macro |
| 181 |
| --- win/Makefile.mingw | |
| +++ win/Makefile.mingw | |
| @@ -154,13 +154,13 @@ | |
| 154 | ZLIBCONFIG = |
| 155 | ZLIBTARGETS = |
| 156 | endif |
| 157 | |
| 158 | #### Disable creation of the OpenSSL shared libraries. Also, disable support |
| 159 | # for SSLv3 (i.e. thereby forcing the use of TLS). |
| 160 | # |
| 161 | SSLCONFIG += no-ssl3 no-shared |
| 162 | |
| 163 | #### When using zlib, make sure that OpenSSL is configured to use the zlib |
| 164 | # that Fossil knows about (i.e. the one within the source tree). |
| 165 | # |
| 166 | ifndef FOSSIL_ENABLE_MINIZ |
| @@ -170,11 +170,11 @@ | |
| 170 | #### The directories where the OpenSSL include and library files are located. |
| 171 | # The recommended usage here is to use the Sysinternals junction tool |
| 172 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 173 | # Fossil source code directory and the target OpenSSL source directory. |
| 174 | # |
| 175 | OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.1.0f |
| 176 | OPENSSLINCDIR = $(OPENSSLDIR)/include |
| 177 | OPENSSLLIBDIR = $(OPENSSLDIR) |
| 178 | |
| 179 | #### Either the directory where the Tcl library is installed or the Tcl |
| 180 | # source code directory resides (depending on the value of the macro |
| 181 |
+3
-3
| --- win/Makefile.mingw.mistachkin | ||
| +++ win/Makefile.mingw.mistachkin | ||
| @@ -154,13 +154,13 @@ | ||
| 154 | 154 | ZLIBCONFIG = |
| 155 | 155 | ZLIBTARGETS = |
| 156 | 156 | endif |
| 157 | 157 | |
| 158 | 158 | #### Disable creation of the OpenSSL shared libraries. Also, disable support |
| 159 | -# for both SSLv2 and SSLv3 (i.e. thereby forcing the use of TLS). | |
| 159 | +# for SSLv3 (i.e. thereby forcing the use of TLS). | |
| 160 | 160 | # |
| 161 | -SSLCONFIG += no-ssl2 no-ssl3 no-shared | |
| 161 | +SSLCONFIG += no-ssl3 no-shared | |
| 162 | 162 | |
| 163 | 163 | #### When using zlib, make sure that OpenSSL is configured to use the zlib |
| 164 | 164 | # that Fossil knows about (i.e. the one within the source tree). |
| 165 | 165 | # |
| 166 | 166 | ifndef FOSSIL_ENABLE_MINIZ |
| @@ -170,11 +170,11 @@ | ||
| 170 | 170 | #### The directories where the OpenSSL include and library files are located. |
| 171 | 171 | # The recommended usage here is to use the Sysinternals junction tool |
| 172 | 172 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 173 | 173 | # Fossil source code directory and the target OpenSSL source directory. |
| 174 | 174 | # |
| 175 | -OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2k | |
| 175 | +OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.1.0f | |
| 176 | 176 | OPENSSLINCDIR = $(OPENSSLDIR)/include |
| 177 | 177 | OPENSSLLIBDIR = $(OPENSSLDIR) |
| 178 | 178 | |
| 179 | 179 | #### Either the directory where the Tcl library is installed or the Tcl |
| 180 | 180 | # source code directory resides (depending on the value of the macro |
| 181 | 181 |
| --- win/Makefile.mingw.mistachkin | |
| +++ win/Makefile.mingw.mistachkin | |
| @@ -154,13 +154,13 @@ | |
| 154 | ZLIBCONFIG = |
| 155 | ZLIBTARGETS = |
| 156 | endif |
| 157 | |
| 158 | #### Disable creation of the OpenSSL shared libraries. Also, disable support |
| 159 | # for both SSLv2 and SSLv3 (i.e. thereby forcing the use of TLS). |
| 160 | # |
| 161 | SSLCONFIG += no-ssl2 no-ssl3 no-shared |
| 162 | |
| 163 | #### When using zlib, make sure that OpenSSL is configured to use the zlib |
| 164 | # that Fossil knows about (i.e. the one within the source tree). |
| 165 | # |
| 166 | ifndef FOSSIL_ENABLE_MINIZ |
| @@ -170,11 +170,11 @@ | |
| 170 | #### The directories where the OpenSSL include and library files are located. |
| 171 | # The recommended usage here is to use the Sysinternals junction tool |
| 172 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 173 | # Fossil source code directory and the target OpenSSL source directory. |
| 174 | # |
| 175 | OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2k |
| 176 | OPENSSLINCDIR = $(OPENSSLDIR)/include |
| 177 | OPENSSLLIBDIR = $(OPENSSLDIR) |
| 178 | |
| 179 | #### Either the directory where the Tcl library is installed or the Tcl |
| 180 | # source code directory resides (depending on the value of the macro |
| 181 |
| --- win/Makefile.mingw.mistachkin | |
| +++ win/Makefile.mingw.mistachkin | |
| @@ -154,13 +154,13 @@ | |
| 154 | ZLIBCONFIG = |
| 155 | ZLIBTARGETS = |
| 156 | endif |
| 157 | |
| 158 | #### Disable creation of the OpenSSL shared libraries. Also, disable support |
| 159 | # for SSLv3 (i.e. thereby forcing the use of TLS). |
| 160 | # |
| 161 | SSLCONFIG += no-ssl3 no-shared |
| 162 | |
| 163 | #### When using zlib, make sure that OpenSSL is configured to use the zlib |
| 164 | # that Fossil knows about (i.e. the one within the source tree). |
| 165 | # |
| 166 | ifndef FOSSIL_ENABLE_MINIZ |
| @@ -170,11 +170,11 @@ | |
| 170 | #### The directories where the OpenSSL include and library files are located. |
| 171 | # The recommended usage here is to use the Sysinternals junction tool |
| 172 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 173 | # Fossil source code directory and the target OpenSSL source directory. |
| 174 | # |
| 175 | OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.1.0f |
| 176 | OPENSSLINCDIR = $(OPENSSLDIR)/include |
| 177 | OPENSSLLIBDIR = $(OPENSSLDIR) |
| 178 | |
| 179 | #### Either the directory where the Tcl library is installed or the Tcl |
| 180 | # source code directory resides (depending on the value of the macro |
| 181 |
+3
-3
| --- win/Makefile.mingw.mistachkin | ||
| +++ win/Makefile.mingw.mistachkin | ||
| @@ -154,13 +154,13 @@ | ||
| 154 | 154 | ZLIBCONFIG = |
| 155 | 155 | ZLIBTARGETS = |
| 156 | 156 | endif |
| 157 | 157 | |
| 158 | 158 | #### Disable creation of the OpenSSL shared libraries. Also, disable support |
| 159 | -# for both SSLv2 and SSLv3 (i.e. thereby forcing the use of TLS). | |
| 159 | +# for SSLv3 (i.e. thereby forcing the use of TLS). | |
| 160 | 160 | # |
| 161 | -SSLCONFIG += no-ssl2 no-ssl3 no-shared | |
| 161 | +SSLCONFIG += no-ssl3 no-shared | |
| 162 | 162 | |
| 163 | 163 | #### When using zlib, make sure that OpenSSL is configured to use the zlib |
| 164 | 164 | # that Fossil knows about (i.e. the one within the source tree). |
| 165 | 165 | # |
| 166 | 166 | ifndef FOSSIL_ENABLE_MINIZ |
| @@ -170,11 +170,11 @@ | ||
| 170 | 170 | #### The directories where the OpenSSL include and library files are located. |
| 171 | 171 | # The recommended usage here is to use the Sysinternals junction tool |
| 172 | 172 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 173 | 173 | # Fossil source code directory and the target OpenSSL source directory. |
| 174 | 174 | # |
| 175 | -OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2k | |
| 175 | +OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.1.0f | |
| 176 | 176 | OPENSSLINCDIR = $(OPENSSLDIR)/include |
| 177 | 177 | OPENSSLLIBDIR = $(OPENSSLDIR) |
| 178 | 178 | |
| 179 | 179 | #### Either the directory where the Tcl library is installed or the Tcl |
| 180 | 180 | # source code directory resides (depending on the value of the macro |
| 181 | 181 |
| --- win/Makefile.mingw.mistachkin | |
| +++ win/Makefile.mingw.mistachkin | |
| @@ -154,13 +154,13 @@ | |
| 154 | ZLIBCONFIG = |
| 155 | ZLIBTARGETS = |
| 156 | endif |
| 157 | |
| 158 | #### Disable creation of the OpenSSL shared libraries. Also, disable support |
| 159 | # for both SSLv2 and SSLv3 (i.e. thereby forcing the use of TLS). |
| 160 | # |
| 161 | SSLCONFIG += no-ssl2 no-ssl3 no-shared |
| 162 | |
| 163 | #### When using zlib, make sure that OpenSSL is configured to use the zlib |
| 164 | # that Fossil knows about (i.e. the one within the source tree). |
| 165 | # |
| 166 | ifndef FOSSIL_ENABLE_MINIZ |
| @@ -170,11 +170,11 @@ | |
| 170 | #### The directories where the OpenSSL include and library files are located. |
| 171 | # The recommended usage here is to use the Sysinternals junction tool |
| 172 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 173 | # Fossil source code directory and the target OpenSSL source directory. |
| 174 | # |
| 175 | OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2k |
| 176 | OPENSSLINCDIR = $(OPENSSLDIR)/include |
| 177 | OPENSSLLIBDIR = $(OPENSSLDIR) |
| 178 | |
| 179 | #### Either the directory where the Tcl library is installed or the Tcl |
| 180 | # source code directory resides (depending on the value of the macro |
| 181 |
| --- win/Makefile.mingw.mistachkin | |
| +++ win/Makefile.mingw.mistachkin | |
| @@ -154,13 +154,13 @@ | |
| 154 | ZLIBCONFIG = |
| 155 | ZLIBTARGETS = |
| 156 | endif |
| 157 | |
| 158 | #### Disable creation of the OpenSSL shared libraries. Also, disable support |
| 159 | # for SSLv3 (i.e. thereby forcing the use of TLS). |
| 160 | # |
| 161 | SSLCONFIG += no-ssl3 no-shared |
| 162 | |
| 163 | #### When using zlib, make sure that OpenSSL is configured to use the zlib |
| 164 | # that Fossil knows about (i.e. the one within the source tree). |
| 165 | # |
| 166 | ifndef FOSSIL_ENABLE_MINIZ |
| @@ -170,11 +170,11 @@ | |
| 170 | #### The directories where the OpenSSL include and library files are located. |
| 171 | # The recommended usage here is to use the Sysinternals junction tool |
| 172 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 173 | # Fossil source code directory and the target OpenSSL source directory. |
| 174 | # |
| 175 | OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.1.0f |
| 176 | OPENSSLINCDIR = $(OPENSSLDIR)/include |
| 177 | OPENSSLLIBDIR = $(OPENSSLDIR) |
| 178 | |
| 179 | #### Either the directory where the Tcl library is installed or the Tcl |
| 180 | # source code directory resides (depending on the value of the macro |
| 181 |
+7
-7
| --- win/Makefile.msc | ||
| +++ win/Makefile.msc | ||
| @@ -98,11 +98,11 @@ | ||
| 98 | 98 | !ifndef USE_SEE |
| 99 | 99 | USE_SEE = 0 |
| 100 | 100 | !endif |
| 101 | 101 | |
| 102 | 102 | !if $(FOSSIL_ENABLE_SSL)!=0 |
| 103 | -SSLDIR = $(B)\compat\openssl-1.0.2k | |
| 103 | +SSLDIR = $(B)\compat\openssl-1.1.0f | |
| 104 | 104 | SSLINCDIR = $(SSLDIR)\inc32 |
| 105 | 105 | !if $(FOSSIL_DYNAMIC_BUILD)!=0 |
| 106 | 106 | SSLLIBDIR = $(SSLDIR)\out32dll |
| 107 | 107 | !else |
| 108 | 108 | SSLLIBDIR = $(SSLDIR)\out32 |
| @@ -110,11 +110,11 @@ | ||
| 110 | 110 | SSLLFLAGS = /nologo /opt:ref /debug |
| 111 | 111 | SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib crypt32.lib |
| 112 | 112 | !if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64" |
| 113 | 113 | !message Using 'x64' platform for OpenSSL... |
| 114 | 114 | # BUGBUG (OpenSSL): Using "no-ssl*" here breaks the build. |
| 115 | -# SSLCONFIG = VC-WIN64A no-asm no-ssl2 no-ssl3 | |
| 115 | +# SSLCONFIG = VC-WIN64A no-asm no-ssl3 | |
| 116 | 116 | SSLCONFIG = VC-WIN64A no-asm |
| 117 | 117 | !if $(FOSSIL_DYNAMIC_BUILD)!=0 |
| 118 | 118 | SSLCONFIG = $(SSLCONFIG) shared |
| 119 | 119 | !else |
| 120 | 120 | SSLCONFIG = $(SSLCONFIG) no-shared |
| @@ -125,16 +125,16 @@ | ||
| 125 | 125 | !else |
| 126 | 126 | SSLNMAKE = ms\nt.mak all |
| 127 | 127 | !endif |
| 128 | 128 | # BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds. |
| 129 | 129 | !if $(FOSSIL_DYNAMIC_BUILD)==0 |
| 130 | -SSLCFLAGS = -DOPENSSL_NO_SSL2 -DOPENSSL_NO_SSL3 | |
| 130 | +SSLCFLAGS = -DOPENSSL_NO_SSL3 | |
| 131 | 131 | !endif |
| 132 | 132 | !elseif "$(PLATFORM)"=="ia64" |
| 133 | 133 | !message Using 'ia64' platform for OpenSSL... |
| 134 | 134 | # BUGBUG (OpenSSL): Using "no-ssl*" here breaks the build. |
| 135 | -# SSLCONFIG = VC-WIN64I no-asm no-ssl2 no-ssl3 | |
| 135 | +# SSLCONFIG = VC-WIN64I no-asm no-ssl3 | |
| 136 | 136 | SSLCONFIG = VC-WIN64I no-asm |
| 137 | 137 | !if $(FOSSIL_DYNAMIC_BUILD)!=0 |
| 138 | 138 | SSLCONFIG = $(SSLCONFIG) shared |
| 139 | 139 | !else |
| 140 | 140 | SSLCONFIG = $(SSLCONFIG) no-shared |
| @@ -145,16 +145,16 @@ | ||
| 145 | 145 | !else |
| 146 | 146 | SSLNMAKE = ms\nt.mak all |
| 147 | 147 | !endif |
| 148 | 148 | # BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds. |
| 149 | 149 | !if $(FOSSIL_DYNAMIC_BUILD)==0 |
| 150 | -SSLCFLAGS = -DOPENSSL_NO_SSL2 -DOPENSSL_NO_SSL3 | |
| 150 | +SSLCFLAGS = -DOPENSSL_NO_SSL3 | |
| 151 | 151 | !endif |
| 152 | 152 | !else |
| 153 | 153 | !message Assuming 'x86' platform for OpenSSL... |
| 154 | 154 | # BUGBUG (OpenSSL): Using "no-ssl*" here breaks the build. |
| 155 | -# SSLCONFIG = VC-WIN32 no-asm no-ssl2 no-ssl3 | |
| 155 | +# SSLCONFIG = VC-WIN32 no-asm no-ssl3 | |
| 156 | 156 | SSLCONFIG = VC-WIN32 no-asm |
| 157 | 157 | !if $(FOSSIL_DYNAMIC_BUILD)!=0 |
| 158 | 158 | SSLCONFIG = $(SSLCONFIG) shared |
| 159 | 159 | !else |
| 160 | 160 | SSLCONFIG = $(SSLCONFIG) no-shared |
| @@ -165,11 +165,11 @@ | ||
| 165 | 165 | !else |
| 166 | 166 | SSLNMAKE = ms\nt.mak all |
| 167 | 167 | !endif |
| 168 | 168 | # BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds. |
| 169 | 169 | !if $(FOSSIL_DYNAMIC_BUILD)==0 |
| 170 | -SSLCFLAGS = -DOPENSSL_NO_SSL2 -DOPENSSL_NO_SSL3 | |
| 170 | +SSLCFLAGS = -DOPENSSL_NO_SSL3 | |
| 171 | 171 | !endif |
| 172 | 172 | !endif |
| 173 | 173 | !endif |
| 174 | 174 | |
| 175 | 175 | !if $(FOSSIL_ENABLE_TCL)!=0 |
| 176 | 176 |
| --- 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.0.2k |
| 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-ssl2 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 |
| @@ -125,16 +125,16 @@ | |
| 125 | !else |
| 126 | SSLNMAKE = ms\nt.mak all |
| 127 | !endif |
| 128 | # BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds. |
| 129 | !if $(FOSSIL_DYNAMIC_BUILD)==0 |
| 130 | SSLCFLAGS = -DOPENSSL_NO_SSL2 -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-ssl2 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 |
| @@ -145,16 +145,16 @@ | |
| 145 | !else |
| 146 | SSLNMAKE = ms\nt.mak all |
| 147 | !endif |
| 148 | # BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds. |
| 149 | !if $(FOSSIL_DYNAMIC_BUILD)==0 |
| 150 | SSLCFLAGS = -DOPENSSL_NO_SSL2 -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-ssl2 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 |
| @@ -165,11 +165,11 @@ | |
| 165 | !else |
| 166 | SSLNMAKE = ms\nt.mak all |
| 167 | !endif |
| 168 | # BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds. |
| 169 | !if $(FOSSIL_DYNAMIC_BUILD)==0 |
| 170 | SSLCFLAGS = -DOPENSSL_NO_SSL2 -DOPENSSL_NO_SSL3 |
| 171 | !endif |
| 172 | !endif |
| 173 | !endif |
| 174 | |
| 175 | !if $(FOSSIL_ENABLE_TCL)!=0 |
| 176 |
| --- 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.0f |
| 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 |
| @@ -125,16 +125,16 @@ | |
| 125 | !else |
| 126 | SSLNMAKE = ms\nt.mak all |
| 127 | !endif |
| 128 | # BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds. |
| 129 | !if $(FOSSIL_DYNAMIC_BUILD)==0 |
| 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 |
| @@ -145,16 +145,16 @@ | |
| 145 | !else |
| 146 | SSLNMAKE = ms\nt.mak all |
| 147 | !endif |
| 148 | # BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds. |
| 149 | !if $(FOSSIL_DYNAMIC_BUILD)==0 |
| 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 |
| @@ -165,11 +165,11 @@ | |
| 165 | !else |
| 166 | SSLNMAKE = ms\nt.mak all |
| 167 | !endif |
| 168 | # BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds. |
| 169 | !if $(FOSSIL_DYNAMIC_BUILD)==0 |
| 170 | SSLCFLAGS = -DOPENSSL_NO_SSL3 |
| 171 | !endif |
| 172 | !endif |
| 173 | !endif |
| 174 | |
| 175 | !if $(FOSSIL_ENABLE_TCL)!=0 |
| 176 |
+7
-7
| --- win/Makefile.msc | ||
| +++ win/Makefile.msc | ||
| @@ -98,11 +98,11 @@ | ||
| 98 | 98 | !ifndef USE_SEE |
| 99 | 99 | USE_SEE = 0 |
| 100 | 100 | !endif |
| 101 | 101 | |
| 102 | 102 | !if $(FOSSIL_ENABLE_SSL)!=0 |
| 103 | -SSLDIR = $(B)\compat\openssl-1.0.2k | |
| 103 | +SSLDIR = $(B)\compat\openssl-1.1.0f | |
| 104 | 104 | SSLINCDIR = $(SSLDIR)\inc32 |
| 105 | 105 | !if $(FOSSIL_DYNAMIC_BUILD)!=0 |
| 106 | 106 | SSLLIBDIR = $(SSLDIR)\out32dll |
| 107 | 107 | !else |
| 108 | 108 | SSLLIBDIR = $(SSLDIR)\out32 |
| @@ -110,11 +110,11 @@ | ||
| 110 | 110 | SSLLFLAGS = /nologo /opt:ref /debug |
| 111 | 111 | SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib crypt32.lib |
| 112 | 112 | !if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64" |
| 113 | 113 | !message Using 'x64' platform for OpenSSL... |
| 114 | 114 | # BUGBUG (OpenSSL): Using "no-ssl*" here breaks the build. |
| 115 | -# SSLCONFIG = VC-WIN64A no-asm no-ssl2 no-ssl3 | |
| 115 | +# SSLCONFIG = VC-WIN64A no-asm no-ssl3 | |
| 116 | 116 | SSLCONFIG = VC-WIN64A no-asm |
| 117 | 117 | !if $(FOSSIL_DYNAMIC_BUILD)!=0 |
| 118 | 118 | SSLCONFIG = $(SSLCONFIG) shared |
| 119 | 119 | !else |
| 120 | 120 | SSLCONFIG = $(SSLCONFIG) no-shared |
| @@ -125,16 +125,16 @@ | ||
| 125 | 125 | !else |
| 126 | 126 | SSLNMAKE = ms\nt.mak all |
| 127 | 127 | !endif |
| 128 | 128 | # BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds. |
| 129 | 129 | !if $(FOSSIL_DYNAMIC_BUILD)==0 |
| 130 | -SSLCFLAGS = -DOPENSSL_NO_SSL2 -DOPENSSL_NO_SSL3 | |
| 130 | +SSLCFLAGS = -DOPENSSL_NO_SSL3 | |
| 131 | 131 | !endif |
| 132 | 132 | !elseif "$(PLATFORM)"=="ia64" |
| 133 | 133 | !message Using 'ia64' platform for OpenSSL... |
| 134 | 134 | # BUGBUG (OpenSSL): Using "no-ssl*" here breaks the build. |
| 135 | -# SSLCONFIG = VC-WIN64I no-asm no-ssl2 no-ssl3 | |
| 135 | +# SSLCONFIG = VC-WIN64I no-asm no-ssl3 | |
| 136 | 136 | SSLCONFIG = VC-WIN64I no-asm |
| 137 | 137 | !if $(FOSSIL_DYNAMIC_BUILD)!=0 |
| 138 | 138 | SSLCONFIG = $(SSLCONFIG) shared |
| 139 | 139 | !else |
| 140 | 140 | SSLCONFIG = $(SSLCONFIG) no-shared |
| @@ -145,16 +145,16 @@ | ||
| 145 | 145 | !else |
| 146 | 146 | SSLNMAKE = ms\nt.mak all |
| 147 | 147 | !endif |
| 148 | 148 | # BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds. |
| 149 | 149 | !if $(FOSSIL_DYNAMIC_BUILD)==0 |
| 150 | -SSLCFLAGS = -DOPENSSL_NO_SSL2 -DOPENSSL_NO_SSL3 | |
| 150 | +SSLCFLAGS = -DOPENSSL_NO_SSL3 | |
| 151 | 151 | !endif |
| 152 | 152 | !else |
| 153 | 153 | !message Assuming 'x86' platform for OpenSSL... |
| 154 | 154 | # BUGBUG (OpenSSL): Using "no-ssl*" here breaks the build. |
| 155 | -# SSLCONFIG = VC-WIN32 no-asm no-ssl2 no-ssl3 | |
| 155 | +# SSLCONFIG = VC-WIN32 no-asm no-ssl3 | |
| 156 | 156 | SSLCONFIG = VC-WIN32 no-asm |
| 157 | 157 | !if $(FOSSIL_DYNAMIC_BUILD)!=0 |
| 158 | 158 | SSLCONFIG = $(SSLCONFIG) shared |
| 159 | 159 | !else |
| 160 | 160 | SSLCONFIG = $(SSLCONFIG) no-shared |
| @@ -165,11 +165,11 @@ | ||
| 165 | 165 | !else |
| 166 | 166 | SSLNMAKE = ms\nt.mak all |
| 167 | 167 | !endif |
| 168 | 168 | # BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds. |
| 169 | 169 | !if $(FOSSIL_DYNAMIC_BUILD)==0 |
| 170 | -SSLCFLAGS = -DOPENSSL_NO_SSL2 -DOPENSSL_NO_SSL3 | |
| 170 | +SSLCFLAGS = -DOPENSSL_NO_SSL3 | |
| 171 | 171 | !endif |
| 172 | 172 | !endif |
| 173 | 173 | !endif |
| 174 | 174 | |
| 175 | 175 | !if $(FOSSIL_ENABLE_TCL)!=0 |
| 176 | 176 |
| --- 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.0.2k |
| 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-ssl2 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 |
| @@ -125,16 +125,16 @@ | |
| 125 | !else |
| 126 | SSLNMAKE = ms\nt.mak all |
| 127 | !endif |
| 128 | # BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds. |
| 129 | !if $(FOSSIL_DYNAMIC_BUILD)==0 |
| 130 | SSLCFLAGS = -DOPENSSL_NO_SSL2 -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-ssl2 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 |
| @@ -145,16 +145,16 @@ | |
| 145 | !else |
| 146 | SSLNMAKE = ms\nt.mak all |
| 147 | !endif |
| 148 | # BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds. |
| 149 | !if $(FOSSIL_DYNAMIC_BUILD)==0 |
| 150 | SSLCFLAGS = -DOPENSSL_NO_SSL2 -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-ssl2 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 |
| @@ -165,11 +165,11 @@ | |
| 165 | !else |
| 166 | SSLNMAKE = ms\nt.mak all |
| 167 | !endif |
| 168 | # BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds. |
| 169 | !if $(FOSSIL_DYNAMIC_BUILD)==0 |
| 170 | SSLCFLAGS = -DOPENSSL_NO_SSL2 -DOPENSSL_NO_SSL3 |
| 171 | !endif |
| 172 | !endif |
| 173 | !endif |
| 174 | |
| 175 | !if $(FOSSIL_ENABLE_TCL)!=0 |
| 176 |
| --- 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.0f |
| 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 |
| @@ -125,16 +125,16 @@ | |
| 125 | !else |
| 126 | SSLNMAKE = ms\nt.mak all |
| 127 | !endif |
| 128 | # BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds. |
| 129 | !if $(FOSSIL_DYNAMIC_BUILD)==0 |
| 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 |
| @@ -145,16 +145,16 @@ | |
| 145 | !else |
| 146 | SSLNMAKE = ms\nt.mak all |
| 147 | !endif |
| 148 | # BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds. |
| 149 | !if $(FOSSIL_DYNAMIC_BUILD)==0 |
| 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 |
| @@ -165,11 +165,11 @@ | |
| 165 | !else |
| 166 | SSLNMAKE = ms\nt.mak all |
| 167 | !endif |
| 168 | # BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds. |
| 169 | !if $(FOSSIL_DYNAMIC_BUILD)==0 |
| 170 | SSLCFLAGS = -DOPENSSL_NO_SSL3 |
| 171 | !endif |
| 172 | !endif |
| 173 | !endif |
| 174 | |
| 175 | !if $(FOSSIL_ENABLE_TCL)!=0 |
| 176 |
+1
-1
| --- www/build.wiki | ||
| +++ www/build.wiki | ||
| @@ -136,11 +136,11 @@ | ||
| 136 | 136 | the optional <a href="https://www.openssl.org/">OpenSSL</a> support, |
| 137 | 137 | first <a href="https://www.openssl.org/source/">download the official |
| 138 | 138 | source code for OpenSSL</a> and extract it to an appropriately named |
| 139 | 139 | "<b>openssl-X.Y.ZA</b>" subdirectory within the local |
| 140 | 140 | [/tree?ci=trunk&name=compat | compat] directory (e.g. |
| 141 | -"<b>compat/openssl-1.0.2k</b>"), then make sure that some recent | |
| 141 | +"<b>compat/openssl-1.1.0f</b>"), then make sure that some recent | |
| 142 | 142 | <a href="http://www.perl.org/">Perl</a> binaries are installed locally, |
| 143 | 143 | and finally run one of the following commands: |
| 144 | 144 | <blockquote><pre> |
| 145 | 145 | nmake /f Makefile.msc FOSSIL_ENABLE_SSL=1 FOSSIL_BUILD_SSL=1 PERLDIR=C:\full\path\to\Perl\bin |
| 146 | 146 | </pre></blockquote> |
| 147 | 147 |
| --- www/build.wiki | |
| +++ www/build.wiki | |
| @@ -136,11 +136,11 @@ | |
| 136 | the optional <a href="https://www.openssl.org/">OpenSSL</a> support, |
| 137 | first <a href="https://www.openssl.org/source/">download the official |
| 138 | source code for OpenSSL</a> and extract it to an appropriately named |
| 139 | "<b>openssl-X.Y.ZA</b>" subdirectory within the local |
| 140 | [/tree?ci=trunk&name=compat | compat] directory (e.g. |
| 141 | "<b>compat/openssl-1.0.2k</b>"), then make sure that some recent |
| 142 | <a href="http://www.perl.org/">Perl</a> binaries are installed locally, |
| 143 | and finally run one of the following commands: |
| 144 | <blockquote><pre> |
| 145 | nmake /f Makefile.msc FOSSIL_ENABLE_SSL=1 FOSSIL_BUILD_SSL=1 PERLDIR=C:\full\path\to\Perl\bin |
| 146 | </pre></blockquote> |
| 147 |
| --- www/build.wiki | |
| +++ www/build.wiki | |
| @@ -136,11 +136,11 @@ | |
| 136 | the optional <a href="https://www.openssl.org/">OpenSSL</a> support, |
| 137 | first <a href="https://www.openssl.org/source/">download the official |
| 138 | source code for OpenSSL</a> and extract it to an appropriately named |
| 139 | "<b>openssl-X.Y.ZA</b>" subdirectory within the local |
| 140 | [/tree?ci=trunk&name=compat | compat] directory (e.g. |
| 141 | "<b>compat/openssl-1.1.0f</b>"), then make sure that some recent |
| 142 | <a href="http://www.perl.org/">Perl</a> binaries are installed locally, |
| 143 | and finally run one of the following commands: |
| 144 | <blockquote><pre> |
| 145 | nmake /f Makefile.msc FOSSIL_ENABLE_SSL=1 FOSSIL_BUILD_SSL=1 PERLDIR=C:\full\path\to\Perl\bin |
| 146 | </pre></blockquote> |
| 147 |
+1
-1
| --- www/build.wiki | ||
| +++ www/build.wiki | ||
| @@ -136,11 +136,11 @@ | ||
| 136 | 136 | the optional <a href="https://www.openssl.org/">OpenSSL</a> support, |
| 137 | 137 | first <a href="https://www.openssl.org/source/">download the official |
| 138 | 138 | source code for OpenSSL</a> and extract it to an appropriately named |
| 139 | 139 | "<b>openssl-X.Y.ZA</b>" subdirectory within the local |
| 140 | 140 | [/tree?ci=trunk&name=compat | compat] directory (e.g. |
| 141 | -"<b>compat/openssl-1.0.2k</b>"), then make sure that some recent | |
| 141 | +"<b>compat/openssl-1.1.0f</b>"), then make sure that some recent | |
| 142 | 142 | <a href="http://www.perl.org/">Perl</a> binaries are installed locally, |
| 143 | 143 | and finally run one of the following commands: |
| 144 | 144 | <blockquote><pre> |
| 145 | 145 | nmake /f Makefile.msc FOSSIL_ENABLE_SSL=1 FOSSIL_BUILD_SSL=1 PERLDIR=C:\full\path\to\Perl\bin |
| 146 | 146 | </pre></blockquote> |
| 147 | 147 |
| --- www/build.wiki | |
| +++ www/build.wiki | |
| @@ -136,11 +136,11 @@ | |
| 136 | the optional <a href="https://www.openssl.org/">OpenSSL</a> support, |
| 137 | first <a href="https://www.openssl.org/source/">download the official |
| 138 | source code for OpenSSL</a> and extract it to an appropriately named |
| 139 | "<b>openssl-X.Y.ZA</b>" subdirectory within the local |
| 140 | [/tree?ci=trunk&name=compat | compat] directory (e.g. |
| 141 | "<b>compat/openssl-1.0.2k</b>"), then make sure that some recent |
| 142 | <a href="http://www.perl.org/">Perl</a> binaries are installed locally, |
| 143 | and finally run one of the following commands: |
| 144 | <blockquote><pre> |
| 145 | nmake /f Makefile.msc FOSSIL_ENABLE_SSL=1 FOSSIL_BUILD_SSL=1 PERLDIR=C:\full\path\to\Perl\bin |
| 146 | </pre></blockquote> |
| 147 |
| --- www/build.wiki | |
| +++ www/build.wiki | |
| @@ -136,11 +136,11 @@ | |
| 136 | the optional <a href="https://www.openssl.org/">OpenSSL</a> support, |
| 137 | first <a href="https://www.openssl.org/source/">download the official |
| 138 | source code for OpenSSL</a> and extract it to an appropriately named |
| 139 | "<b>openssl-X.Y.ZA</b>" subdirectory within the local |
| 140 | [/tree?ci=trunk&name=compat | compat] directory (e.g. |
| 141 | "<b>compat/openssl-1.1.0f</b>"), then make sure that some recent |
| 142 | <a href="http://www.perl.org/">Perl</a> binaries are installed locally, |
| 143 | and finally run one of the following commands: |
| 144 | <blockquote><pre> |
| 145 | nmake /f Makefile.msc FOSSIL_ENABLE_SSL=1 FOSSIL_BUILD_SSL=1 PERLDIR=C:\full\path\to\Perl\bin |
| 146 | </pre></blockquote> |
| 147 |