diff options
| author | Thomas E. Dickey <dickey@invisible-island.net> | 2018-03-21 21:25:11 +0000 |
|---|---|---|
| committer | Thomas E. Dickey <dickey@invisible-island.net> | 2018-03-21 21:25:11 +0000 |
| commit | 45a822266a7ca24e711a0434398f3d0c77fd5e02 (patch) | |
| tree | f296969fba863d8543248c826d7f9ce342a4470c | |
| parent | 9432fa8a1a1a932811a63ffdb54064a53446ca83 (diff) | |
| download | lynx-snapshots-45a822266a7ca24e711a0434398f3d0c77fd5e02.tar.gz | |
snapshot of project "lynx", label v2-8-9dev_16z
| -rw-r--r-- | WWW/Library/Implementation/HTTP.c | 22 | ||||
| -rw-r--r-- | lynx.cfg | 4 | ||||
| -rw-r--r-- | userdefs.h | 4 |
3 files changed, 20 insertions, 10 deletions
diff --git a/WWW/Library/Implementation/HTTP.c b/WWW/Library/Implementation/HTTP.c index a4037f2a..f7e19018 100644 --- a/WWW/Library/Implementation/HTTP.c +++ b/WWW/Library/Implementation/HTTP.c @@ -1,5 +1,5 @@ /* - * $LynxId: HTTP.c,v 1.169 2018/03/21 00:45:27 tom Exp $ + * $LynxId: HTTP.c,v 1.172 2018/03/21 21:25:11 tom Exp $ * * HyperText Tranfer Protocol - Client implementation HTTP.c * ========================== @@ -53,7 +53,13 @@ #if defined(LIBRESSL_VERSION_NUMBER) /* OpenSSL and LibreSSL version numbers do not correspond */ + +#if LIBRESSL_VERSION_NUMBER >= 0x2060100fL +#define SSL_set_no_TLSV1() SSL_set_min_proto_version(handle, TLS1_1_VERSION) +#endif + #elif defined(OPENSSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER >= 0x10100000L) + #define SSLEAY_VERSION_NUMBER OPENSSL_VERSION_NUMBER #undef SSL_load_error_strings #undef SSLeay_add_ssl_algorithms @@ -61,8 +67,16 @@ #define TLS_client_method() SSLv23_client_method() #define SSL_load_error_strings() /* nothing */ #define SSLeay_add_ssl_algorithms() /* nothing */ +#define SSL_set_no_TLSV1() SSL_set_min_proto_version(handle, TLS1_1_VERSION) + #elif defined(SSLEAY_VERSION_NUMBER) + #define TLS_client_method() SSLv23_client_method() + +#endif + +#ifndef SSL_set_no_TLSV1 +#define SSL_set_no_TLSV1() SSL_set_options(handle, SSL_OP_NO_TLSv1) #endif #ifdef USE_GNUTLS_INCL @@ -943,11 +957,7 @@ static int HTLoadHTTP(const char *arg, #elif SSLEAY_VERSION_NUMBER >= 0x0900 #ifndef USE_NSS_COMPAT_INCL if (!try_tls) { -#if OPENSSL_VERSION_NUMBER >= 0x10100000L - SSL_set_min_proto_version(handle, TLS1_1_VERSION); -#else - SSL_set_options(handle, SSL_OP_NO_TLSv1); -#endif + SSL_set_no_TLSV1(); CTRACE((tfp, "...adding SSL_OP_NO_TLSv1\n")); } #if OPENSSL_VERSION_NUMBER >= 0x0090806fL && !defined(OPENSSL_NO_TLSEXT) diff --git a/lynx.cfg b/lynx.cfg index 41c53be5..36406e5c 100644 --- a/lynx.cfg +++ b/lynx.cfg @@ -1,4 +1,4 @@ -# $LynxId: lynx.cfg,v 1.293 2018/03/11 22:22:46 tom Exp $ +# $LynxId: lynx.cfg,v 1.294 2018/03/21 16:20:42 tom Exp $ # lynx.cfg file. # The default placement for this file is /usr/local/lib/lynx.cfg (Unix) # or Lynx_Dir:lynx.cfg (VMS) @@ -7,7 +7,7 @@ #PRCS LYNX_VERSION "2.8.9dev.17" # # $Format: "#PRCS LYNX_DATE \"$ProjectDate$\""$ -#PRCS LYNX_DATE "Tue, 08 Aug 2017 18:32:03 -0400" +#PRCS LYNX_DATE "Wed, 21 Mar 2018 12:20:42 -0400" # # Definition pairs (configuration settings) are of the form # VARIABLE:DEFINITION diff --git a/userdefs.h b/userdefs.h index 019f60e4..5a887e4a 100644 --- a/userdefs.h +++ b/userdefs.h @@ -1,5 +1,5 @@ /* - * $LynxId: userdefs.h,v 1.333 2018/03/17 16:07:07 tom Exp $ + * $LynxId: userdefs.h,v 1.334 2018/03/21 16:20:42 tom Exp $ * * Lynx - Hypertext navigation system * @@ -1449,7 +1449,7 @@ #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 "Tue, 08 Aug 2017 18:32:03 -0400" +#define LYNX_DATE "Wed, 21 Mar 2018 12:20:42 -0400" #define LYNX_DATE_OFF 5 /* truncate the automatically-generated date */ #define LYNX_DATE_LEN 11 /* truncate the automatically-generated date */ |