APG v2.1.0

Makefile

@@ -1,23 +1,41 @@
+##################################################################
 # You can modify CC variable if you have compiler other than GCC
 # But the code was designed and tested with GCC
 CC = gcc
 
-# compilation flags
+##################################################################
+# Compilation flags
 # You should comment the line below for AIX+native cc
 FLAGS = -Wall
 
-# libraries
+##################################################################
+# Libraries
+#
+# You should comment the line below for OpenBSD 2.8 and above
 LIBS = -lcrypt
 LIBM = -lm
 # Use lines below for cygwin
 # LIBS = 
 # LIBM =
 
+##################################################################
+# Support for crypted passwords
+#
 # DO NOT EDIT THE LINE BELOW !!!
 CRYPTED_PASS = APG_DONOTUSE_CRYPT
 # Coment this if you do not want to use crypted passwords output
 CRYPTED_PASS = APG_USE_CRYPT
 
+##################################################################
+# Support for ANSI X9.17/SHA1 PRNG
+#
+# DO NOT EDIT THE LINE BELOW !!!
+USE_SHA = APG_USE_SHA
+# Coment this if you want to use PRNG X9.17 with SHA-1
+USE_SHA = APG_DONOTUSE_SHA
+
+##################################################################
+# Directories
 # Install dirs
 INSTALL_PREFIX = /usr/local
 APG_BIN_DIR = /bin
@@ -25,30 +43,40 @@ APG_MAN_DIR = /man/man1
 APGD_BIN_DIR = /sbin
 APGD_MAN_DIR = /man/man8
 
-# Find group ID for user root
-FIND_GROUP = `grep '^root:' /etc/passwd | awk -F: '{ print $$4 }'`
-
 ####################################################################
 # If you plan to install APG daemon you should look at lines below #
 ####################################################################
 
+####################################################################
+# FreeBSD
+#
 # Uncoment NOTHING for FreeBSD
 #
 
+####################################################################
+# Linux
+#
 # Uncoment line below for LINUX
 #CS_LIBS = -lnsl
 
+####################################################################
+# Solaris
+#
 # Uncoment line below for Solaris
 #CS_LIBS = -lnsl -lsocket
 
 # ====== YOU DO NOT NEED TO MODIFY ANYTHING BELOW THIS LINE ======
+# Find group ID for user root
+FIND_GROUP = `grep '^root:' /etc/passwd | awk -F: '{ print $$4 }'`
 
 PROGNAME = apg
 CS_PROGNAME = apgd
 BFM_PROGNAME = apgbfm
-BFM_SOURCES = apgbfm.c bloom.c md5/md5.c errors.c
-SOURCES = bloom.c md5/md5.c rnd.c ./cast/cast.c pronpass.c randpass.c restrict.c errors.c apg.c
-HEADERS = owntypes.h pronpass.h randpass.h restrict.h errs.h rnd.h ./cast/cast.h ./cast/cast_sboxes.h
+BFM_SOURCES = apgbfm.c bloom.c sha/sha.c errors.c getopt.c
+SOURCES = bloom.c ./sha/sha.c ./cast/cast.c rnd.c pronpass.c \
+randpass.c restrict.c errors.c apg.c getopt.c
+HEADERS = owntypes.h pronpass.h randpass.h restrict.h errs.h rnd.h \
+./cast/cast.h ./cast/cast_sboxes.h getopt.h
 OBJECTS = rnd.o ./cast/cast.o pronpass.o randpass.o restrict.o apg.o errors.o
 
 all: cliserv standalone
@@ -60,13 +88,13 @@ standalone: apg apgbfm
 cygwin: standalone
 
 apg:
-	${CC} ${FLAGS} ${LIBS} ${LIBM} -D${CRYPTED_PASS} -o ${PROGNAME} ${SOURCES}
+	${CC} ${FLAGS} -D${CRYPTED_PASS} -D${USE_SHA} -o ${PROGNAME} ${SOURCES} ${LIBS} ${LIBM}
 
 apgd:
-	${CC} ${FLAGS} ${CS_LIBS} ${LIBM} -DCLISERV -o ${CS_PROGNAME} ${SOURCES}
+	${CC} ${FLAGS} -DCLISERV -D${USE_SHA} -o ${CS_PROGNAME} ${SOURCES} ${CS_LIBS} ${LIBM}
 
 apgbfm:
-	${CC} ${FLAGS} ${LIBM} -o ${BFM_PROGNAME} ${BFM_SOURCES}
+	${CC} ${FLAGS} -o ${BFM_PROGNAME} ${BFM_SOURCES} ${LIBM}
 
 strip:
 	strip ${PROGNAME}