diff --git a/_pyecc.h b/_pyecc.h index f54dc50..439b08e 100644 --- a/_pyecc.h +++ b/_pyecc.h @@ -22,7 +22,7 @@ #include -#include "seccure/libecc.h" +#include "seccure/libseccure.h" #endif diff --git a/seccure/Makefile b/seccure/Makefile index f6afd77..2d2073e 100644 --- a/seccure/Makefile +++ b/seccure/Makefile @@ -1,12 +1,12 @@ LDFLAGS += -lgcrypt CFLAGS += -g -Wall -fPIC -O0 -Wstrict-prototypes -pthread -fno-strict-aliasing -default: binaries doc libecc.so +default: binaries doc libseccure.so binaries: seccure-key seccure-encrypt seccure-decrypt seccure-sign \ seccure-verify seccure-signcrypt seccure-veridec seccure-dh \ -OBJS = numtheory.o libecc.o ecc.o serialize.o protocol.o curves.o aes256ctr.o +OBJS = numtheory.o libseccure.o ecc.o serialize.o protocol.o curves.o aes256ctr.o doc: seccure.1 seccure.1.html @@ -33,8 +33,8 @@ seccure-key: seccure.o $(OBJS) $(CC) $(CFLAGS) -o seccure-key $(LDFLAGS) seccure.o $(OBJS) strip seccure-key -libecc.so: $(OBJS) - $(CC) $(CFLAGS) $(LDFLAGS) -shared -Wl -o libecc.so $(OBJS) +libseccure.so: $(OBJS) + $(CC) $(CFLAGS) $(LDFLAGS) -shared -Wl -o libseccure.so $(OBJS) seccure-encrypt: seccure-key ln -f seccure-key seccure-encrypt diff --git a/seccure/libecc.c b/seccure/libseccure.c similarity index 99% rename from seccure/libecc.c rename to seccure/libseccure.c index d369287..4011f86 100644 --- a/seccure/libecc.c +++ b/seccure/libseccure.c @@ -25,7 +25,7 @@ #include "curves.h" #include "ecc.h" -#include "libecc.h" +#include "libseccure.h" #include "protocol.h" #include "serialize.h" #include "aes256ctr.h" diff --git a/seccure/libecc.h b/seccure/libseccure.h similarity index 100% rename from seccure/libecc.h rename to seccure/libseccure.h diff --git a/seccure/seccure.c b/seccure/seccure.c index 9cf329f..263ee3b 100644 --- a/seccure/seccure.c +++ b/seccure/seccure.c @@ -50,7 +50,7 @@ #include "protocol.h" #include "serialize.h" #include "aes256ctr.h" -#include "libecc.h" +#include "libseccure.h" #define ANSI_CLEAR_LINE "\033[1K\r" #define VERSION "0.4" diff --git a/seccure/test/Makefile b/seccure/test/Makefile index bbd99bb..2252d09 100644 --- a/seccure/test/Makefile +++ b/seccure/test/Makefile @@ -9,7 +9,7 @@ SECCURE-VERIDEC = $(SECCURE-PATH)"seccure-veridec" CFLAGS = -g -I../ CFLAGS +=`pkg-config --cflags glib-2.0` -LDFLAGS += -L../ -lecc +LDFLAGS += -L../ -lseccure LDFLAGS += `pkg-config --libs glib-2.0` ENCCURVE = "p128" @@ -17,13 +17,13 @@ SIGCURVE = "p256" MACLEN = "64" -default: encdec-test signveri-test signcrypt-test test_libecc +default: encdec-test signveri-test signcrypt-test test_libseccure -test_libecc: - $(CC) $(CFLAGS) $(LDFLAGS) test_libecc.c -o test_libecc +test_libseccure: + $(CC) $(CFLAGS) $(LDFLAGS) test_libseccure.c -o test_libseccure clean: - rm -f test_libecc public-encryption-key public-signature-key message.enc message.aux message.sig + rm -f test_libseccure public-encryption-key public-signature-key message.enc message.aux message.sig rebuild: clean default diff --git a/seccure/test/test_libecc.c b/seccure/test/test_libseccure.c similarity index 98% rename from seccure/test/test_libecc.c rename to seccure/test/test_libseccure.c index 15b3cf1..7c1b9cf 100644 --- a/seccure/test/test_libecc.c +++ b/seccure/test/test_libseccure.c @@ -24,7 +24,7 @@ #include -#include "libecc.h" +#include "libseccure.h" #define DEFAULT_DATA "This message will be signed\n" #define DEFAULT_SIG "$HPI?t(I*1vAYsl$|%21WXND=6Br*[>k(OR9B!GOwHqL0s+3Uq" @@ -206,8 +206,6 @@ void __test_encrypt() g_assert(result != NULL); g_assert(result->data != NULL); - fprintf(stderr, "DATA %s DATA\n", (char *)(result->data)); - if (result) ecc_free_data(result); } diff --git a/setup.py b/setup.py index c048ed0..7f7de71 100644 --- a/setup.py +++ b/setup.py @@ -3,7 +3,7 @@ from distutils.core import setup, Extension base_modules = [ Extension('_pyecc', [ - 'seccure/libecc.c', + 'seccure/libseccure.c', 'seccure/numtheory.c', 'seccure/ecc.c', 'seccure/serialize.c',