librewolf/bunkerized-nginx
4
0
Fork 1
mirror of https://github.com/bunkerity/bunkerized-nginx synced 2023-12-13 21:30:18 +01:00
Code Issues Projects Releases Wiki Activity

Squashed 'src/deps/src/luasec/' changes from fddde111f..4c0628705

Browse source 
4c0628705 Release LuaSec 1.3.2
5f4799d8c reset block timeout at send or receive
5787d51bb Merge pull request #197 from Zash/errno-bug-again
a2b211f84 Expand workaround for zero errno to OpenSSL 3.0.x
769ac528e Merge pull request #196 from barracuda156/darwin
0f0e07eb4 usocket.c: place EAI_OVERFLOW inside macro, unbreak build on <10.7

git-subtree-dir: src/deps/src/luasec
git-subtree-split: 4c06287052d68fdbe7429b8f967cdc8ee94aa44a
This commit is contained in:
Théophile Diot 2023-09-15 14:23:42 +02:00
parent a7d4cc5bba
commit 4430cf47dd
22 changed files with 43 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
CHANGELOG
View file

@ -1,3 +1,12 @@
--------------------------------------------------------------------------------
LuaSec 1.3.2
---------------
This version includes:
* Fix: place EAI_OVERFLOW inside macro, unbreak build on <10.7 (Sergey Fedorov)
* Fix: Expand workaround for zero errno to OpenSSL 3.0.x (Kim Alvefur)
* Fix: reset block timeout at send or receive (MartinDahlberg)
--------------------------------------------------------------------------------
LuaSec 1.3.1
---------------

2
INSTALL
View file

@ -1,4 +1,4 @@
LuaSec 1.3.1
LuaSec 1.3.2
------------
* OpenSSL options:

2
LICENSE
View file

@ -1,4 +1,4 @@
LuaSec 1.3.1 license
LuaSec 1.3.2 license
Copyright (C) 2006-2023 Bruno Silvestre, UFG
Permission is hereby granted, free of charge, to any person obtaining

2
README.md
View file

@ -1,4 +1,4 @@
LuaSec 1.3.1
LuaSec 1.3.2
===============
LuaSec depends on OpenSSL, and integrates with LuaSocket to make it
easy to add secure connections to any Lua applications or scripts.

4
luasec-1.3.1-1.rockspec → luasec-1.3.2-1.rockspec
View file

