From 7ae0d913d7bbfb286aaa9a5c9984e9bd7eb81df2 Mon Sep 17 00:00:00 2001
From: J08nY
Date: Thu, 16 Feb 2017 21:31:50 +0100
Subject: Optimized invalid curve generation, added optional args to gen_t

- Optimized invalid curve generation
   - Invalid curve generation for secp256r1 now takes around 90minutes
     instead of 5hours as before
- Optimized prime point generation(if only some small prime order
   points are needed -> points_primet)
- Added a_once and b_once that prompt for parameter input and then set
   the input parameter repeatedly
- Added optional args to gen_t functions
- Integer input now ignores whitespace and doesnt errorneously prompt
   stdout when reading from file
- Specified C standard(C11) + feature macros in code.
---
 src/Makefile | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'src/Makefile')

diff --git a/src/Makefile b/src/Makefile
index 397ed22..db5936e 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -8,10 +8,10 @@
 CC=gcc
 GP2C=gp2c
 
-CFLAGS=-O3 -Wall
+CFLAGS=-O3 -Wall -std=c11
 LDFLAGS=-L../lib
 
-GP_CFLAGS=-O3 -Wall -fomit-frame-pointer -fno-strict-aliasing -fPIC
+GP_CFLAGS=-O3 -Wall -std=c11 -fomit-frame-pointer -fno-strict-aliasing -fPIC
 GPFLAGS=-g -i4
 
 INCLUDES=-I. -I../lib -Icm -Iinvalid -Iio -Irandom -Iexhaustive
@@ -26,7 +26,7 @@ GPC = $(addsuffix .c, $(GP))
 GPO = $(addsuffix .o, $(GP))
 GPH = $(addsuffix .h, $(GP))
 
-SRC = $(wildcard *.c) $(wildcard */*.c)
+SRC = ecgen.c $(wildcard */*.c)
 OBJ = $(patsubst %.c,%.o, $(SRC))
 HDR = $(wildcard *.h) $(wildcard */*.h)
 
@@ -36,6 +36,7 @@ all: ecgen
 
 ecgen: ecgen.o $(GPO) $(OBJ)
 	$(CC) $(CFLAGS) $(INCLUDES) -o $@ $^ $(LDFLAGS) $(LIBS)
+	mv ecgen ..
 
 gp2c: $(GPC) $(GPH)
 
@@ -76,4 +77,4 @@ format:
 	clang-format -i $(SRC)
 	clang-format -i $(HDR)
 
-.PHONY: all gp2c clean-all clean clean-gp help format
\ No newline at end of file
+.PHONY: all gp2c clean-all clean clean-gp help format
-- 
cgit v1.3.1