tomb

commit a500766644ac56b2068b57e54f80df122173f754
parent 6e51d166be2b57b78176d2b79a76960bb8486040
Author: Jaromil <jaromil@dyne.org>
Date:   Tue, 11 Jun 2013 17:21:06 +0000

fix to build KDF key protection algorithms

Diffstat:
A
extras/kdf/Makefile
 | 
10
++++++++++
D
extras/kdf/Makefile.am
 | 
20
--------------------
M
extras/kdf/README
 | 
9
+++++++++
R
extras/kdf/pbkdf2/benchmark.c -> extras/kdf/benchmark.c
 | 
0

R
extras/kdf/pbkdf2/gen_salt.c -> extras/kdf/gen_salt.c
 | 
0

R
extras/kdf/pbkdf2/pbkdf2.c -> extras/kdf/pbkdf2.c
 | 
0

6 files changed, 19 insertions(+), 20 deletions(-)
diff --git a/extras/kdf/Makefile b/extras/kdf/Makefile
@@ -0,0 +1,9 @@
+
+all:
+	gcc -O2 -o tomb-kdb-pbkdf2 pbkdf2.c -lgcrypt
+	gcc -O2 -o tomb-kdb-pbkdf2-getiter benchmark.c -lgcrypt
+	gcc -O2 -o tomb-kdb-pbkdf2-gensalt gen_salt.c -lgcrypt
+	gcc -O2 -o hexencode hexencode.c
+
+clean:
+	rm -f tomb-kdb-pbkdf2-getiter tomb-kdb-pbkdf2 tomb-kdb-pbkdf2-gensalt hexencode+
\ No newline at end of file
diff --git a/extras/kdf/Makefile.am b/extras/kdf/Makefile.am
@@ -1,20 +0,0 @@
-if GCRYPT
-gcrypt_needing_programs = tomb-kdf-pbkdf2 tomb-kdf-pbkdf2-getiter
-else
-gcrypt_needing_programs=
-endif
-	
-
-bin_PROGRAMS = $(gcrypt_needing_programs) tomb-kdf-pbkdf2-gensalt hexencode
-tomb_kdf_pbkdf2_SOURCES = pbkdf2/pbkdf2.c
-tomb_kdf_pbkdf2_CFLAGS = $(LIBGCRYPT_CFLAGS)
-tomb_kdf_pbkdf2_LDADD = $(LIBGCRYPT_LIBS)
-
-tomb_kdf_pbkdf2_gensalt_SOURCES = pbkdf2/gen_salt.c
-
-tomb_kdf_pbkdf2_getiter_SOURCES = pbkdf2/benchmark.c
-tomb_kdf_pbkdf2_getiter_CFLAGS = $(LIBGCRYPT_CFLAGS)
-tomb_kdf_pbkdf2_getiter_LDADD = $(LIBGCRYPT_LIBS)
-
-hexencode_SOURCES = hexencode.c
-
diff --git a/extras/kdf/README b/extras/kdf/README
@@ -1,3 +1,12 @@
+
+BUILD
+------
+
+Just type make.
+You need a recent development version of libgcrypt installed.
+On Debian 7 (not earlier) the libgcrypt11-dev package works:
+ # apt-get install libgcrypt11-dev
+
 PLANS
 ------
 
diff --git a/extras/kdf/pbkdf2/benchmark.c b/extras/kdf/benchmark.c
diff --git a/extras/kdf/pbkdf2/gen_salt.c b/extras/kdf/gen_salt.c
diff --git a/extras/kdf/pbkdf2/pbkdf2.c b/extras/kdf/pbkdf2.c