summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQuentin Carbonneaux2021-11-22 21:08:16 +0100
committerQuentin Carbonneaux2021-11-22 21:08:16 +0100
commit90f0b63f77a642061222aa90dfecf3eac5a2e895 (patch)
treeb3cac563d2d9368581ed98d1e1a9d338ff50beb3
parent2ad1fa26bd8803b1a8f4f3ccf4105708a8456a21 (diff)
nits
-rw-r--r--.gitignore1
-rw-r--r--Makefile1
-rw-r--r--sdar/all.h4
3 files changed, 1 insertions, 5 deletions
diff --git a/.gitignore b/.gitignore
index 88583bd..fa29010 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,6 @@
*.sw[po]
tags
perf.data*
-sdar/blake3.h
sdar/lib/nacl-20110221
sdar/lib/timestamp
memex/memex
diff --git a/Makefile b/Makefile
index 8989cc3..2077df6 100644
--- a/Makefile
+++ b/Makefile
@@ -22,7 +22,6 @@ CRYPTOOBJ = $(CRYPTOSRC:sdar/%.c=obj/%.o)
V = @
SRC = $(wildcard sdar/*.c)
-OPT = sdar/sha256.c sdar/smix.c sdar/scrypt.c
OBJ = $(SRC:sdar/%.c=obj/%.o)
SANFLAGS = -fsanitize=address,undefined
diff --git a/sdar/all.h b/sdar/all.h
index 1ff901b..e54d203 100644
--- a/sdar/all.h
+++ b/sdar/all.h
@@ -229,13 +229,11 @@ int getlevel(Ilevel *, uchar *, long);
/* hmac.c */
void hmac_blake3(uchar *, long, uchar *, long, hmac_t);
-/* scrypt */
+/* lib/crypto */
void crypto_scrypt_smix(uint8_t *, size_t, uint64_t, void *, void *);
int crypto_scrypt(
uint8_t *passwd, size_t passwdlen, uint8_t *salt, size_t saltlen,
uint64_t N, uint32_t _r, uint32_t _p, uint8_t *buf, size_t buflen);
int crypto_scrypt_test();
-
-/* sha256.c */
void pbkdf2_sha256(uchar *p, size_t np, uint8_t *s, size_t ns,
uint64_t c, uint8_t *buf, size_t dkLen);