diff options
| author | Uros Majstorovic <majstor@majstor.org> | 2017-05-23 17:28:12 +0200 |
|---|---|---|
| committer | Uros Majstorovic <majstor@majstor.org> | 2017-05-23 17:28:12 +0200 |
| commit | ab0325ae7906230f1ea82f08b27c72b075e9a13d (patch) | |
| tree | 5a292826fdea4db2c86b2d82b80fa489c6c131c7 /code/core/crypto | |
| parent | 3ef6719f47b734b12c0b11c725b7f12e3fb3c08a (diff) | |
build fixed; added lib util
Diffstat (limited to 'code/core/crypto')
| -rw-r--r-- | code/core/crypto/Makefile | 2 | ||||
| -rw-r--r-- | code/core/crypto/chacha/Makefile | 2 | ||||
| -rw-r--r-- | code/core/crypto/compat/Makefile | 2 | ||||
| -rw-r--r-- | code/core/crypto/curve25519/Makefile | 2 | ||||
| -rw-r--r-- | code/core/crypto/poly1305/Makefile | 2 | ||||
| -rw-r--r-- | code/core/crypto/sha/Makefile | 2 | ||||
| -rw-r--r-- | code/core/crypto/test/Makefile | 4 |
7 files changed, 15 insertions, 1 deletions
diff --git a/code/core/crypto/Makefile b/code/core/crypto/Makefile index cfd3bf8..2fabea2 100644 --- a/code/core/crypto/Makefile +++ b/code/core/crypto/Makefile @@ -1,11 +1,13 @@ MAKE=make CFLAGS=-Iinclude -I.. -D__BEGIN_HIDDEN_DECLS= -D__END_HIDDEN_DECLS= -O3 $(PIC) + obj = e_chacha20poly1305.o crypto.o obj_dep = compat/explicit_bzero.o compat/timingsafe_memcmp.o compat/timingsafe_bcmp.o \ chacha/chacha.o poly1305/poly1305.o curve25519/curve25519.o curve25519/curve25519-generic.o \ sha/sha256.o sha/sha512.o subdirs = compat curve25519 chacha poly1305 sha + %.o: %.c $(CC) $(CFLAGS) -c $< diff --git a/code/core/crypto/chacha/Makefile b/code/core/crypto/chacha/Makefile index dae3373..071a1b1 100644 --- a/code/core/crypto/chacha/Makefile +++ b/code/core/crypto/chacha/Makefile @@ -1,6 +1,8 @@ CFLAGS=-I../include -D__BEGIN_HIDDEN_DECLS= -D__END_HIDDEN_DECLS= -O3 $(PIC) + obj = chacha.o + all: libchacha.a dep: all diff --git a/code/core/crypto/compat/Makefile b/code/core/crypto/compat/Makefile index 2c0fa5c..a0dec2d 100644 --- a/code/core/crypto/compat/Makefile +++ b/code/core/crypto/compat/Makefile @@ -1,7 +1,9 @@ CFLAGS=-I../include -D__BEGIN_HIDDEN_DECLS= -D__END_HIDDEN_DECLS= -O3 $(PIC) + getentropy = getentropy_osx obj = explicit_bzero.o timingsafe_memcmp.o timingsafe_bcmp.o # arc4random.o arc4random_uniform.o $(getentropy).o + all: libcompat.a dep: all diff --git a/code/core/crypto/curve25519/Makefile b/code/core/crypto/curve25519/Makefile index 470d31e..1a96045 100644 --- a/code/core/crypto/curve25519/Makefile +++ b/code/core/crypto/curve25519/Makefile @@ -1,6 +1,8 @@ CFLAGS=-I../include -D__BEGIN_HIDDEN_DECLS= -D__END_HIDDEN_DECLS= -DED25519 -O3 $(PIC) + obj = curve25519.o curve25519-generic.o + all: libcurve25519.a dep: all diff --git a/code/core/crypto/poly1305/Makefile b/code/core/crypto/poly1305/Makefile index 6ddec33..e780491 100644 --- a/code/core/crypto/poly1305/Makefile +++ b/code/core/crypto/poly1305/Makefile @@ -1,6 +1,8 @@ CFLAGS=-I../include -D__BEGIN_HIDDEN_DECLS= -D__END_HIDDEN_DECLS= -O3 $(PIC) + obj = poly1305.o + all: libpoly1305.a dep: all diff --git a/code/core/crypto/sha/Makefile b/code/core/crypto/sha/Makefile index 8a50b28..f078644 100644 --- a/code/core/crypto/sha/Makefile +++ b/code/core/crypto/sha/Makefile @@ -1,6 +1,8 @@ CFLAGS=-I../include -D__BEGIN_HIDDEN_DECLS= -D__END_HIDDEN_DECLS= -O3 $(PIC) + obj = sha1dgst.o sha1_one.o sha256.o sha512.o + all: libsha.a dep: all diff --git a/code/core/crypto/test/Makefile b/code/core/crypto/test/Makefile index b6a92f2..f274209 100644 --- a/code/core/crypto/test/Makefile +++ b/code/core/crypto/test/Makefile @@ -1,9 +1,11 @@ -CFLAGS=-I.. -I../include -O3 +CFLAGS=-I.. -I../include -O3 + aead_dep=../compat/explicit_bzero.o ../compat/timingsafe_memcmp.o ../compat/timingsafe_bcmp.o \ ../chacha/chacha.o ../poly1305/poly1305.o ../curve25519/curve25519.o ../curve25519/curve25519-generic.o \ ../sha/sha512.o ../e_chacha20poly1305.o dsa_dep=../*/*.a + %.o: %.c $(CC) $(CFLAGS) -c $< |