cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove fallback that disables TLS if a connection fails; has been useless for

Browse Source 
some time but now build fails because options was moved to internal-only in
libressl
This commit is contained in:
sthen 2017-01-27 11:23:21 +00:00
parent cec1eae965
commit a649130207
3 changed files with 49 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
www/links/Makefile
View File

@ -1,8 +1,9 @@
# $OpenBSD: Makefile,v 1.20 2013/03/11 11:44:42 espie Exp $
# $OpenBSD: Makefile,v 1.21 2017/01/27 11:23:21 sthen Exp $
COMMENT= text browser, displays while downloading
VERSION= 1.03
REVISION= 0
DISTNAME= links-${VERSION}
CATEGORIES= www
@ -11,6 +12,7 @@ MAINTAINER= Marc Espie <espie@openbsd.org>
# GPLv2+
PERMIT_PACKAGE_CDROM= Yes
WANTLIB= c crypto ssl z
MASTER_SITES= ${HOMEPAGE}download/

35
www/links/patches/patch-connect_c Normal file
View File

@ -0,0 +1,35 @@
$OpenBSD: patch-connect_c,v 1.1 2017/01/27 11:23:21 sthen Exp $
--- connect.c.orig Fri Jan 27 11:15:16 2017
+++ connect.c Fri Jan 27 11:19:13 2017
@@ -106,7 +106,6 @@ void ssl_want_read(struct connection *c)
set_timeout(c);
- if (c->no_tsl) c->ssl->options |= SSL_OP_NO_TLSv1;
switch (SSL_get_error(c->ssl, SSL_connect(c->ssl))) {
case SSL_ERROR_NONE:
c->newconn = NULL;
@@ -120,7 +119,6 @@ void ssl_want_read(struct connection *c)
set_handlers(*b->sock, NULL, (void(*)(void *))ssl_want_read, (void(*)(void *))exception, c);
break;
default:
- c->no_tsl++;
setcstate(c, S_SSL_ERROR);
retry_connection(c);
break;
@@ -186,7 +184,6 @@ void connected(struct connection *c)
if (c->ssl) {
c->ssl = getSSL();
SSL_set_fd(c->ssl, *b->sock);
- if (c->no_tsl) c->ssl->options |= SSL_OP_NO_TLSv1;
switch (SSL_get_error(c->ssl, SSL_connect(c->ssl))) {
case SSL_ERROR_WANT_READ:
setcstate(c, S_SSL_NEG);
@@ -199,7 +196,6 @@ void connected(struct connection *c)
case SSL_ERROR_NONE:
break;
default:
- c->no_tsl++;
setcstate(c, S_SSL_ERROR);
retry_connection(c);
return;

11
www/links/patches/patch-links_h Normal file
View File

@ -0,0 +1,11 @@
$OpenBSD: patch-links_h,v 1.1 2017/01/27 11:23:21 sthen Exp $
--- links.h.orig Fri Jan 27 11:19:20 2017
+++ links.h Fri Jan 27 11:19:23 2017
@@ -820,7 +820,6 @@ struct connection {
int detached;
#ifdef HAVE_SSL
SSL *ssl;
- int no_tsl;
#endif
};