From de63f21f63b18ecce8899a2e6a5182153d193374 Mon Sep 17 00:00:00 2001 From: Bruno Silvestre Date: Wed, 27 Jun 2018 10:36:26 -0300 Subject: [PATCH] Change version number to 0.7 --- CHANGELOG | 13 +++++++++++-- INSTALL | 4 ++-- LICENSE | 4 ++-- README.md | 10 +--------- luasec-0.7alpha-2.rockspec => luasec-0.7-1.rockspec | 6 +++--- src/compat.h | 4 ++-- src/config.c | 4 ++-- src/context.c | 6 +++--- src/ec.h | 4 ++-- src/https.lua | 6 +++--- src/options.h | 12 +++++++++--- src/options.lua | 4 ++-- src/ssl.c | 8 ++++---- src/ssl.h | 4 ++-- src/ssl.lua | 4 ++-- src/x509.c | 4 ++-- src/x509.h | 4 ++-- 17 files changed, 54 insertions(+), 47 deletions(-) rename luasec-0.7alpha-2.rockspec => luasec-0.7-1.rockspec (95%) diff --git a/CHANGELOG b/CHANGELOG index 512f3b0..976154a 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,7 +1,17 @@ -------------------------------------------------------------------------------- -LuaSec 0.7alpha +LuaSec 0.7 --------------- +LuaSec depends on OpenSSL, and integrates with LuaSocket to make it +easy to add secure connections to any Lua applications or scripts. +Documentation: https://github.com/brunoos/luasec/wiki + +This version includes: + +* Add support to OpenSSL 1.1.0 +* Add support to elliptic curves list +* Add ssl.config that exports some OpenSSL information +* Add integration with luaossl -------------------------------------------------------------------------------- LuaSec 0.6 @@ -40,7 +50,6 @@ This version includes: -------------------------------------------------------------------------------- LuaSec 0.5 ------------ - LuaSec depends on OpenSSL, and integrates with LuaSocket to make it easy to add secure connections to any Lua applications or scripts. diff --git a/INSTALL b/INSTALL index b3b9ed1..7c47db7 100644 --- a/INSTALL +++ b/INSTALL @@ -1,9 +1,9 @@ -LuaSec 0.7alpha +LuaSec 0.7 ------------ * OpenSSL options: - By default, LuaSec 0.7alpha includes options for OpenSSL 1.1.0f. + By default, LuaSec 0.7 includes options for OpenSSL 1.1.0f. If you need to generate the options for a different version of OpenSSL: diff --git a/LICENSE b/LICENSE index 8ec9608..1e63007 100644 --- a/LICENSE +++ b/LICENSE @@ -1,5 +1,5 @@ -LuaSec 0.7alpha license -Copyright (C) 2006-2017 Bruno Silvestre, UFG +LuaSec 0.7 license +Copyright (C) 2006-2018 Bruno Silvestre, UFG Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the diff --git a/README.md b/README.md index 3abe510..04dc9f2 100644 --- a/README.md +++ b/README.md @@ -1,14 +1,6 @@ -LuaSec 0.7alpha +LuaSec 0.7 =============== LuaSec depends on OpenSSL, and integrates with LuaSocket to make it easy to add secure connections to any Lua applications or scripts. Documentation: https://github.com/brunoos/luasec/wiki - -This version: - - * Add compatibility with OpenSSL 1.1.0 - - * Add 'ssl.config' module - - * TBD diff --git a/luasec-0.7alpha-2.rockspec b/luasec-0.7-1.rockspec similarity index 95% rename from luasec-0.7alpha-2.rockspec rename to luasec-0.7-1.rockspec index 8114e94..572d825 100644 --- a/luasec-0.7alpha-2.rockspec +++ b/luasec-0.7-1.rockspec @@ -1,8 +1,8 @@ package = "LuaSec" -version = "0.7alpha-2" +version = "0.7-1" source = { - url = "https://github.com/brunoos/luasec/archive/luasec-0.7alpha.tar.gz", - dir = "luasec-luasec-0.7alpha" + url = "https://github.com/brunoos/luasec/archive/luasec-0.7.tar.gz", + dir = "luasec-luasec-0.7" } description = { summary = "A binding for OpenSSL library to provide TLS/SSL communication over LuaSocket.", diff --git a/src/compat.h b/src/compat.h index be0b0fc..e3d112b 100644 --- a/src/compat.h +++ b/src/compat.h @@ -1,7 +1,7 @@ /*-------------------------------------------------------------------------- - * LuaSec 0.7alpha + * LuaSec 0.7 * - * Copyright (C) 2006-2017 Bruno Silvestre + * Copyright (C) 2006-2018 Bruno Silvestre * *--------------------------------------------------------------------------*/ diff --git a/src/config.c b/src/config.c index 6356ca8..ce74997 100644 --- a/src/config.c +++ b/src/config.c @@ -1,7 +1,7 @@ /*-------------------------------------------------------------------------- - * LuaSec 0.7alpha + * LuaSec 0.7 * - * Copyright (C) 2006-2017 Bruno Silvestre. + * Copyright (C) 2006-2018 Bruno Silvestre. * *--------------------------------------------------------------------------*/ diff --git a/src/context.c b/src/context.c index 8455901..a2b5ae5 100644 --- a/src/context.c +++ b/src/context.c @@ -1,9 +1,9 @@ /*-------------------------------------------------------------------------- - * LuaSec 0.7alpha + * LuaSec 0.7 * - * Copyright (C) 2014-2017 Kim Alvefur, Paul Aurich, Tobias Markmann, + * Copyright (C) 2014-2018 Kim Alvefur, Paul Aurich, Tobias Markmann, * Matthew Wild. - * Copyright (C) 2006-2017 Bruno Silvestre. + * Copyright (C) 2006-2018 Bruno Silvestre. * *--------------------------------------------------------------------------*/ diff --git a/src/ec.h b/src/ec.h index ffa6120..43b080f 100644 --- a/src/ec.h +++ b/src/ec.h @@ -1,7 +1,7 @@ /*-------------------------------------------------------------------------- - * LuaSec 0.7alpha + * LuaSec 0.7 * - * Copyright (C) 2006-2017 Bruno Silvestre + * Copyright (C) 2006-2018 Bruno Silvestre * *--------------------------------------------------------------------------*/ diff --git a/src/https.lua b/src/https.lua index ea457b9..d1b708a 100644 --- a/src/https.lua +++ b/src/https.lua @@ -1,6 +1,6 @@ ---------------------------------------------------------------------------- --- LuaSec 0.7alpha --- Copyright (C) 2009-2017 PUC-Rio +-- LuaSec 0.7 +-- Copyright (C) 2009-2018 PUC-Rio -- -- Author: Pablo Musa -- Author: Tomas Guisasola @@ -19,7 +19,7 @@ local try = socket.try -- local _M = { _VERSION = "0.7", - _COPYRIGHT = "LuaSec 0.7alpha - Copyright (C) 2009-2017 PUC-Rio", + _COPYRIGHT = "LuaSec 0.7 - Copyright (C) 2009-2018 PUC-Rio", PORT = 443, } diff --git a/src/options.h b/src/options.h index b69aa8a..c4756f8 100644 --- a/src/options.h +++ b/src/options.h @@ -2,9 +2,9 @@ #define LSEC_OPTIONS_H /*-------------------------------------------------------------------------- - * LuaSec 0.7alpha + * LuaSec 0.7 * - * Copyright (C) 2006-2017 Bruno Silvestre + * Copyright (C) 2006-2018 Bruno Silvestre * *--------------------------------------------------------------------------*/ @@ -13,7 +13,7 @@ /* If you need to generate these options again, see options.lua */ /* - OpenSSL version: OpenSSL 1.1.0f + OpenSSL version: OpenSSL 1.1.0h */ struct ssl_option_s { @@ -83,9 +83,15 @@ static ssl_option_t ssl_options[] = { #if defined(SSL_OP_NO_DTLSv1_2) {"no_dtlsv1_2", SSL_OP_NO_DTLSv1_2}, #endif +#if defined(SSL_OP_NO_ENCRYPT_THEN_MAC) + {"no_encrypt_then_mac", SSL_OP_NO_ENCRYPT_THEN_MAC}, +#endif #if defined(SSL_OP_NO_QUERY_MTU) {"no_query_mtu", SSL_OP_NO_QUERY_MTU}, #endif +#if defined(SSL_OP_NO_RENEGOTIATION) + {"no_renegotiation", SSL_OP_NO_RENEGOTIATION}, +#endif #if defined(SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION) {"no_session_resumption_on_renegotiation", SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION}, #endif diff --git a/src/options.lua b/src/options.lua index f8c5419..743e775 100644 --- a/src/options.lua +++ b/src/options.lua @@ -21,9 +21,9 @@ local function generate(options, version) #define LSEC_OPTIONS_H /*-------------------------------------------------------------------------- - * LuaSec 0.7alpha + * LuaSec 0.7 * - * Copyright (C) 2006-2017 Bruno Silvestre + * Copyright (C) 2006-2018 Bruno Silvestre * *--------------------------------------------------------------------------*/ diff --git a/src/ssl.c b/src/ssl.c index 7f3ca46..95109c4 100644 --- a/src/ssl.c +++ b/src/ssl.c @@ -1,9 +1,9 @@ /*-------------------------------------------------------------------------- - * LuaSec 0.7alpha + * LuaSec 0.7 * - * Copyright (C) 2014-2017 Kim Alvefur, Paul Aurich, Tobias Markmann, + * Copyright (C) 2014-2018 Kim Alvefur, Paul Aurich, Tobias Markmann, * Matthew Wild. - * Copyright (C) 2006-2017 Bruno Silvestre. + * Copyright (C) 2006-2018 Bruno Silvestre. * *--------------------------------------------------------------------------*/ @@ -796,7 +796,7 @@ static int meth_getsniname(lua_State *L) static int meth_copyright(lua_State *L) { - lua_pushstring(L, "LuaSec 0.7alpha - Copyright (C) 2006-2017 Bruno Silvestre, UFG" + lua_pushstring(L, "LuaSec 0.7 - Copyright (C) 2006-2018 Bruno Silvestre, UFG" #if defined(WITH_LUASOCKET) "\nLuaSocket 3.0-RC1 - Copyright (C) 2004-2013 Diego Nehab" #endif diff --git a/src/ssl.h b/src/ssl.h index b9707d9..f5618d1 100644 --- a/src/ssl.h +++ b/src/ssl.h @@ -2,9 +2,9 @@ #define LSEC_SSL_H /*-------------------------------------------------------------------------- - * LuaSec 0.7alpha + * LuaSec 0.7 * - * Copyright (C) 2006-2017 Bruno Silvestre + * Copyright (C) 2006-2018 Bruno Silvestre * *--------------------------------------------------------------------------*/ diff --git a/src/ssl.lua b/src/ssl.lua index 4fde1af..3bd236b 100644 --- a/src/ssl.lua +++ b/src/ssl.lua @@ -1,7 +1,7 @@ ------------------------------------------------------------------------------ --- LuaSec 0.7alpha +-- LuaSec 0.7 -- --- Copyright (C) 2006-2017 Bruno Silvestre +-- Copyright (C) 2006-2018 Bruno Silvestre -- ------------------------------------------------------------------------------ diff --git a/src/x509.c b/src/x509.c index 7503327..6aded50 100644 --- a/src/x509.c +++ b/src/x509.c @@ -1,7 +1,7 @@ /*-------------------------------------------------------------------------- - * LuaSec 0.7alpha + * LuaSec 0.7 * - * Copyright (C) 2014-2017 Kim Alvefur, Paul Aurich, Tobias Markmann + * Copyright (C) 2014-2018 Kim Alvefur, Paul Aurich, Tobias Markmann * Matthew Wild, Bruno Silvestre. * *--------------------------------------------------------------------------*/ diff --git a/src/x509.h b/src/x509.h index 74f15ec..026f526 100644 --- a/src/x509.h +++ b/src/x509.h @@ -1,7 +1,7 @@ /*-------------------------------------------------------------------------- - * LuaSec 0.7alpha + * LuaSec 0.7 * - * Copyright (C) 2014-2017 Kim Alvefur, Paul Aurich, Tobias Markmann + * Copyright (C) 2014-2018 Kim Alvefur, Paul Aurich, Tobias Markmann * Matthew Wild, Bruno Silvestre. * *--------------------------------------------------------------------------*/