@ -1,8 +1,8 @@
package = "LuaSec"
version = "1.3.1-1"
version = "1.3.2-1"
source = {
url = "git+https://github.com/brunoos/luasec",
tag = "v1.3.1",
tag = "v1.3.2",
}
description = {
summary = "A binding for OpenSSL library to provide TLS/SSL communication over LuaSocket.",

6
src/compat.h
View file

@ -1,5 +1,5 @@
/*--------------------------------------------------------------------------
* LuaSec 1.3.1
* LuaSec 1.3.2
*
* Copyright (C) 2006-2023 Bruno Silvestre
*
@ -48,8 +48,8 @@
//------------------------------------------------------------------------------
#if !defined(LIBRESSL_VERSION_NUMBER) && ((OPENSSL_VERSION_NUMBER & 0xFFFFF000L) == 0x10101000L)
#define LSEC_OPENSSL_1_1_1
#if !defined(LIBRESSL_VERSION_NUMBER) && ((OPENSSL_VERSION_NUMBER & 0xFFFFF000L) == 0x10101000L || (OPENSSL_VERSION_NUMBER & 0xFFFFF000L) == 0x30000000L)
#define LSEC_OPENSSL_ERRNO_BUG
#endif
//------------------------------------------------------------------------------

2
src/config.c
View file

@ -1,5 +1,5 @@
/*--------------------------------------------------------------------------
* LuaSec 1.3.1
* LuaSec 1.3.2
*
* Copyright (C) 2006-2023 Bruno Silvestre
*

2
src/context.c
View file

@ -1,5 +1,5 @@
/*--------------------------------------------------------------------------
* LuaSec 1.3.1
* LuaSec 1.3.2
*
* Copyright (C) 2014-2023 Kim Alvefur, Paul Aurich, Tobias Markmann, Matthew Wild
* Copyright (C) 2006-2023 Bruno Silvestre

2
src/context.h
View file

@ -2,7 +2,7 @@
#define LSEC_CONTEXT_H
/*--------------------------------------------------------------------------
* LuaSec 1.3.1
* LuaSec 1.3.2
*
* Copyright (C) 2006-2023 Bruno Silvestre
*

2
src/ec.c
View file

@ -1,5 +1,5 @@
/*--------------------------------------------------------------------------
* LuaSec 1.3.1
* LuaSec 1.3.2
*
* Copyright (C) 2006-2023 Bruno Silvestre
*

2
src/ec.h
View file

@ -1,5 +1,5 @@
/*--------------------------------------------------------------------------
* LuaSec 1.3.1
* LuaSec 1.3.2
*
* Copyright (C) 2006-2023 Bruno Silvestre
*

6
src/https.lua
View file

@ -1,5 +1,5 @@
----------------------------------------------------------------------------
-- LuaSec 1.3.1
-- LuaSec 1.3.2
--
-- Copyright (C) 2009-2023 PUC-Rio
--
@ -19,8 +19,8 @@ local try = socket.try
-- Module
--
local _M = {
_VERSION = "1.3.1",
_COPYRIGHT = "LuaSec 1.3.1 - Copyright (C) 2009-2023 PUC-Rio",
_VERSION = "1.3.2",
_COPYRIGHT = "LuaSec 1.3.2 - Copyright (C) 2009-2023 PUC-Rio",
PORT = 443,
TIMEOUT = 60
}

12
src/luasocket/buffer.c
View file

@ -78,9 +78,7 @@ int buffer_meth_send(lua_State *L, p_buffer buf) {
const char *data = luaL_checklstring(L, 2, &size);
long start = (long) luaL_optnumber(L, 3, 1);
long end = (long) luaL_optnumber(L, 4, -1);
#ifdef LUASOCKET_DEBUG
p_timeout tm = timeout_markstart(buf->tm);
#endif
timeout_markstart(buf->tm);
if (start < 0) start = (long) (size+start+1);
if (end < 0) end = (long) (size+end+1);
if (start < 1) start = (long) 1;
@ -98,7 +96,7 @@ int buffer_meth_send(lua_State *L, p_buffer buf) {
}
#ifdef LUASOCKET_DEBUG
/* push time elapsed during operation as the last return value */
lua_pushnumber(L, timeout_gettime() - timeout_getstart(tm));
lua_pushnumber(L, timeout_gettime() - timeout_getstart(buf->tm));
#endif
return lua_gettop(L) - top;
}
@ -117,9 +115,7 @@ int buffer_meth_receive(lua_State *L, p_buffer buf) {
top = 3;
}
part = luaL_optlstring(L, 3, "", &size);
#ifdef LUASOCKET_DEBUG
p_timeout tm = timeout_markstart(buf->tm);
#endif
timeout_markstart(buf->tm);
/* initialize buffer with optional extra prefix
* (useful for concatenating previous partial results) */
luaL_buffinit(L, &b);
@ -155,7 +151,7 @@ int buffer_meth_receive(lua_State *L, p_buffer buf) {
}
#ifdef LUASOCKET_DEBUG
/* push time elapsed during operation as the last return value */
lua_pushnumber(L, timeout_gettime() - timeout_getstart(tm));
lua_pushnumber(L, timeout_gettime() - timeout_getstart(buf->tm));
#endif
return lua_gettop(L) - top;
}

2
src/luasocket/usocket.c
View file

