mirror of
https://github.com/brunoos/luasec.git
synced 2025-07-16 13:59:52 +02:00
Compare commits
4 Commits
Author | SHA1 | Date | |
---|---|---|---|
c297c5204c | |||
e42bc358e2 | |||
f72457bbf9 | |||
361813c0da |
@ -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
|
||||
---------------
|
||||
|
4
INSTALL
4
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:
|
||||
|
||||
|
4
LICENSE
4
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
|
||||
|
@ -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.
|
||||
|
@ -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.",
|
||||
@ -87,7 +87,7 @@ build = {
|
||||
"$(OPENSSL_BINDIR)",
|
||||
},
|
||||
libraries = {
|
||||
"libssl32MD", "libcrypto32MD", "ws2_32"
|
||||
"libssl", "libcrypto", "ws2_32"
|
||||
},
|
||||
incdirs = {
|
||||
"$(OPENSSL_INCDIR)", "src/", "src/luasocket"
|
@ -61,7 +61,7 @@
|
||||
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<AdditionalDependencies>ws2_32.lib;libeay32MDd.lib;ssleay32MDd.lib;lua5.1.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<AdditionalDependencies>ws2_32.lib;libssl.lib;libcrypto.lib;lua5.1.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<OutputFile>$(OutDir)ssl.dll</OutputFile>
|
||||
<AdditionalLibraryDirectories>C:\devel\openssl\lib\VC;C:\devel\lua-dll9;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
@ -85,7 +85,7 @@
|
||||
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<AdditionalDependencies>ws2_32.lib;libssl32MD.lib;libcrypto32MD.lib;lua5.1.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<AdditionalDependencies>ws2_32.lib;libssl.lib;libcrypto.lib;lua5.1.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
|
||||
<AdditionalLibraryDirectories>C:\devel\openssl-1.1.0\lib\VC;C:\devel\lua-5.1\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
|
@ -1,7 +1,7 @@
|
||||
/*--------------------------------------------------------------------------
|
||||
* LuaSec 1.2.0
|
||||
* LuaSec 1.3.0
|
||||
*
|
||||
* Copyright (C) 2006-2022 Bruno Silvestre
|
||||
* Copyright (C) 2006-2023 Bruno Silvestre
|
||||
*
|
||||
*--------------------------------------------------------------------------*/
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
/*--------------------------------------------------------------------------
|
||||
* LuaSec 1.2.0
|
||||
* LuaSec 1.3.0
|
||||
*
|
||||
* Copyright (C) 2006-2022 Bruno Silvestre.
|
||||
* Copyright (C) 2006-2023 Bruno Silvestre
|
||||
*
|
||||
*--------------------------------------------------------------------------*/
|
||||
|
||||
|
@ -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
|
||||
*
|
||||
*--------------------------------------------------------------------------*/
|
||||
|
||||
|
@ -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
|
||||
*
|
||||
*--------------------------------------------------------------------------*/
|
||||
|
||||
|
7
src/ec.c
7
src/ec.c
@ -1,3 +1,10 @@
|
||||
/*--------------------------------------------------------------------------
|
||||
* LuaSec 1.3.0
|
||||
*
|
||||
* Copyright (C) 2006-2023 Bruno Silvestre
|
||||
*
|
||||
*--------------------------------------------------------------------------*/
|
||||
|
||||
#include <openssl/objects.h>
|
||||
|
||||
#include "ec.h"
|
||||
|
4
src/ec.h
4
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
|
||||
*
|
||||
*--------------------------------------------------------------------------*/
|
||||
|
||||
|
@ -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
|
||||
}
|
||||
|
@ -1,7 +1,7 @@
|
||||
/*--------------------------------------------------------------------------
|
||||
* LuaSec 1.2.0
|
||||
* LuaSec 1.3.0
|
||||
*
|
||||
* Copyright (C) 2006-2022 Bruno Silvestre
|
||||
* Copyright (C) 2006-2023 Bruno Silvestre
|
||||
*
|
||||
*--------------------------------------------------------------------------*/
|
||||
|
||||
@ -13,7 +13,7 @@
|
||||
|
||||
|
||||
/*
|
||||
OpenSSL version: OpenSSL 3.0.0-beta2
|
||||
OpenSSL version: OpenSSL 3.0.8
|
||||
*/
|
||||
|
||||
static lsec_ssl_option_t ssl_options[] = {
|
||||
|
@ -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
|
||||
*
|
||||
*--------------------------------------------------------------------------*/
|
||||
|
||||
|
@ -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
|
||||
*
|
||||
*--------------------------------------------------------------------------*/
|
||||
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
*
|
||||
*--------------------------------------------------------------------------*/
|
||||
|
||||
|
@ -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,
|
||||
|
@ -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
|
||||
*
|
||||
*--------------------------------------------------------------------------*/
|
||||
|
||||
|
@ -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
|
||||
*
|
||||
*--------------------------------------------------------------------------*/
|
||||
|
||||
|
Reference in New Issue
Block a user