Fossil SCM

Update referenced OpenSSL version

jan.nijtmans 2016-09-07 10:41 trunk
Commit 958f1a89dc720e96687be38864479b35833fbeb0
Parent db59821f890cf66…
6 files changed +2 -2 +2 -2 +1 -1 +1 -1 +1 -1 +1 -1
~ src/http_ssl.c ~ src/makemake.tcl ~ win/Makefile.mingw ~ win/Makefile.mingw.mistachkin ~ win/Makefile.msc ~ www/build.wiki
M src/http_ssl.c
+2 -2
--- src/http_ssl.c
+++ src/http_ssl.c
@@ -294,11 +294,11 @@
294294
295295
 SSL_set_mode(ssl, SSL_MODE_AUTO_RETRY);
296296
297297
 if( !pUrlData->useProxy ){
298298
 BIO_set_conn_hostname(iBio, pUrlData->name);
299
- BIO_set_conn_int_port(iBio, &pUrlData->port);
299
+ BIO_ctrl(iBio,BIO_C_SET_CONNECT,3,(char *)&pUrlData->port);
300300
 if( BIO_do_connect(iBio)<=0 ){
301301
 ssl_set_errmsg("SSL: cannot connect to host %s:%d (%s)",
302302
 pUrlData->name, pUrlData->port, ERR_reason_error_string(ERR_get_error()));
303303
 ssl_close();
304304
 return 1;
@@ -389,11 +389,11 @@
389389
 ** This is used to populate the ipaddr column of the rcvfrom table,
390390
 ** if any files are received from the server.
391391
 */
392392
 {
393393
 /* IPv4 only code */
394
- const unsigned char *ip = (const unsigned char *) BIO_get_conn_ip(iBio);
394
+ const unsigned char *ip = (const unsigned char *) BIO_ptr_ctrl(iBio,BIO_C_GET_CONNECT,2);
395395
 g.zIpAddr = mprintf("%d.%d.%d.%d", ip[0], ip[1], ip[2], ip[3]);
396396
 }
397397
398398
 X509_free(cert);
399399
 return 0;
400400
--- src/http_ssl.c
+++ src/http_ssl.c
@@ -294,11 +294,11 @@
294
295 SSL_set_mode(ssl, SSL_MODE_AUTO_RETRY);
296
297 if( !pUrlData->useProxy ){
298 BIO_set_conn_hostname(iBio, pUrlData->name);
299 BIO_set_conn_int_port(iBio, &pUrlData->port);
300 if( BIO_do_connect(iBio)<=0 ){
301 ssl_set_errmsg("SSL: cannot connect to host %s:%d (%s)",
302 pUrlData->name, pUrlData->port, ERR_reason_error_string(ERR_get_error()));
303 ssl_close();
304 return 1;
@@ -389,11 +389,11 @@
389 ** This is used to populate the ipaddr column of the rcvfrom table,
390 ** if any files are received from the server.
391 */
392 {
393 /* IPv4 only code */
394 const unsigned char *ip = (const unsigned char *) BIO_get_conn_ip(iBio);
395 g.zIpAddr = mprintf("%d.%d.%d.%d", ip[0], ip[1], ip[2], ip[3]);
396 }
397
398 X509_free(cert);
399 return 0;
400
--- src/http_ssl.c
+++ src/http_ssl.c
@@ -294,11 +294,11 @@
294
295 SSL_set_mode(ssl, SSL_MODE_AUTO_RETRY);
296
297 if( !pUrlData->useProxy ){
298 BIO_set_conn_hostname(iBio, pUrlData->name);
299 BIO_ctrl(iBio,BIO_C_SET_CONNECT,3,(char *)&pUrlData->port);
300 if( BIO_do_connect(iBio)<=0 ){
301 ssl_set_errmsg("SSL: cannot connect to host %s:%d (%s)",
302 pUrlData->name, pUrlData->port, ERR_reason_error_string(ERR_get_error()));
303 ssl_close();
304 return 1;
@@ -389,11 +389,11 @@
389 ** This is used to populate the ipaddr column of the rcvfrom table,
390 ** if any files are received from the server.
391 */
392 {
393 /* IPv4 only code */
394 const unsigned char *ip = (const unsigned char *) BIO_ptr_ctrl(iBio,BIO_C_GET_CONNECT,2);
395 g.zIpAddr = mprintf("%d.%d.%d.%d", ip[0], ip[1], ip[2], ip[3]);
396 }
397
398 X509_free(cert);
399 return 0;
400
M src/makemake.tcl
+2 -2
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -661,11 +661,11 @@
661661
 #### The directories where the OpenSSL include and library files are located.
662662
 # The recommended usage here is to use the Sysinternals junction tool
663663
 # to create a hard link between an "openssl-1.x" sub-directory of the
664664
 # Fossil source code directory and the target OpenSSL source directory.
665665
 #
666
-OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2h
666
+OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.1.0
667667
 OPENSSLINCDIR = $(OPENSSLDIR)/include
668668
 OPENSSLLIBDIR = $(OPENSSLDIR)
669669
670670
 #### Either the directory where the Tcl library is installed or the Tcl
671671
 # source code directory resides (depending on the value of the macro
@@ -1491,11 +1491,11 @@
14911491
 !ifndef USE_SEE
14921492
 USE_SEE = 0
14931493
 !endif
14941494
14951495
 !if $(FOSSIL_ENABLE_SSL)!=0
1496
-SSLDIR = $(B)\compat\openssl-1.0.2h
1496
+SSLDIR = $(B)\compat\openssl-1.1.0
14971497
 SSLINCDIR = $(SSLDIR)\inc32
14981498
 !if $(FOSSIL_DYNAMIC_BUILD)!=0
14991499
 SSLLIBDIR = $(SSLDIR)\out32dll
15001500
 !else
15011501
 SSLLIBDIR = $(SSLDIR)\out32
15021502
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -661,11 +661,11 @@
661 #### The directories where the OpenSSL include and library files are located.
662 # The recommended usage here is to use the Sysinternals junction tool
663 # to create a hard link between an "openssl-1.x" sub-directory of the
664 # Fossil source code directory and the target OpenSSL source directory.
665 #
666 OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2h
667 OPENSSLINCDIR = $(OPENSSLDIR)/include
668 OPENSSLLIBDIR = $(OPENSSLDIR)
669
670 #### Either the directory where the Tcl library is installed or the Tcl
671 # source code directory resides (depending on the value of the macro
@@ -1491,11 +1491,11 @@
1491 !ifndef USE_SEE
1492 USE_SEE = 0
1493 !endif
1494
1495 !if $(FOSSIL_ENABLE_SSL)!=0
1496 SSLDIR = $(B)\compat\openssl-1.0.2h
1497 SSLINCDIR = $(SSLDIR)\inc32
1498 !if $(FOSSIL_DYNAMIC_BUILD)!=0
1499 SSLLIBDIR = $(SSLDIR)\out32dll
1500 !else
1501 SSLLIBDIR = $(SSLDIR)\out32
1502
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -661,11 +661,11 @@
661 #### The directories where the OpenSSL include and library files are located.
662 # The recommended usage here is to use the Sysinternals junction tool
663 # to create a hard link between an "openssl-1.x" sub-directory of the
664 # Fossil source code directory and the target OpenSSL source directory.
665 #
666 OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.1.0
667 OPENSSLINCDIR = $(OPENSSLDIR)/include
668 OPENSSLLIBDIR = $(OPENSSLDIR)
669
670 #### Either the directory where the Tcl library is installed or the Tcl
671 # source code directory resides (depending on the value of the macro
@@ -1491,11 +1491,11 @@
1491 !ifndef USE_SEE
1492 USE_SEE = 0
1493 !endif
1494
1495 !if $(FOSSIL_ENABLE_SSL)!=0
1496 SSLDIR = $(B)\compat\openssl-1.1.0
1497 SSLINCDIR = $(SSLDIR)\inc32
1498 !if $(FOSSIL_DYNAMIC_BUILD)!=0
1499 SSLLIBDIR = $(SSLDIR)\out32dll
1500 !else
1501 SSLLIBDIR = $(SSLDIR)\out32
1502
M win/Makefile.mingw
+1 -1
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -170,11 +170,11 @@
170170
 #### The directories where the OpenSSL include and library files are located.
171171
 # The recommended usage here is to use the Sysinternals junction tool
172172
 # to create a hard link between an "openssl-1.x" sub-directory of the
173173
 # Fossil source code directory and the target OpenSSL source directory.
174174
 #
175
-OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2h
175
+OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.1.0
176176
 OPENSSLINCDIR = $(OPENSSLDIR)/include
177177
 OPENSSLLIBDIR = $(OPENSSLDIR)
178178
179179
 #### Either the directory where the Tcl library is installed or the Tcl
180180
 # source code directory resides (depending on the value of the macro
181181
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -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.2h
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
@@ -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.0
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
M win/Makefile.mingw.mistachkin
+1 -1
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -170,11 +170,11 @@
170170
 #### The directories where the OpenSSL include and library files are located.
171171
 # The recommended usage here is to use the Sysinternals junction tool
172172
 # to create a hard link between an "openssl-1.x" sub-directory of the
173173
 # Fossil source code directory and the target OpenSSL source directory.
174174
 #
175
-OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2h
175
+OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.1.0
176176
 OPENSSLINCDIR = $(OPENSSLDIR)/include
177177
 OPENSSLLIBDIR = $(OPENSSLDIR)
178178
179179
 #### Either the directory where the Tcl library is installed or the Tcl
180180
 # source code directory resides (depending on the value of the macro
181181
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -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.2h
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
@@ -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.0
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
M win/Makefile.msc
+1 -1
--- 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.0.2h
103
+SSLDIR = $(B)\compat\openssl-1.1.0
104104
 SSLINCDIR = $(SSLDIR)\inc32
105105
 !if $(FOSSIL_DYNAMIC_BUILD)!=0
106106
 SSLLIBDIR = $(SSLDIR)\out32dll
107107
 !else
108108
 SSLLIBDIR = $(SSLDIR)\out32
109109
--- 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.2h
104 SSLINCDIR = $(SSLDIR)\inc32
105 !if $(FOSSIL_DYNAMIC_BUILD)!=0
106 SSLLIBDIR = $(SSLDIR)\out32dll
107 !else
108 SSLLIBDIR = $(SSLDIR)\out32
109
--- 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.0
104 SSLINCDIR = $(SSLDIR)\inc32
105 !if $(FOSSIL_DYNAMIC_BUILD)!=0
106 SSLLIBDIR = $(SSLDIR)\out32dll
107 !else
108 SSLLIBDIR = $(SSLDIR)\out32
109
M www/build.wiki
+1 -1
--- www/build.wiki
+++ www/build.wiki
@@ -141,11 +141,11 @@
141141
 the optional <a href="https://www.openssl.org/">OpenSSL</a> support,
142142
 first <a href="https://www.openssl.org/source/">download the official
143143
 source code for OpenSSL</a> and extract it to an appropriately named
144144
 "<b>openssl-X.Y.ZA</b>" subdirectory within the local
145145
 [/tree?ci=trunk&name=compat | compat] directory (e.g.
146
-"<b>compat/openssl-1.0.2h</b>"), then make sure that some recent
146
+"<b>compat/openssl-1.1.0</b>"), then make sure that some recent
147147
 <a href="http://www.perl.org/">Perl</a> binaries are installed locally,
148148
 and finally run one of the following commands:
149149
 <blockquote><pre>
150150
 nmake /f Makefile.msc FOSSIL_ENABLE_SSL=1 FOSSIL_BUILD_SSL=1 PERLDIR=C:\full\path\to\Perl\bin
151151
 </pre></blockquote>
152152
--- www/build.wiki
+++ www/build.wiki
@@ -141,11 +141,11 @@
141 the optional <a href="https://www.openssl.org/">OpenSSL</a> support,
142 first <a href="https://www.openssl.org/source/">download the official
143 source code for OpenSSL</a> and extract it to an appropriately named
144 "<b>openssl-X.Y.ZA</b>" subdirectory within the local
145 [/tree?ci=trunk&name=compat | compat] directory (e.g.
146 "<b>compat/openssl-1.0.2h</b>"), then make sure that some recent
147 <a href="http://www.perl.org/">Perl</a> binaries are installed locally,
148 and finally run one of the following commands:
149 <blockquote><pre>
150 nmake /f Makefile.msc FOSSIL_ENABLE_SSL=1 FOSSIL_BUILD_SSL=1 PERLDIR=C:\full\path\to\Perl\bin
151 </pre></blockquote>
152
--- www/build.wiki
+++ www/build.wiki
@@ -141,11 +141,11 @@
141 the optional <a href="https://www.openssl.org/">OpenSSL</a> support,
142 first <a href="https://www.openssl.org/source/">download the official
143 source code for OpenSSL</a> and extract it to an appropriately named
144 "<b>openssl-X.Y.ZA</b>" subdirectory within the local
145 [/tree?ci=trunk&name=compat | compat] directory (e.g.
146 "<b>compat/openssl-1.1.0</b>"), then make sure that some recent
147 <a href="http://www.perl.org/">Perl</a> binaries are installed locally,
148 and finally run one of the following commands:
149 <blockquote><pre>
150 nmake /f Makefile.msc FOSSIL_ENABLE_SSL=1 FOSSIL_BUILD_SSL=1 PERLDIR=C:\full\path\to\Perl\bin
151 </pre></blockquote>
152

Keyboard Shortcuts

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