From c297c5204ca6aa8eb15ce0c5ddb3bbfef0e66169 Mon Sep 17 00:00:00 2001 From: Bruno Silvestre Date: Tue, 14 Mar 2023 10:43:47 -0300 Subject: [PATCH] Update version number --- CHANGELOG | 8 ++++++++ INSTALL | 4 ++-- LICENSE | 4 ++-- README.md | 2 +- luasec-1.2.0-1.rockspec => luasec-1.3.0-1.rockspec | 4 ++-- src/compat.h | 4 ++-- src/config.c | 4 ++-- src/context.c | 7 +++---- src/context.h | 4 ++-- src/ec.c | 7 +++++++ src/ec.h | 4 ++-- src/https.lua | 9 +++++---- src/options.c | 4 ++-- src/options.h | 4 ++-- src/options.lua | 4 ++-- src/ssl.c | 9 ++++----- src/ssl.h | 4 ++-- src/ssl.lua | 6 +++--- src/x509.c | 6 +++--- src/x509.h | 6 +++--- 20 files changed, 59 insertions(+), 45 deletions(-) rename luasec-1.2.0-1.rockspec => luasec-1.3.0-1.rockspec (98%) diff --git a/CHANGELOG b/CHANGELOG index b94f4ae..773d23f 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,11 @@ +-------------------------------------------------------------------------------- +LuaSec 1.3.0 +--------------- +This version includes: + +* Add :getlocalchain() + :getlocalcertificate() to mirror the peer methods (@mwild1) +* Add Pre-Shared Key (PSK) support (@jclab-joseph) + -------------------------------------------------------------------------------- LuaSec 1.2.0 --------------- diff --git a/INSTALL b/INSTALL index 7dfbe52..1941785 100644 --- a/INSTALL +++ b/INSTALL @@ -1,9 +1,9 @@ -LuaSec 1.2.0 +LuaSec 1.3.0 ------------ * OpenSSL options: - By default, this version includes options for OpenSSL 3.0.0 beta2 + By default, this version includes options for OpenSSL 3.0.8 If you need to generate the options for a different version of OpenSSL: diff --git a/LICENSE b/LICENSE index 96c5ce6..405375f 100644 --- a/LICENSE +++ b/LICENSE @@ -1,5 +1,5 @@ -LuaSec 1.2.0 license -Copyright (C) 2006-2022 Bruno Silvestre, UFG +LuaSec 1.3.0 license +Copyright (C) 2006-2023 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 e8da71a..73b1180 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -LuaSec 1.2.0 +LuaSec 1.3.0 =============== 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/luasec-1.2.0-1.rockspec b/luasec-1.3.0-1.rockspec similarity index 98% rename from luasec-1.2.0-1.rockspec rename to luasec-1.3.0-1.rockspec index 7e11ea5..7f4a1fa 100644 --- a/luasec-1.2.0-1.rockspec +++ b/luasec-1.3.0-1.rockspec @@ -1,8 +1,8 @@ package = "LuaSec" -version = "1.2.0-1" +version = "1.3.0-1" source = { url = "git+https://github.com/brunoos/luasec", - tag = "v1.2.0", + tag = "v1.3.0", } 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 cb3ac8e..ef8da4d 100644 --- a/src/compat.h +++ b/src/compat.h @@ -1,7 +1,7 @@ /*-------------------------------------------------------------------------- - * LuaSec 1.2.0 + * LuaSec 1.3.0 * - * Copyright (C) 2006-2022 Bruno Silvestre + * Copyright (C) 2006-2023 Bruno Silvestre * *--------------------------------------------------------------------------*/ diff --git a/src/config.c b/src/config.c index ef1c04f..7cf8239 100644 --- a/src/config.c +++ b/src/config.c @@ -1,7 +1,7 @@ /*-------------------------------------------------------------------------- - * LuaSec 1.2.0 + * LuaSec 1.3.0 * - * Copyright (C) 2006-2022 Bruno Silvestre. + * Copyright (C) 2006-2023 Bruno Silvestre * *--------------------------------------------------------------------------*/ diff --git a/src/context.c b/src/context.c index dcabbc0..a7e766c 100644 --- a/src/context.c +++ b/src/context.c @@ -1,9 +1,8 @@ /*-------------------------------------------------------------------------- - * LuaSec 1.2.0 + * LuaSec 1.3.0 * - * Copyright (C) 2014-2022 Kim Alvefur, Paul Aurich, Tobias Markmann, - * Matthew Wild. - * Copyright (C) 2006-2022 Bruno Silvestre. + * Copyright (C) 2014-2023 Kim Alvefur, Paul Aurich, Tobias Markmann, Matthew Wild + * Copyright (C) 2006-2023 Bruno Silvestre * *--------------------------------------------------------------------------*/ diff --git a/src/context.h b/src/context.h index a2dd7db..25b4fe0 100644 --- a/src/context.h +++ b/src/context.h @@ -2,9 +2,9 @@ #define LSEC_CONTEXT_H /*-------------------------------------------------------------------------- - * LuaSec 1.2.0 + * LuaSec 1.3.0 * - * Copyright (C) 2006-2022 Bruno Silvestre + * Copyright (C) 2006-2023 Bruno Silvestre * *--------------------------------------------------------------------------*/ diff --git a/src/ec.c b/src/ec.c index 73b09d7..64b0721 100644 --- a/src/ec.c +++ b/src/ec.c @@ -1,3 +1,10 @@ +/*-------------------------------------------------------------------------- + * LuaSec 1.3.0 + * + * Copyright (C) 2006-2023 Bruno Silvestre + * + *--------------------------------------------------------------------------*/ + #include #include "ec.h" diff --git a/src/ec.h b/src/ec.h index 7bf700d..d26e255 100644 --- a/src/ec.h +++ b/src/ec.h @@ -1,7 +1,7 @@ /*-------------------------------------------------------------------------- - * LuaSec 1.2.0 + * LuaSec 1.3.0 * - * Copyright (C) 2006-2022 Bruno Silvestre + * Copyright (C) 2006-2023 Bruno Silvestre * *--------------------------------------------------------------------------*/ diff --git a/src/https.lua b/src/https.lua index 1d7ec7b..9b2aed5 100644 --- a/src/https.lua +++ b/src/https.lua @@ -1,6 +1,7 @@ ---------------------------------------------------------------------------- --- LuaSec 1.2.0 --- Copyright (C) 2009-2022 PUC-Rio +-- LuaSec 1.3.0 +-- +-- Copyright (C) 2009-2023 PUC-Rio -- -- Author: Pablo Musa -- Author: Tomas Guisasola @@ -18,8 +19,8 @@ local try = socket.try -- Module -- local _M = { - _VERSION = "1.2.0", - _COPYRIGHT = "LuaSec 1.2.0 - Copyright (C) 2009-2022 PUC-Rio", + _VERSION = "1.3.0", + _COPYRIGHT = "LuaSec 1.3.0 - Copyright (C) 2009-2023 PUC-Rio", PORT = 443, TIMEOUT = 60 } diff --git a/src/options.c b/src/options.c index 791a534..4125d13 100644 --- a/src/options.c +++ b/src/options.c @@ -1,7 +1,7 @@ /*-------------------------------------------------------------------------- - * LuaSec 1.2.0 + * LuaSec 1.3.0 * - * Copyright (C) 2006-2022 Bruno Silvestre + * Copyright (C) 2006-2023 Bruno Silvestre * *--------------------------------------------------------------------------*/ diff --git a/src/options.h b/src/options.h index 7f4ce0a..dd1812a 100644 --- a/src/options.h +++ b/src/options.h @@ -2,9 +2,9 @@ #define LSEC_OPTIONS_H /*-------------------------------------------------------------------------- - * LuaSec 1.2.0 + * LuaSec 1.3.0 * - * Copyright (C) 2006-2022 Bruno Silvestre + * Copyright (C) 2006-2023 Bruno Silvestre * *--------------------------------------------------------------------------*/ diff --git a/src/options.lua b/src/options.lua index 8899ed2..48fdd37 100644 --- a/src/options.lua +++ b/src/options.lua @@ -18,9 +18,9 @@ end local function generate(options, version) print([[ /*-------------------------------------------------------------------------- - * LuaSec 1.2.0 + * LuaSec 1.3.0 * - * Copyright (C) 2006-2022 Bruno Silvestre + * Copyright (C) 2006-2023 Bruno Silvestre * *--------------------------------------------------------------------------*/ diff --git a/src/ssl.c b/src/ssl.c index ce83c9d..63e41b5 100644 --- a/src/ssl.c +++ b/src/ssl.c @@ -1,9 +1,8 @@ /*-------------------------------------------------------------------------- - * LuaSec 1.2.0 + * LuaSec 1.3.0 * - * Copyright (C) 2014-2022 Kim Alvefur, Paul Aurich, Tobias Markmann, - * Matthew Wild. - * Copyright (C) 2006-2022 Bruno Silvestre. + * Copyright (C) 2014-2023 Kim Alvefur, Paul Aurich, Tobias Markmann, Matthew Wild + * Copyright (C) 2006-2023 Bruno Silvestre * *--------------------------------------------------------------------------*/ @@ -948,7 +947,7 @@ static int meth_getalpn(lua_State *L) static int meth_copyright(lua_State *L) { - lua_pushstring(L, "LuaSec 1.2.0 - Copyright (C) 2006-2022 Bruno Silvestre, UFG" + lua_pushstring(L, "LuaSec 1.3.0 - Copyright (C) 2006-2023 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 69b010f..3cfbce4 100644 --- a/src/ssl.h +++ b/src/ssl.h @@ -2,9 +2,9 @@ #define LSEC_SSL_H /*-------------------------------------------------------------------------- - * LuaSec 1.2.0 + * LuaSec 1.3.0 * - * Copyright (C) 2006-2022 Bruno Silvestre + * Copyright (C) 2006-2023 Bruno Silvestre * *--------------------------------------------------------------------------*/ diff --git a/src/ssl.lua b/src/ssl.lua index b182d53..1933096 100644 --- a/src/ssl.lua +++ b/src/ssl.lua @@ -1,7 +1,7 @@ ------------------------------------------------------------------------------ --- LuaSec 1.2.0 +-- LuaSec 1.3.0 -- --- Copyright (C) 2006-2022 Bruno Silvestre +-- Copyright (C) 2006-2023 Bruno Silvestre -- ------------------------------------------------------------------------------ @@ -302,7 +302,7 @@ core.setmethod("info", info) -- local _M = { - _VERSION = "1.2.0", + _VERSION = "1.3.0", _COPYRIGHT = core.copyright(), config = config, loadcertificate = x509.load, diff --git a/src/x509.c b/src/x509.c index 9bb5e57..45fe6b6 100644 --- a/src/x509.c +++ b/src/x509.c @@ -1,8 +1,8 @@ /*-------------------------------------------------------------------------- - * LuaSec 1.2.0 + * LuaSec 1.3.0 * - * Copyright (C) 2014-2022 Kim Alvefur, Paul Aurich, Tobias Markmann - * Matthew Wild, Bruno Silvestre. + * Copyright (C) 2014-2023 Kim Alvefur, Paul Aurich, Tobias Markmann, Matthew Wild + * Copyright (C) 2014-2023 Bruno Silvestre * *--------------------------------------------------------------------------*/ diff --git a/src/x509.h b/src/x509.h index f47b87e..2d65b5d 100644 --- a/src/x509.h +++ b/src/x509.h @@ -1,8 +1,8 @@ /*-------------------------------------------------------------------------- - * LuaSec 1.2.0 + * LuaSec 1.3.0 * - * Copyright (C) 2014-2022 Kim Alvefur, Paul Aurich, Tobias Markmann - * Matthew Wild, Bruno Silvestre. + * Copyright (C) 2014-2023 Kim Alvefur, Paul Aurich, Tobias Markmann, Matthew Wild + * Copyright (C) 2013-2023 Bruno Silvestre * *--------------------------------------------------------------------------*/