Commit d404a949 authored by Axel Beckert's avatar Axel Beckert

Imported Upstream version 2.8.9dev9

parent a18a7e58
-- $LynxId: CHANGES,v 1.837 2015/12/22 02:00:47 tom Exp $
-- $LynxId: CHANGES,v 1.845 2016/04/26 09:25:09 tom Exp $
===============================================================================
Changes since Lynx 2.8 release
===============================================================================
2016-04-26 (2.8.9dev.9)
* add workaround for servers such as https://www.xing.com which fail to close
the connection when they finish sending compressed data. This relies on
the content-length (report by Klaus-Peter Wegge) -TD
* restore fix to filter out left-to-right marks which was broken in refactoring
in 2.8.9dev.2, and also filter out right-to-left marks (Debian #808949) -TD
* fix build for current gnutls configuration which dropped the
gnutls_protocol_set_priority function (reported by Axel Beckert, Andreas
Metzler) -TD
* modify CF_LD_RPATH_OPT configure macro, changing FreeBSD case to use
-Wl,-rpath rather than -rpath option. According to FreeBSD #178732, either
works since FreeBSD 4.x; however scons does not accept anything except the
-Wl,-rpath form -TD
* add null-pointer checks for ssl_ctx in HTTP.c in case of error from calls
on SSL_CTX_new (report by Yuan Jochen Kang) -TD
* update config.guess (2016-01-01), config.sub (2016-01-01)
* update da.po, fi.po, tr.po from
http://translationproject.org/latest/lynx
2015-12-18 (2.8.9dev.8)
* fix regression in SSL support (report by Axel Beckert) -TD
* update et.po, fr.po, vi.po, zh_CN.po from
......
Copyright 1997-2014,2015 Thomas E. Dickey
Copyright 1997-2015,2016 Thomas E. Dickey
This copyright notice must be included in all copies or substantial
portions of Lynx. It outlines rights and restrictions for Lynx which
......@@ -80,5 +80,5 @@ For reference, below is the original copyright notice for Lynx (2.4.2).
*/
------------------------------------------------------------------------------
-- vile:txtmode fc=72 noti
-- $LynxId: COPYHEADER,v 1.13 2015/10/02 11:12:57 tom Exp $
-- $LynxId: COPYHEADER,v 1.14 2016/04/11 00:41:05 tom Exp $
------------------------------------------------------------------------------
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)
Version: GnuPG v1.4.12 (GNU/Linux)
Comment: See http://invisible-island.net/public/public.html for info
iEYEABECAAYFAlSmkEIACgkQcCNT4PfkjtvDHgCcCuPQT6btzjHea86OJcHDxdzA
ykwAoMQ1m8J2Po3yv31ULFXSTS/yDmWH
=BGPK
iEYEABECAAYFAlcK82QACgkQcCNT4PfkjttIuwCeOsxrhAi9MzzRMZdbuGdBgJ2o
3fUAnjxUoC/JPkmGCvDtvumSH/10zquP
=ge/N
-----END PGP SIGNATURE-----
lynx-dev (2.8.9dev.8) unstable; urgency=low
lynx-dev (2.8.9dev.9) unstable; urgency=low
* maintenance updates
-- Thomas E. Dickey <dickey@invisible-island.net> Mon, 21 Dec 2015 20:45:35 -0500
-- Thomas E. Dickey <dickey@invisible-island.net> Sun, 10 Apr 2016 20:23:19 -0400
lynx-dev (2.8.8dev.16) unstable; urgency=high
......
......@@ -47,7 +47,7 @@ For reference, below is the original copyright notice for Lynx (2.4.2).
Files: aclocal.m4
License: other-BSD
Copyright: 1997-2014,2015 by Thomas E. Dickey
Copyright: 1997-2015,2016 by Thomas E. Dickey
Permission to use, copy, modify, and distribute this software and its
documentation for any purpose and without fee is hereby granted,
provided that the above copyright notice appear in all copies and that
......@@ -101,7 +101,7 @@ License: other-BSD
shared with many OS's install programs.
Files: debian/*
Copyright: 2010-2014,2015 Thomas E. Dickey
Copyright: 2010-2015,2016 Thomas E. Dickey
License: other-BSD
Permission to use, copy, modify, and distribute this software and its
documentation for any purpose and without fee is hereby granted,
......
; $LynxId: lynx.iss,v 1.15 2015/01/05 09:15:38 tom Exp $
; $LynxId: lynx.iss,v 1.16 2016/04/11 00:42:33 tom Exp $
; vile:ts=2 sw=2 notabinsert
;
; This is the BASE script for different flavors of the installer for Lynx.
......@@ -90,7 +90,7 @@ AppName={#MyAppName}
#emit 'VersionInfoVersion=' + LYNX_TARGET1
AppVerName={#MyAppVerName}
AppPublisher={#MyAppPublisher}
AppCopyright= 1997-2014,2015, Thomas E. Dickey
AppCopyright= 1997-2015,2016, Thomas E. Dickey
AppPublisherURL={#MyAppURL}
AppSupportURL={#MyAppURL}
AppUpdatesURL={#MyAppURL}
......
; $LynxId: lynx.nsi,v 1.27 2015/12/22 01:45:35 tom Exp $
; $LynxId: lynx.nsi,v 1.29 2016/04/11 00:42:41 tom Exp $
; Script originally generated with the Venis Install Wizard, but customized.
; The Inno Setup script is preferred; but this can be built via cross-compiling.
......@@ -9,8 +9,8 @@
!define VERSION_EPOCH "2"
!define VERSION_MAJOR "8"
!define VERSION_MINOR "9"
!define VERSION_LEVEL "1008"
!define VERSION_PATCH "dev.8"
!define VERSION_LEVEL "1009"
!define VERSION_PATCH "dev.9"
!define SUBKEY "Lynx"
......@@ -28,7 +28,7 @@ SetCompressor /SOLID lzma
VIAddVersionKey ProductName "${SUBKEY}"
VIAddVersionKey CompanyName "http://invisible-island.net/lynx"
VIAddVersionKey LegalCopyright " 1997-2014,2015, Thomas E. Dickey"
VIAddVersionKey LegalCopyright " 1997-2015,2016, Thomas E. Dickey"
VIAddVersionKey FileDescription "Lynx Installer (MinGW)"
VIAddVersionKey FileVersion "${VERSION}"
VIAddVersionKey ProductVersion "${VERSION}"
......
# $LynxId: lynx.spec,v 1.35 2015/12/22 01:45:35 tom Exp $
# $LynxId: lynx.spec,v 1.36 2016/04/11 00:23:19 tom Exp $
Summary: A text-based Web browser
Name: lynx
Version: 2.8.9
Release: dev.8
Release: dev.9
License: GPLv2
Group: Applications/Internet
Source: lynx%{version}%{release}.tgz
......
; version used for Inno Setup files.
; $Format: "#define LYNX_VERSION \"$ProjectVersion$\""$
#define LYNX_VERSION "2.8.9dev.8"
#define LYNX_VERSION "2.8.9dev.9"
; most-recent full release and target
#define LYNX_RELEASE "2.8.9"
......
/*
* $LynxId: HTFormat.c,v 1.83 2014/07/24 22:08:24 tom Exp $
* $LynxId: HTFormat.c,v 1.84 2016/04/26 09:11:03 tom Exp $
*
* Manage different file formats HTFormat.c
* =============================
......@@ -776,7 +776,6 @@ int HTCopy(HTParentAnchor *anchor,
#else
status = NETREAD(file_number, input_buffer, INPUT_BUFFER_SIZE);
#endif /* USE_SSL */
if (status <= 0) {
if (status == 0) {
break;
......@@ -880,6 +879,11 @@ int HTCopy(HTParentAnchor *anchor,
HTReadProgress(bytes, limit);
HTDisplayPartial();
/* a few buggy implementations do not close the connection properly
* and will hang if we try to read past the declared content-length.
*/
if (limit > 0 && bytes == limit)
break;
} /* next bufferload */
if (anchor != 0) {
CTRACE((tfp, "HTCopy copied %"
......
/*
* $LynxId: HTTP.c,v 1.151 2015/12/22 01:55:31 tom Exp $
* $LynxId: HTTP.c,v 1.153 2016/04/11 00:40:38 tom Exp $
*
* HyperText Tranfer Protocol - Client implementation HTTP.c
* ==========================
......@@ -169,30 +169,32 @@ SSL *HTGetSSLHandle(void)
* First time only.
*/
#if SSLEAY_VERSION_NUMBER < 0x0800
ssl_ctx = SSL_CTX_new();
X509_set_default_verify_paths(ssl_ctx->cert);
if ((ssl_ctx = SSL_CTX_new()) != NULL) {
X509_set_default_verify_paths(ssl_ctx->cert);
}
#else
SSLeay_add_ssl_algorithms();
ssl_ctx = SSL_CTX_new(SSLv23_client_method());
if ((ssl_ctx = SSL_CTX_new(SSLv23_client_method())) != NULL) {
#ifdef SSL_OP_NO_SSLv2
SSL_CTX_set_options(ssl_ctx, SSL_OP_ALL | SSL_OP_NO_SSLv2);
SSL_CTX_set_options(ssl_ctx, SSL_OP_ALL | SSL_OP_NO_SSLv2);
#else
SSL_CTX_set_options(ssl_ctx, SSL_OP_ALL);
SSL_CTX_set_options(ssl_ctx, SSL_OP_ALL);
#endif
#ifdef SSL_OP_NO_COMPRESSION
SSL_CTX_set_options(ssl_ctx, SSL_OP_NO_COMPRESSION);
SSL_CTX_set_options(ssl_ctx, SSL_OP_NO_COMPRESSION);
#endif
#ifdef SSL_MODE_AUTO_RETRY
SSL_CTX_set_mode(ssl_ctx, SSL_MODE_AUTO_RETRY);
SSL_CTX_set_mode(ssl_ctx, SSL_MODE_AUTO_RETRY);
#endif
#ifdef SSL_MODE_RELEASE_BUFFERS
SSL_CTX_set_mode(ssl_ctx, SSL_MODE_RELEASE_BUFFERS);
SSL_CTX_set_mode(ssl_ctx, SSL_MODE_RELEASE_BUFFERS);
#endif
SSL_CTX_set_default_verify_paths(ssl_ctx);
SSL_CTX_set_verify(ssl_ctx, SSL_VERIFY_PEER, HTSSLCallback);
SSL_CTX_set_default_verify_paths(ssl_ctx);
SSL_CTX_set_verify(ssl_ctx, SSL_VERIFY_PEER, HTSSLCallback);
}
#endif /* SSLEAY_VERSION_NUMBER < 0x0800 */
#if defined(USE_PROGRAM_DIR) & !defined(USE_GNUTLS_INCL)
{
if (ssl_ctx != NULL) {
X509_LOOKUP *lookup;
lookup = X509_STORE_add_lookup(ssl_ctx->cert_store,
......
dnl $LynxId: aclocal.m4,v 1.231 2015/12/13 02:00:51 tom Exp $
dnl $LynxId: aclocal.m4,v 1.233 2016/04/16 00:48:40 tom Exp $
dnl Macros for auto-configure script.
dnl by Thomas E. Dickey <dickey@invisible-island.net>
dnl and Jim Spath <jspath@mail.bcpl.lib.md.us>
......@@ -12,7 +12,7 @@ dnl http://invisible-island.net/autoconf/autoconf.html
dnl
dnl ---------------------------------------------------------------------------
dnl
dnl Copyright 1997-2014,2015 by Thomas E. Dickey
dnl Copyright 1997-2015,2016 by Thomas E. Dickey
dnl
dnl Permission to use, copy, modify, and distribute this software and its
dnl documentation for any purpose and without fee is hereby granted,
......@@ -3173,6 +3173,7 @@ AC_DEFUN([CF_GNUTLS],[
CF_ADD_LIBDIR($cf_cv_library_path_gnutls)
fi
CF_ADD_LIBS(-lgnutls)
AC_CHECK_FUNCS(gnutls_protocol_set_priority)
AC_CHECK_FUNC(gnutls_rnd,
[AC_DEFINE(HAVE_GNUTLS_RND)],
[CF_ADD_LIBS(-lgcrypt)])
......@@ -3423,7 +3424,7 @@ AC_TRY_COMPILE([
test $cf_cv_path_lastlog != no && AC_DEFINE(USE_LASTLOG,1,[Define to 1 if we can define lastlog pathname])
])dnl
dnl ---------------------------------------------------------------------------
dnl CF_LD_RPATH_OPT version: 6 updated: 2015/04/12 15:39:00
dnl CF_LD_RPATH_OPT version: 7 updated: 2016/02/20 18:01:19
dnl ---------------
dnl For the given system and compiler, find the compiler flags to pass to the
dnl loader to use the "rpath" feature.
......@@ -3441,13 +3442,13 @@ case $cf_cv_system_name in
LD_RPATH_OPT="-rpath "
fi
;;
(linux*|gnu*|k*bsd*-gnu)
(linux*|gnu*|k*bsd*-gnu|freebsd*)
LD_RPATH_OPT="-Wl,-rpath,"
;;
(openbsd[[2-9]].*|mirbsd*)
LD_RPATH_OPT="-Wl,-rpath,"
;;
(dragonfly*|freebsd*)
(dragonfly*)
LD_RPATH_OPT="-rpath "
;;
(netbsd*)
......
#! /bin/sh
# Attempt to guess a canonical system name.
# Copyright 1992-2015 Free Software Foundation, Inc.
# Copyright 1992-2016 Free Software Foundation, Inc.
timestamp='2015-10-21'
timestamp='2016-01-01'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
......@@ -27,7 +27,7 @@ timestamp='2015-10-21'
# Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
#
# You can get the latest version of this script from:
# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
#
# Please send patches to <config-patches@gnu.org>.
......@@ -50,7 +50,7 @@ version="\
GNU config.guess ($timestamp)
Originally written by Per Bothner.
Copyright 1992-2015 Free Software Foundation, Inc.
Copyright 1992-2016 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
......@@ -1393,6 +1393,9 @@ EOF
x86_64:VMkernel:*:*)
echo ${UNAME_MACHINE}-unknown-esx
exit ;;
amd64:Isilon\ OneFS:*:*)
echo x86_64-unknown-onefs
exit ;;
esac
cat >&2 <<EOF
......@@ -1402,9 +1405,9 @@ This script, last modified $timestamp, has failed to recognize
the operating system you are using. It is advised that you
download the most up to date version of the config scripts from
http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
and
http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
If the version you run ($0) is already up to date, please
send the following data and any information you think might be
......
/*
* $LynxId: config.hin,v 1.138 2015/05/28 00:46:18 tom Exp $
* $LynxId: config.hin,v 1.139 2016/04/16 00:47:08 tom Exp $
* vile:cmode
*
* The configure script translates "config.hin" into "lynx_cfg.h"
......@@ -80,6 +80,7 @@
#undef HAVE_GETTEXT /* defined if you want to use non-GNU gettext */
#undef HAVE_GETTIMEOFDAY
#undef HAVE_GETUID
#undef HAVE_GNUTLS_PROTOCOL_SET_PRIORITY
#undef HAVE_GNUTLS_RND
#undef HAVE_H_ERRNO
#undef HAVE_ICONV /* AM_ICONV */
......
#! /bin/sh
# Configuration validation subroutine script.
# Copyright 1992-2015 Free Software Foundation, Inc.
# Copyright 1992-2016 Free Software Foundation, Inc.
timestamp='2015-08-20'
timestamp='2016-01-01'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
......@@ -33,7 +33,7 @@ timestamp='2015-08-20'
# Otherwise, we print the canonical config type on stdout and succeed.
# You can get the latest version of this script from:
# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
# This file is supposed to be the same for all GNU packages
# and recognize all the CPU types, system types and aliases
......@@ -53,8 +53,7 @@ timestamp='2015-08-20'
me=`echo "$0" | sed -e 's,.*/,,'`
usage="\
Usage: $0 [OPTION] CPU-MFR-OPSYS
$0 [OPTION] ALIAS
Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS
Canonicalize a configuration name.
......@@ -68,7 +67,7 @@ Report bugs and patches to <config-patches@gnu.org>."
version="\
GNU config.sub ($timestamp)
Copyright 1992-2015 Free Software Foundation, Inc.
Copyright 1992-2016 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
......@@ -521,7 +520,7 @@ case $basic_machine in
basic_machine=i386-pc
os=-aros
;;
asmjs)
asmjs)
basic_machine=asmjs-unknown
;;
aux)
......@@ -1399,7 +1398,8 @@ case $os in
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
| -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*)
| -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \
| -onefs* | -tirtos*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
-qnx*)
......
This diff is collapsed.
dnl $LynxId: configure.in,v 1.280 2015/12/22 01:45:35 tom Exp $
dnl $LynxId: configure.in,v 1.282 2016/04/11 00:42:00 tom Exp $
dnl
dnl Process this file with autoconf to produce a configure script.
dnl
......@@ -7,7 +7,7 @@ dnl by T.E.Dickey <dickey@invisible-island.net>
dnl and Jim Spath <jspath@mail.bcpl.lib.md.us>
dnl
dnl ---------------------------------------------------------------------------
dnl Copyright 1997-2014,2015 by Thomas E. Dickey
dnl Copyright 1997-2015,2016 by Thomas E. Dickey
dnl
dnl Permission to use, copy, modify, and distribute this software and its
dnl documentation for any purpose and without fee is hereby granted,
......@@ -29,7 +29,7 @@ dnl ---------------------------------------------------------------------------
dnl
dnl ask PRCS to plug-in the project-version for the configure-script.
dnl $Format: "AC_REVISION($ProjectVersion$)"$
AC_REVISION(2.8.9dev.8)
AC_REVISION(2.8.9dev.9)
# Save the original $CFLAGS so we can distinguish whether the user set those
# in the environment, or whether autoconf added -O and -g options:
......@@ -64,7 +64,7 @@ AC_ARG_PROGRAM
PACKAGE=lynx
dnl ask PRCS to plug-in the project-version for the packages.
# $Format: "VERSION=$ProjectVersion$"$
VERSION=2.8.9dev.8
VERSION=2.8.9dev.9
AC_SUBST(PACKAGE)
AC_SUBST(VERSION)
......
# $LynxId: lynx.cfg,v 1.271 2015/12/22 01:45:35 tom Exp $
# $LynxId: lynx.cfg,v 1.272 2016/04/11 00:23:19 tom Exp $
# lynx.cfg file.
# The default placement for this file is /usr/local/lib/lynx.cfg (Unix)
# or Lynx_Dir:lynx.cfg (VMS)
#
# $Format: "#PRCS LYNX_VERSION \"$ProjectVersion$\""$
#PRCS LYNX_VERSION "2.8.9dev.8"
#PRCS LYNX_VERSION "2.8.9dev.9"
#
# $Format: "#PRCS LYNX_DATE \"$ProjectDate$\""$
#PRCS LYNX_DATE "Mon, 21 Dec 2015 20:45:35 -0500"
#PRCS LYNX_DATE "Sun, 10 Apr 2016 20:23:19 -0400"
#
# Definition pairs are of the form VARIABLE:DEFINITION
# NO spaces are allowed between the pair items.
......
# $LynxId: makefile.in,v 1.155 2015/12/22 01:45:35 tom Exp $
# $LynxId: makefile.in,v 1.156 2016/04/11 00:23:19 tom Exp $
##makefile for lynx
SHELL = @CONFIG_SHELL@
......@@ -46,7 +46,7 @@ TAR_UP = $(TAR) @TAR_UP_OPTIONS@ @TAR_PIPE_OPTIONS@
TAR_DOWN = $(TAR) @TAR_DOWN_OPTIONS@ @TAR_PIPE_OPTIONS@
# $Format: "LYNX_VERSION = $ProjectVersion$"$
LYNX_VERSION = 2.8.9dev.8
LYNX_VERSION = 2.8.9dev.9
## This is the version which we are developing (or, upon release, make this
## the same). Use no dots in the name, since it must work on VMS and MS-DOS.
......
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
......@@ -2,7 +2,7 @@
# Copyright (C) 1999 Free Software Foundation, Inc.
# Roman Maurer <roman.maurer@hermes.si>, 1999.
# $Id: sl.po,v 1.42 2015/04/09 20:37:00 tom Exp $
# $Source: /usr/build/lynx/lynx2.8.9dev.7a/po/RCS/sl.po,v $
# $Source: /usr/build/lynx/lynx2.8.9dev.9/po/RCS/sl.po,v $
#
msgid ""
msgstr ""
......
This diff is collapsed.
// $LynxId: LYIcon.rc,v 1.21 2015/12/22 01:45:35 tom Exp $
// $LynxId: LYIcon.rc,v 1.23 2016/04/11 00:43:06 tom Exp $
#include <windows.h>
100 ICON "../samples/lynx.ico"
VS_VERSION_INFO VERSIONINFO
FILEVERSION 2,8,9,1008
PRODUCTVERSION 2,8,9,1008
FILEVERSION 2,8,9,1009
PRODUCTVERSION 2,8,9,1009
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
FILEFLAGS 0
FILEOS VOS_NT_WINDOWS32
......@@ -19,12 +19,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "http://invisible-island.net/lynx"
VALUE "FileDescription", "Lynx - web browser"
VALUE "FileVersion", "2.8.9.1008"
VALUE "FileVersion", "2.8.9.1009"
VALUE "InternalName", "Lynx"
VALUE "LegalCopyright", "1997-2015 Thomas E. Dickey"
VALUE "LegalCopyright", "1997-2016 Thomas E. Dickey"
VALUE "OriginalFilename", "lynx.exe"
VALUE "ProductName", "Lynx - web browser"
VALUE "ProductVersion", "2.8.9.1008"
VALUE "ProductVersion", "2.8.9.1009"
END
END
BLOCK "VarFileInfo"
......
/*
* $LynxId: UCAux.c,v 1.50 2014/12/10 09:48:57 tom Exp $
* $LynxId: UCAux.c,v 1.51 2016/04/17 22:18:15 tom Exp $
*/
#include <HTUtils.h>
......@@ -707,9 +707,13 @@ dUTF8 HTDecodeUTF8(UTFDecodeState * me, int *c_in_out, UCode_t *result)
if (*result < 256) {
*c_in_out = UCH(*result & 0xff);
}
/* lynx does not use left-to-right */
if (*result == 0x200e)
rc = dUTF8_err;
switch (*result) {
case 0x200e: /* left-to-right mark */
case 0x200f: /* right-to-left mark */
/* lynx does not use these */
*result = '\0';
break;
}
} else {
rc = dUTF8_more;
}
......
/*
* $LynxId: tidy_tls.c,v 1.33 2015/12/16 01:23:11 tom Exp $
* Copyright 2008-2014,2015 Thomas E. Dickey
* $LynxId: tidy_tls.c,v 1.34 2016/04/17 15:15:06 tom Exp $
* Copyright 2008-2015,2016 Thomas E. Dickey
* with fix Copyright 2008 by Thomas Viehmann
*
* Required libraries:
......@@ -262,6 +262,7 @@ void SSL_CTX_set_verify(SSL_CTX * ctx, int verify_mode,
ctx->verify_callback = verify_callback;
}
#ifdef HAVE_GNUTLS_PROTOCOL_SET_PRIORITY
static void RemoveProtocol(SSL * ssl, int protocol)
{
int j, k;
......@@ -282,6 +283,7 @@ static void RemoveProtocol(SSL * ssl, int protocol)
gnutls_protocol_set_priority(ssl->gnutls_state, protocols);
}
}
#endif
/*
* Initiate the TLS/SSL handshake with an TLS/SSL server.
......@@ -293,10 +295,13 @@ int SSL_connect(SSL * ssl)
gnutls_alert_description_t alert;
const char *aname;
if (ssl->options & SSL_OP_NO_TLSv1)
if (ssl->options & SSL_OP_NO_TLSv1) {
#ifdef HAVE_GNUTLS_PROTOCOL_SET_PRIORITY
RemoveProtocol(ssl, GNUTLS_TLS1);
if (ssl->options & SSL_OP_NO_SSLv3)
RemoveProtocol(ssl, GNUTLS_SSL3);
#else
gnutls_priority_set_direct(ssl->gnutls_state, "NORMAL:-VERS-TLS1.0", NULL);
#endif
}
while ((rc = gnutls_handshake(ssl->gnutls_state)) < 0 &&
!gnutls_error_is_fatal(rc)) {
......
/*
* $LynxId: userdefs.h,v 1.317 2015/12/22 01:45:35 tom Exp $
* $LynxId: userdefs.h,v 1.319 2016/04/11 00:42:17 tom Exp $
*
* Lynx - Hypertext navigation system
*
* (c) Copyright 1992, 1993, 1994 University of Kansas
* 1995, 1996: GNU General Public License
*
* Copyright 1996-2014,2015 Thomas E. Dickey and Lynx Developers Group
* Copyright 1996-2015,2016 Thomas E. Dickey and Lynx Developers Group
* Note: GNU General Public License is not a copyright.
*/
......@@ -1442,11 +1442,11 @@
* the version definition with the Project Version on checkout. Just
* ignore it. - kw */
/* $Format: "#define LYNX_VERSION \"$ProjectVersion$\""$ */
#define LYNX_VERSION "2.8.9dev.8"
#define LYNX_VERSION "2.8.9dev.9"
#define LYNX_WWW_HOME "http://lynx.invisible-island.net/"
#define LYNX_WWW_DIST "http://lynx.invisible-island.net/current/"
/* $Format: "#define LYNX_DATE \"$ProjectDate$\""$ */
#define LYNX_DATE "Mon, 21 Dec 2015 20:45:35 -0500"
#define LYNX_DATE "Sun, 10 Apr 2016 20:23:19 -0400"
#define LYNX_DATE_OFF 5 /* truncate the automatically-generated date */
#define LYNX_DATE_LEN 11 /* truncate the automatically-generated date */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment