summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorRichard Ipsum <richardipsum@fastmail.co.uk>2017-05-28 19:36:01 +0100
committerRichard Ipsum <richardipsum@fastmail.co.uk>2017-06-05 21:29:23 +0100
commitf848a19d352121a00b8526ed5c2ec60330e25ab2 (patch)
tree1000ccff4dd7e05de9bda3a91eb5c89eabd78463 /Makefile
parent55e859083e94dc052791bb7329af2149eded470c (diff)
downloadlua-scrypt-git-f848a19d352121a00b8526ed5c2ec60330e25ab2.tar.gz
Add TRUST_LIBSCRYPT_SALT_GEN build option
Modern versions of libscrypt now generate salt correctly, indeed using the very method currently used by lua-scrypt.[1] This patch adds a build option that is disabled by default, when enabled lua-scrypt will use libscrypt's salt generation code rather than its own. [1]: https://sources.debian.net/src/libscrypt/1.21-3/crypto-scrypt-saltgen.c/
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile3
1 files changed, 1 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 8e756c1..e32ab37 100644
--- a/Makefile
+++ b/Makefile
@@ -100,11 +100,10 @@ LIBCRYPT_C := lib/crypto/crypto_aesctr.c \
lib/crypto/crypto_scrypt-ref.c \
lib/crypto/sha256.c
-CFLAGS ?= -O2 -Wall
INSTALL := /usr/bin/install
SCRYPT_LIBS := -lscrypt
-CFLAGS := $(CFLAGS) -fPIC
+override CFLAGS := $(CFLAGS) -O2 -Wall -fPIC
all: lua-5.1-try lua-5.2-try