summaryrefslogtreecommitdiff
path: root/sbin/isakmpd/regress
diff options
context:
space:
mode:
authorNiklas Hallqvist <niklas@cvs.openbsd.org>2000-02-25 17:23:43 +0000
committerNiklas Hallqvist <niklas@cvs.openbsd.org>2000-02-25 17:23:43 +0000
commit21910ef24718f8005826a8363b6fa6aea6cca145 (patch)
tree54ded622fa65f31f93fbcbd04d876345c6a13682 /sbin/isakmpd/regress
parent47167191f09ba0d3c55764f63f6be1d9bcb1aa4b (diff)
regress/crypto/Makefile: Merge with EOM 1.5
regress/dh/Makefile: Merge with EOM 1.7 regress/group/Makefile: Merge with EOM 1.9 regress/prf/Makefile: Merge with EOM 1.4 regress/rsakeygen/Makefile: Merge with EOM 1.8 regress/x509/Makefile: Merge with EOM 1.10 Makefile: Merge with EOM 1.62 attribute.c: Merge with EOM 1.10 sa.c: Merge with EOM 1.99 conf.c: Merge with EOM 1.20 crypto.c: Merge with EOM 1.28 isakmpd.c: Merge with EOM 1.45 connection.c: Merge with EOM 1.19 doi.h: Merge with EOM 1.28 field.c: Merge with EOM 1.11 exchange.c: Merge with EOM 1.116 ike_auth.c: Merge with EOM 1.44 pf_key_v2.c: Merge with EOM 1.37 ike_phase_1.c: Merge with EOM 1.22 ipsec.c: Merge with EOM 1.118 isakmp_doi.c: Merge with EOM 1.40 log.c: Merge with EOM 1.26 log.h: Merge with EOM 1.18 math_group.c: Merge with EOM 1.23 message.c: Merge with EOM 1.144 pf_encap.c: Merge with EOM 1.70 policy.c: Merge with EOM 1.18 timer.c: Merge with EOM 1.13 transport.c: Merge with EOM 1.41 udp.c: Merge with EOM 1.47 ui.c: Merge with EOM 1.37 x509.c: Merge with EOM 1.36 author: niklas Made debug logging a compile time selectable feature
Diffstat (limited to 'sbin/isakmpd/regress')
-rw-r--r--sbin/isakmpd/regress/crypto/Makefile9
-rw-r--r--sbin/isakmpd/regress/dh/Makefile11
-rw-r--r--sbin/isakmpd/regress/group/Makefile11
-rw-r--r--sbin/isakmpd/regress/prf/Makefile6
-rw-r--r--sbin/isakmpd/regress/rsakeygen/Makefile7
-rw-r--r--sbin/isakmpd/regress/x509/Makefile9
6 files changed, 29 insertions, 24 deletions
diff --git a/sbin/isakmpd/regress/crypto/Makefile b/sbin/isakmpd/regress/crypto/Makefile
index c4bb1070727..063d4cf182e 100644
--- a/sbin/isakmpd/regress/crypto/Makefile
+++ b/sbin/isakmpd/regress/crypto/Makefile
@@ -1,15 +1,16 @@
-# $OpenBSD: Makefile,v 1.4 1999/02/26 03:27:01 niklas Exp $
-# $EOM: Makefile,v 1.4 1999/02/25 15:14:23 niklas Exp $
+# $OpenBSD: Makefile,v 1.5 2000/02/25 17:23:35 niklas Exp $
+# $EOM: Makefile,v 1.5 2000/02/20 19:58:43 niklas Exp $
# Test Crypto:
PROG= cryptotest
-SRCS= log.c crypto.c cryptotest.c
+SRCS= crypto.c cryptotest.c log.c
TOPSRC= ${.CURDIR}/../..
TOPOBJ!= cd ${TOPSRC}; printf "all:\n\t@pwd\n" |${MAKE} -f-
OS!= awk '/^OS=/ { print $$2 }' ${.CURDIR}/../../Makefile
.PATH: ${TOPSRC} ${TOPSRC}/sysdep/${OS} ${TOPOBJ}
-CFLAGS+= -I${TOPSRC} -I${TOPSRC}/sysdep/${OS} -I${TOPOBJ} -Wall
+CFLAGS+= -I${TOPSRC} -I${TOPSRC}/sysdep/${OS} -I${TOPOBJ} -Wall \
+ -DUSE_TRIPLEDES -DUSE_CAST -DUSE_BLOWFISH
LDADD+= -ldes
DPADD+= ${LIBDES}
NOMAN=
diff --git a/sbin/isakmpd/regress/dh/Makefile b/sbin/isakmpd/regress/dh/Makefile
index 54f1d92b819..c5cb7f49f94 100644
--- a/sbin/isakmpd/regress/dh/Makefile
+++ b/sbin/isakmpd/regress/dh/Makefile
@@ -1,16 +1,17 @@
-# $OpenBSD: Makefile,v 1.4 1999/02/26 03:27:14 niklas Exp $
-# $EOM: Makefile,v 1.6 1999/02/25 15:10:06 niklas Exp $
+# $OpenBSD: Makefile,v 1.5 2000/02/25 17:23:36 niklas Exp $
+# $EOM: Makefile,v 1.7 2000/02/20 19:58:43 niklas Exp $
# Test DH:
PROG= dhtest
-SRCS= math_2n.c math_ec2n.c math_group.c dh.c dhtest.c util.c \
- log.c sysdep.c gmp_util.c
+SRCS= math_2n.c math_ec2n.c math_group.c dh.c dhtest.c log.c util.c \
+ sysdep.c gmp_util.c
TOPSRC= ${.CURDIR}/../..
TOPOBJ!= cd ${TOPSRC}; printf "all:\n\t@pwd\n" |${MAKE} -f-
OS!= awk '/^OS=/ { print $$2 }' ${.CURDIR}/../../Makefile
.PATH: ${TOPSRC} ${TOPSRC}/sysdep/${OS} ${TOPOBJ}
-CFLAGS+= -I${TOPSRC} -I${TOPSRC}/sysdep/${OS} -I${TOPOBJ} -Wall
+CFLAGS+= -I${TOPSRC} -I${TOPSRC}/sysdep/${OS} -I${TOPOBJ} -Wall \
+ -DUSE_EC
NOMAN=
LDADD+= -lgmp
DPADD+= ${LIBGMP}
diff --git a/sbin/isakmpd/regress/group/Makefile b/sbin/isakmpd/regress/group/Makefile
index b2fd5aa5b3c..cef9e41609c 100644
--- a/sbin/isakmpd/regress/group/Makefile
+++ b/sbin/isakmpd/regress/group/Makefile
@@ -1,16 +1,17 @@
-# $OpenBSD: Makefile,v 1.4 1999/02/26 03:28:18 niklas Exp $
-# $EOM: Makefile,v 1.8 1999/02/25 15:10:10 niklas Exp $
+# $OpenBSD: Makefile,v 1.5 2000/02/25 17:23:36 niklas Exp $
+# $EOM: Makefile,v 1.9 2000/02/20 19:58:43 niklas Exp $
# Test Group:
PROG= grouptest
-SRCS= math_2n.c math_ec2n.c math_group.c grouptest.c util.c \
- log.c sysdep.c gmp_util.c
+SRCS= math_2n.c math_ec2n.c math_group.c grouptest.c log.c util.c \
+ sysdep.c gmp_util.c
TOPSRC= ${.CURDIR}/../..
TOPOBJ!= cd ${TOPSRC}; printf "all:\n\t@pwd\n" |${MAKE} -f-
OS!= awk '/^OS=/ { print $$2 }' ${.CURDIR}/../../Makefile
.PATH: ${TOPSRC} ${TOPSRC}/sysdep/${OS} ${TOPOBJ}
-CFLAGS+= -I${TOPSRC} -I${TOPSRC}/sysdep/${OS} -I${TOPOBJ} -Wall
+CFLAGS+= -I${TOPSRC} -I${TOPSRC}/sysdep/${OS} -I${TOPOBJ} -Wall \
+ -DUSE_EC
NOMAN=
LDADD+= -lgmp
DPADD+= ${LIBGMP}
diff --git a/sbin/isakmpd/regress/prf/Makefile b/sbin/isakmpd/regress/prf/Makefile
index 51babd5e16d..10ada67e866 100644
--- a/sbin/isakmpd/regress/prf/Makefile
+++ b/sbin/isakmpd/regress/prf/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.4 1999/02/26 03:28:41 niklas Exp $
-# $EOM: Makefile,v 1.3 1999/02/25 15:14:25 niklas Exp $
+# $OpenBSD: Makefile,v 1.5 2000/02/25 17:23:36 niklas Exp $
+# $EOM: Makefile,v 1.4 2000/02/20 19:58:44 niklas Exp $
# Test PRF:
PROG= prftest
-SRCS= log.c prf.c hash.c prftest.c
+SRCS= prf.c hash.c log.c prftest.c
TOPSRC= ${.CURDIR}/../..
TOPOBJ!= cd ${TOPSRC}; printf "all:\n\t@pwd\n" |${MAKE} -f-
OS!= awk '/^OS=/ { print $$2 }' ${.CURDIR}/../../Makefile
diff --git a/sbin/isakmpd/regress/rsakeygen/Makefile b/sbin/isakmpd/regress/rsakeygen/Makefile
index 7a563501460..9f2c1a45658 100644
--- a/sbin/isakmpd/regress/rsakeygen/Makefile
+++ b/sbin/isakmpd/regress/rsakeygen/Makefile
@@ -1,5 +1,5 @@
-# $OpenBSD: Makefile,v 1.8 1999/08/26 22:28:24 niklas Exp $
-# $EOM: Makefile,v 1.7 1999/08/13 15:13:04 ho Exp $
+# $OpenBSD: Makefile,v 1.9 2000/02/25 17:23:36 niklas Exp $
+# $EOM: Makefile,v 1.8 2000/02/20 19:58:44 niklas Exp $
#
# Copyright (c) 1999 Niels Provos. All rights reserved.
@@ -43,7 +43,8 @@ TOPSRC= ${.CURDIR}/../..
TOPOBJ!= cd ${TOPSRC}; printf "all:\n\t@pwd\n" |${MAKE} -f-
OS!= awk '/^OS=/ { print $$2 }' ${.CURDIR}/../../Makefile
.PATH: ${TOPSRC} ${TOPSRC}/sysdep/${OS} ${TOPOBJ}
-CFLAGS+= -I${TOPSRC} -I${TOPSRC}/sysdep/${OS} -I${TOPOBJ} -Wall
+CFLAGS+= -I${TOPSRC} -I${TOPSRC}/sysdep/${OS} -I${TOPOBJ} -Wall \
+ -DUSE_DEBUG
NOMAN=
DEBUG= -g
diff --git a/sbin/isakmpd/regress/x509/Makefile b/sbin/isakmpd/regress/x509/Makefile
index fb9805bc484..be6c21a976c 100644
--- a/sbin/isakmpd/regress/x509/Makefile
+++ b/sbin/isakmpd/regress/x509/Makefile
@@ -1,5 +1,5 @@
-# $OpenBSD: Makefile,v 1.7 1999/08/26 22:31:53 niklas Exp $
-# $EOM: Makefile,v 1.9 1999/08/26 11:31:35 niklas Exp $
+# $OpenBSD: Makefile,v 1.8 2000/02/25 17:23:37 niklas Exp $
+# $EOM: Makefile,v 1.10 2000/02/20 19:58:44 niklas Exp $
#
# Copyright (c) 1999 Niels Provos. All rights reserved.
@@ -38,13 +38,14 @@
# Test X509
PROG= x509test
-SRCS= x509test.c conf.c libcrypto.c log.c sysdep.c field.c util.c \
+SRCS= x509test.c conf.c log.c libcrypto.c sysdep.c field.c util.c \
isakmp_fld.c ipsec_fld.c ipsec_num.c isakmp_num.c constants.c
TOPSRC= ${.CURDIR}/../..
TOPOBJ!= cd ${TOPSRC}; printf "all:\n\t@pwd\n" |${MAKE} -f-
OS!= awk '/^OS=/ { print $$2 }' ${.CURDIR}/../../Makefile
.PATH: ${TOPSRC} ${TOPSRC}/sysdep/${OS} ${TOPOBJ}
-CFLAGS+= -I${TOPSRC} -I${TOPSRC}/sysdep/${OS} -I${TOPOBJ} -Wall
+CFLAGS+= -I${TOPSRC} -I${TOPSRC}/sysdep/${OS} -I${TOPOBJ} -Wall \
+ -DUSE_X509
NOMAN=
DEBUG= -g