Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat/kdf #293

Merged
merged 3 commits into from
Sep 2, 2023
Merged

Feat/kdf #293

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7c425d0
introduce kdf for OpenSSL v3
zhaozg Sep 2, 2023
1efc57a
ci: fix setup LuaJIT
zhaozg Sep 2, 2023
98c0fd5
fixup OpenSSL cleanup
zhaozg Sep 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .github/shell/setup_lua.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,6 @@ if [ "$LUAJIT" == "yes" ]; then

if [ "$LUA" == "luajit2.1" ]; then
git checkout v2.1
# force the INSTALL_TNAME to be luajit
perl -i -pe 's/INSTALL_TNAME=.+/INSTALL_TNAME= luajit/' Makefile
fi

make && make install PREFIX="$LUA_HOME_DIR"
Expand Down
2 changes: 2 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,15 @@ add_library(lua-openssl ${LUA_OPENSSL_LIBTYPE}
src/engine.c
src/mac.c
src/hmac.c
src/kdf.c
src/lbn.c
src/lhash.c
src/misc.c
src/ocsp.c
src/oids.txt
src/openssl.c
src/ots.c
src/param.c
src/pkcs12.c
src/pkcs7.c
src/pkey.c
Expand Down
1 change: 1 addition & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,7 @@ OBJS=src/asn1.o deps/auxiliar/auxiliar.o src/bio.o src/cipher.o src/cms.o src/co
src/hmac.o src/lbn.o src/lhash.o src/misc.o src/ocsp.o src/openssl.o src/ots.o \
src/pkcs12.o src/pkcs7.o src/pkey.o src/rsa.o src/ssl.o src/th-lock.o src/util.o \
src/x509.o src/xattrs.o src/xexts.o src/xname.o src/xstore.o src/xalgor.o \
src/param.o src/kdf.o \
src/callback.o src/srp.o src/mac.o deps/auxiliar/subsidiar.o

.PHONY: all install test info doc coveralls asan
Expand Down
2 changes: 2 additions & 0 deletions openssl-scm-0.rockspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,14 @@ build = {
"src/engine.c",
"src/mac.c",
"src/hmac.c",
"src/kdf.c",
"src/lbn.c",
"src/lhash.c",
"src/misc.c",
"src/ocsp.c",
"src/openssl.c",
"src/ots.c",
"src/param.c",
"src/pkcs7.c",
"src/pkcs12.c",
"src/pkey.c",
Expand Down
Loading