Skip to content

Commit

Permalink
Update to luasec-0.6. Switch to MASTER_SITE_GITHUB.
Browse files Browse the repository at this point in the history
Notable changes between 0.5 and 0.6:

Options from OpenSSL 1.0.2f
Use "any" protocol, but SSL.
Merge pull request #20 from Zash/zash/checkissued
    Method for checking if one certificate issued another
Merge pull request #68 from ignacio/master
    Enables building with LuaRocks and MS compilers
Enables building with LuaRocks and MS compilers
Merge pull request #56 from gleydsonsoares/Makefile-tweaks
    Makefile tweaks
Keep 'sslv23' for compability, but deprected. (it will be removed in the next version)
Merge pull request #62 from gleydsonsoares/update_protocol_samples
    add TLS_method / rename "sslv23" to "any" / update protocol samples.
update protocol samples(bring "tlsv1_2" to clients and "any" to servers)
for consistency and readability, rename "sslv23" to "any" since that it is related to {TLS, SSLv23}methods that handles all supported protocols.
add TLS_method(). for now, keep SSLv23_method() for compatibility.
Update samples (using 'tlsv1').
Merge pull request #55 from gleydsonsoares/ifndef-OPENSSL_NO_SSL3
    guard SSLv3_method() with #ifndef OPENSSL_NO_SSL3
Add lsec_testcontext().
bump MACOSX_VERSION
fix typo; s,intall,install,
guard SSLv3_method() with #ifndef OPENSSL_NO_SSL3
Set flags to compile with internal inet_ntop() by default.
Tag "alpha" explicit.
MinGW progress.
Merge pull request #53 from hishamhm/master
Reuse tag in the LuaSec upstream repository.
Merge pull request #26 from Tieske/master
    Update rockspec to fix Windows build
Alternative implementation to inet_ntop() for old versions of Windows.
Do not hardcode ar
added batch files to generate sample certs on Windows
Perform all validation before allocating structures
Validate signatures too.
    API changes to root:issued([intermediate]*, cert)
Fix inet_ntop() on Windows.
Merge branch 'master' of https://github.com/brunoos/luasec
Merge branch 'moteus_rock'
added bindir to lib section, as mingw links against dll's to be found in bindir
updated defines in rockspec
Merge branch 'master' of github.com:Tieske/luasec into moteus_rock
use winsock 2
Don't set globals from C.
Fix unpack().
Stop using module().
Change to luaL_newlib().
Remove luaL_optint() and luaL_checkint().
BSD headers.
Merge pull request #21 from Zash/zash/iPAddress-fix
    iPAddress encoding
Stop if we don't have a string.
Changed for strict compiles.
Fix for LibreSSL/OPENSSL_NO_COMP
Problem on Win64, since double does not represent SOCKET_INVALID exactly.
- Add a parameter to server:sni(), so that we can accept an unknown name, using the initial context.
- Add the method :getsniname() to retrieve the SNI hostname used.
Updated (and renamed) rockspec Windows
Encode iPAddress fields in human readable form
Don't try to encode IP addresses as UTF-8
Return early if ASN1 string is invalid
Push nil if unable to encode ASN1 string as UTF-8
Return human readable error message from cert:issued()
SNI support.
SNI support.
Merge pull request #17 from Zash/zash/checkkey
    Verify that certificate and key belong together
Merge pull request #19 from Zash/zash/pubkey
    Zash/pubkey
Add cert:pubkey() to methods registry
Add cert:issued(leafcert) for checking chains
Check if private key matches cert only if both key and cert are set
Check that certificate matches private key
Add method for extracting public key, type and size from x509 objects
  • Loading branch information
alnsn committed Jun 4, 2016
1 parent 904f284 commit 42d8641
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 30 deletions.
11 changes: 6 additions & 5 deletions security/lua-sec/Makefile
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
# $NetBSD: Makefile,v 1.14 2016/03/05 11:29:22 jperkin Exp $
# $NetBSD: Makefile,v 1.15 2016/06/04 21:48:11 alnsn Exp $

