Fossil SCM

Since libressl abuses OPENSSL_VERSION_NUMBER, don't let fossil being confused by that.

jan.nijtmans 2019-05-23 19:29 branch-2.8

Commit 06cb09dde7d287e1761ed7f5556d42206ff655cb2da6289a66d889817de5dd58

Parent e5616cdac8eafc7…

3 files changed -1 +4 -1 +4 -1

M auto.def

-1

		--- auto.def
		+++ auto.def
		@@ -376,11 +376,10 @@
376	376	if {[string match -darwin [get-define host]]} {
377	377	if {[cctest -cflags {-Wdeprecated-declarations}]} {
378	378	define-append EXTRA_CFLAGS -Wdeprecated-declarations
379	379	}
380	380	}
381		- cc-check-function-in-lib BIO_ADDR_hostname_string ssl
382	381	} else {
383	382	user-error "OpenSSL not found. Consider --with-openssl=none to disable HTTPS support"
384	383	}
385	384	} else {
386	385	if {[info exists ::zlib_lib]} {
387	386

	--- auto.def
	+++ auto.def
	@@ -376,11 +376,10 @@
376	if {[string match -darwin [get-define host]]} {
377	if {[cctest -cflags {-Wdeprecated-declarations}]} {
378	define-append EXTRA_CFLAGS -Wdeprecated-declarations
379	}
380	}
381	cc-check-function-in-lib BIO_ADDR_hostname_string ssl
382	} else {
383	user-error "OpenSSL not found. Consider --with-openssl=none to disable HTTPS support"
384	}
385	} else {
386	if {[info exists ::zlib_lib]} {
387

	--- auto.def
	+++ auto.def
	@@ -376,11 +376,10 @@
376	if {[string match -darwin [get-define host]]} {
377	if {[cctest -cflags {-Wdeprecated-declarations}]} {
378	define-append EXTRA_CFLAGS -Wdeprecated-declarations
379	}
380	}

381	} else {
382	user-error "OpenSSL not found. Consider --with-openssl=none to disable HTTPS support"
383	}
384	} else {
385	if {[info exists ::zlib_lib]} {
386

M src/http_ssl.c

+4 -1

		--- src/http_ssl.c
		+++ src/http_ssl.c
		@@ -387,11 +387,14 @@
387	387	/* Set the Global.zIpAddr variable to the server we are talking to.
388	388	** This is used to populate the ipaddr column of the rcvfrom table,
389	389	** if any files are received from the server.
390	390	*/
391	391	{
392		-#ifdef HAVE_BIO_ADDR_HOSTNAME_STRING
	392	+ /* As soon as libressl implements BIO_ADDR_hostname_string/BIO_get_conn_address.
	393	+ * check here for the correct LIBRESSL_VERSION_NUMBER too. For now: disable */
	394	+ #if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000L \
	395	+ && !defined(LIBRESSL_VERSION_NUMBER)
393	396	char *ip = BIO_ADDR_hostname_string(BIO_get_conn_address(iBio),1);
394	397	g.zIpAddr = mprintf("%s", ip);
395	398	OPENSSL_free(ip);
396	399	#else
397	400	/* IPv4 only code */
398	401

	--- src/http_ssl.c
	+++ src/http_ssl.c
	@@ -387,11 +387,14 @@
387	/* Set the Global.zIpAddr variable to the server we are talking to.
388	** This is used to populate the ipaddr column of the rcvfrom table,
389	** if any files are received from the server.
390	*/
391	{
392	#ifdef HAVE_BIO_ADDR_HOSTNAME_STRING



393	char *ip = BIO_ADDR_hostname_string(BIO_get_conn_address(iBio),1);
394	g.zIpAddr = mprintf("%s", ip);
395	OPENSSL_free(ip);
396	#else
397	/* IPv4 only code */
398

	--- src/http_ssl.c
	+++ src/http_ssl.c
	@@ -387,11 +387,14 @@
387	/* Set the Global.zIpAddr variable to the server we are talking to.
388	** This is used to populate the ipaddr column of the rcvfrom table,
389	** if any files are received from the server.
390	*/
391	{
392	/* As soon as libressl implements BIO_ADDR_hostname_string/BIO_get_conn_address.
393	* check here for the correct LIBRESSL_VERSION_NUMBER too. For now: disable */
394	#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000L \
395	&& !defined(LIBRESSL_VERSION_NUMBER)
396	char *ip = BIO_ADDR_hostname_string(BIO_get_conn_address(iBio),1);
397	g.zIpAddr = mprintf("%s", ip);
398	OPENSSL_free(ip);
399	#else
400	/* IPv4 only code */
401

M src/http_ssl.c

+4 -1

		--- src/http_ssl.c
		+++ src/http_ssl.c
		@@ -387,11 +387,14 @@
387	387	/* Set the Global.zIpAddr variable to the server we are talking to.
388	388	** This is used to populate the ipaddr column of the rcvfrom table,
389	389	** if any files are received from the server.
390	390	*/
391	391	{
392		-#ifdef HAVE_BIO_ADDR_HOSTNAME_STRING
	392	+ /* As soon as libressl implements BIO_ADDR_hostname_string/BIO_get_conn_address.
	393	+ * check here for the correct LIBRESSL_VERSION_NUMBER too. For now: disable */
	394	+ #if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000L \
	395	+ && !defined(LIBRESSL_VERSION_NUMBER)
393	396	char *ip = BIO_ADDR_hostname_string(BIO_get_conn_address(iBio),1);
394	397	g.zIpAddr = mprintf("%s", ip);
395	398	OPENSSL_free(ip);
396	399	#else
397	400	/* IPv4 only code */
398	401

	--- src/http_ssl.c
	+++ src/http_ssl.c
	@@ -387,11 +387,14 @@
387	/* Set the Global.zIpAddr variable to the server we are talking to.
388	** This is used to populate the ipaddr column of the rcvfrom table,
389	** if any files are received from the server.
390	*/
391	{
392	#ifdef HAVE_BIO_ADDR_HOSTNAME_STRING



393	char *ip = BIO_ADDR_hostname_string(BIO_get_conn_address(iBio),1);
394	g.zIpAddr = mprintf("%s", ip);
395	OPENSSL_free(ip);
396	#else
397	/* IPv4 only code */
398

	--- src/http_ssl.c
	+++ src/http_ssl.c
	@@ -387,11 +387,14 @@
387	/* Set the Global.zIpAddr variable to the server we are talking to.
388	** This is used to populate the ipaddr column of the rcvfrom table,
389	** if any files are received from the server.
390	*/
391	{
392	/* As soon as libressl implements BIO_ADDR_hostname_string/BIO_get_conn_address.
393	* check here for the correct LIBRESSL_VERSION_NUMBER too. For now: disable */
394	#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000L \
395	&& !defined(LIBRESSL_VERSION_NUMBER)
396	char *ip = BIO_ADDR_hostname_string(BIO_get_conn_address(iBio),1);
397	g.zIpAddr = mprintf("%s", ip);
398	OPENSSL_free(ip);
399	#else
400	/* IPv4 only code */
401