@ -426,7 +426,9 @@ const char *socket_gaistrerror(int err) {
case EAI_MEMORY: return "memory allocation failure";
case EAI_NONAME:
return "host or service not provided, or not known";
#ifdef EAI_OVERFLOW
case EAI_OVERFLOW: return "argument buffer overflow";
#endif
#ifdef EAI_PROTOCOL
case EAI_PROTOCOL: return "resolved protocol is unknown";
#endif

2
src/options.c
View file

@ -1,5 +1,5 @@
/*--------------------------------------------------------------------------
* LuaSec 1.3.1
* LuaSec 1.3.2
*
* Copyright (C) 2006-2023 Bruno Silvestre
*

2
src/options.h
View file

@ -2,7 +2,7 @@
#define LSEC_OPTIONS_H
/*--------------------------------------------------------------------------
* LuaSec 1.3.1
* LuaSec 1.3.2
*
* Copyright (C) 2006-2023 Bruno Silvestre
*

2
src/options.lua
View file

@ -18,7 +18,7 @@ end
local function generate(options, version)
print([[
/*--------------------------------------------------------------------------
* LuaSec 1.3.1
* LuaSec 1.3.2
*
* Copyright (C) 2006-2023 Bruno Silvestre
*

8
src/ssl.c
View file

@ -1,5 +1,5 @@
/*--------------------------------------------------------------------------
* LuaSec 1.3.1
* LuaSec 1.3.2
*
* Copyright (C) 2014-2023 Kim Alvefur, Paul Aurich, Tobias Markmann, Matthew Wild
* Copyright (C) 2006-2023 Bruno Silvestre
@ -47,8 +47,8 @@ static int lsec_socket_error()
#if defined(WIN32)
return WSAGetLastError();
#else
#if defined(LSEC_OPENSSL_1_1_1)
// Bug in OpenSSL 1.1.1
#if defined(LSEC_OPENSSL_ERRNO_BUG)
// Bug in OpenSSL
if (errno == 0)
return LSEC_IO_SSL;
#endif
@ -947,7 +947,7 @@ static int meth_getalpn(lua_State *L)
static int meth_copyright(lua_State *L)
{
lua_pushstring(L, "LuaSec 1.3.1 - Copyright (C) 2006-2023 Bruno Silvestre, UFG"
lua_pushstring(L, "LuaSec 1.3.2 - Copyright (C) 2006-2023 Bruno Silvestre, UFG"
#if defined(WITH_LUASOCKET)
"\nLuaSocket 3.0-RC1 - Copyright (C) 2004-2013 Diego Nehab"
#endif

2
src/ssl.h
View file

@ -2,7 +2,7 @@
#define LSEC_SSL_H
/*--------------------------------------------------------------------------
* LuaSec 1.3.1
* LuaSec 1.3.2
*
* Copyright (C) 2006-2023 Bruno Silvestre
*

4
src/ssl.lua
View file

@ -1,5 +1,5 @@
------------------------------------------------------------------------------
-- LuaSec 1.3.1
-- LuaSec 1.3.2
--
-- Copyright (C) 2006-2023 Bruno Silvestre
--
@ -302,7 +302,7 @@ core.setmethod("info", info)
--
local _M = {
_VERSION = "1.3.1",
_VERSION = "1.3.2",
_COPYRIGHT = core.copyright(),
config = config,
loadcertificate = x509.load,

2
src/x509.c
View file

@ -1,5 +1,5 @@
/*--------------------------------------------------------------------------
* LuaSec 1.3.1
* LuaSec 1.3.2
*
* Copyright (C) 2014-2023 Kim Alvefur, Paul Aurich, Tobias Markmann, Matthew Wild
* Copyright (C) 2014-2023 Bruno Silvestre

2
src/x509.h
View file

@ -1,5 +1,5 @@
/*--------------------------------------------------------------------------
* LuaSec 1.3.1
* LuaSec 1.3.2
*
* Copyright (C) 2014-2023 Kim Alvefur, Paul Aurich, Tobias Markmann, Matthew Wild
* Copyright (C) 2013-2023 Bruno Silvestre