DISTNAME= luasec-0.5
PKGNAME= ${LUA_PKGPREFIX}-${DISTNAME:S/lua//}
PKGREVISION= 4
DISTNAME= luasec-0.6
PKGNAME= ${DISTNAME:S/luasec/${LUA_PKGPREFIX}-sec/}
CATEGORIES= security
MASTER_SITES= https://github.com/brunoos/luasec/archive/
MASTER_SITES= ${MASTER_SITE_GITHUB:=brunoos/}
GITHUB_TAG= ${DISTNAME}
GITHUB_PROJECT= ${DISTNAME:S/-${PKGVERSION_NOREV}//}

MAINTAINER= [email protected]
HOMEPAGE= https://github.com/brunoos/luasec/
Expand Down
14 changes: 7 additions & 7 deletions security/lua-sec/distinfo
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
$NetBSD: distinfo,v 1.7 2015/11/04 01:17:50 agc Exp $
$NetBSD: distinfo,v 1.8 2016/06/04 21:48:11 alnsn Exp $

SHA1 (luasec-0.5.tar.gz) = bcfe8fda66b6058d07031df3c4a20f6192cf3e73
RMD160 (luasec-0.5.tar.gz) = a9ef4591a770e178718e24778386136cdc87cadf
SHA512 (luasec-0.5.tar.gz) = fcf88f2566952c4d12be95531991180a1f3bd60f7dda41997f93c80ccc8d9dfd44b00e3330a07e451489dc9cd0640f7841101c10867e270608187df78549fe2f
Size (luasec-0.5.tar.gz) = 46738 bytes
SHA1 (patch-aa) = 364c0e6ee5c4c04ca7c9cb8a70129013289e9df9
SHA1 (patch-ab) = 3cd9916a098d3f0f77bbb58eab9841021049e2f3
SHA1 (luasec-0.6.tar.gz) = 3204c0ac99f7be1952ad8f1157e83cc513491cb4
RMD160 (luasec-0.6.tar.gz) = fc34ead1ec17b42991f8599f888007ab677dc6af
SHA512 (luasec-0.6.tar.gz) = f7004a329153d0126a3ea27b4986e9d83fb8f2de9c5c2f0c96427c50cc42e1252c69fd8cc69e2e8d423745d2dbfdb5a781b609938f7f502c7aedeb99fd0778cd
Size (luasec-0.6.tar.gz) = 51071 bytes
SHA1 (patch-Makefile) = 17ae13eecf9ce9269e8ef9a826507bd6230c3364
SHA1 (patch-src_Makefile) = c29625c3fd30cca14138867141586250487b2205
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
$NetBSD: patch-aa,v 1.4 2014/04/07 20:14:48 fhajny Exp $
$NetBSD: patch-Makefile,v 1.1 2016/06/04 21:48:12 alnsn Exp $

Pass installation dirs properly, fix search paths, add Solaris support
Pass installation dirs properly, fix search paths, add Solaris support.

--- Makefile.orig 2014-01-29 20:43:33.000000000 +0000
--- Makefile.orig 2016-03-03 19:11:46.000000000 +0000
+++ Makefile
@@ -6,7 +6,7 @@ LUACPATH ?= /usr/lib/lua/5.1
@@ -6,7 +6,7 @@ LUACPATH ?= /usr/lib/lua/5.1
# Comment this lines if you will link with non-internal LuaSocket's help files
# and edit INCDIR and LIBDIR properly.
EXTRA = luasocket
-DEFS = -DWITH_LUASOCKET
+DEFS = -DWITH_LUASOCKET -DLUA_COMPAT_MODULE
EXTRA = luasocket
-DEFS = -DWITH_LUASOCKET
+DEFS = -DWITH_LUASOCKET -DLUA_COMPAT_MODULE

# Edit the lines below to inform new path, if necessary.
# Path below points to internal LuaSocket's help files.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
$NetBSD: patch-ab,v 1.4 2014/04/16 14:07:50 fhajny Exp $
$NetBSD: patch-src_Makefile,v 1.1 2016/06/04 21:48:12 alnsn Exp $

Pass proper libs for SunOS.
--- src/Makefile.orig 2014-01-29 20:43:33.000000000 +0000

--- src/Makefile.orig 2016-03-03 19:11:46.000000000 +0000
+++ src/Makefile
@@ -6,7 +6,7 @@ OBJS= \
context.o \
Expand All @@ -19,17 +20,17 @@ Pass proper libs for SunOS.
+SOL_CFLAGS=-O2 -fpic $(WARN) $(INCDIR) $(DEFS)
+SOL_LDFLAGS=-O -shared -fpic $(LIBDIR)
+
INSTALL ?= install
CC ?= cc
LD ?= $(MYENV) cc
@@ -32,10 +35,11 @@ DESTDIR ?= /
INSTALL = install
CC = cc
LD = $(MYENV) cc
@@ -31,10 +34,11 @@ LDFLAGS += $(MYLDFLAGS)
all:

install: $(CMOD) $(LMOD)
- $(INSTALL) -d $(DESTDIR)$(LUAPATH)/ssl $(DESTDIR)$(LUACPATH)
- $(INSTALL) -D $(CMOD) $(DESTDIR)$(LUACPATH)
- $(INSTALL) -m644 -D $(LMOD) $(DESTDIR)$(LUAPATH)
- $(INSTALL) -m644 -D https.lua $(DESTDIR)$(LUAPATH)/ssl
- $(INSTALL) -d $(LUAPATH)/ssl $(LUACPATH)
- $(INSTALL) $(CMOD) $(LUACPATH)
- $(INSTALL) -m644 $(LMOD) $(LUAPATH)
- $(INSTALL) -m644 https.lua $(LUAPATH)/ssl
+ $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(LUAPATH)/ssl
+ $(BSD_INSTALL_LIB_DIR) $(DESTDIR)$(LUACPATH)
+ $(BSD_INSTALL_LIB) $(CMOD) $(DESTDIR)$(LUACPATH)
Expand All @@ -38,7 +39,7 @@ Pass proper libs for SunOS.

linux:
@$(MAKE) $(CMOD) MYCFLAGS="$(LNX_CFLAGS)" MYLDFLAGS="$(LNX_LDFLAGS)" EXTRA="$(EXTRA)"
@@ -46,6 +50,9 @@ bsd:
@@ -45,6 +49,9 @@ bsd:
macosx:
@$(MAKE) $(CMOD) MYCFLAGS="$(MAC_CFLAGS)" MYLDFLAGS="$(MAC_LDFLAGS)" MYENV="$(MAC_ENV)" EXTRA="$(EXTRA)"

Expand Down

0 comments on commit 42d8641

Please sign in to comment.