summaryrefslogtreecommitdiff
path: root/sbin/isakmpd/regress
diff options
context:
space:
mode:
authorHans-Joerg Hoexer <hshoexer@cvs.openbsd.org>2004-02-25 16:01:30 +0000
committerHans-Joerg Hoexer <hshoexer@cvs.openbsd.org>2004-02-25 16:01:30 +0000
commita7946343fa1ef0c2bc26b1296b175f5aa2b57c78 (patch)
treeb7671b78e0dbbb7511afd2a731adeb3699e818f0 /sbin/isakmpd/regress
parentfc8c3e27036aab4d3021f9c55fa0b1c90b4c1405 (diff)
Add and document configuration options Logverbose and Loglevel. As log.c now
depends on conf.c and some regression tests use log.c, add conf.c to Makefiles where necessary. ok ho@
Diffstat (limited to 'sbin/isakmpd/regress')
-rw-r--r--sbin/isakmpd/regress/b2n/Makefile4
-rw-r--r--sbin/isakmpd/regress/crypto/Makefile4
-rw-r--r--sbin/isakmpd/regress/crypto/cryptotest.c4
-rw-r--r--sbin/isakmpd/regress/dh/Makefile4
-rw-r--r--sbin/isakmpd/regress/ec2n/Makefile4
-rw-r--r--sbin/isakmpd/regress/group/Makefile4
-rw-r--r--sbin/isakmpd/regress/prf/Makefile4
-rw-r--r--sbin/isakmpd/regress/rsakeygen/Makefile4
-rw-r--r--sbin/isakmpd/regress/rsakeygen/rsakeygen.c4
-rw-r--r--sbin/isakmpd/regress/util/Makefile4
10 files changed, 20 insertions, 20 deletions
diff --git a/sbin/isakmpd/regress/b2n/Makefile b/sbin/isakmpd/regress/b2n/Makefile
index 6bdc12fb5dd..57ffb1fd257 100644
--- a/sbin/isakmpd/regress/b2n/Makefile
+++ b/sbin/isakmpd/regress/b2n/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.6 2000/10/13 13:22:01 niklas Exp $
+# $OpenBSD: Makefile,v 1.7 2004/02/25 16:01:29 hshoexer Exp $
# $EOM: Makefile,v 1.12 2000/10/13 13:04:17 ho Exp $
# Test some math
PROG= b2ntest
-SRCS= b2ntest.c log.c math_2n.c sysdep.c util.c
+SRCS= b2ntest.c conf.c log.c math_2n.c sysdep.c util.c
NOMAN=
TOPSRC= ${.CURDIR}/../..
TOPOBJ!= cd ${TOPSRC}; printf "all:\n\t@pwd\n" |${MAKE} -f-
diff --git a/sbin/isakmpd/regress/crypto/Makefile b/sbin/isakmpd/regress/crypto/Makefile
index 48739dbdc67..b2a0ef97f65 100644
--- a/sbin/isakmpd/regress/crypto/Makefile
+++ b/sbin/isakmpd/regress/crypto/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.10 2003/08/28 14:43:35 markus Exp $
+# $OpenBSD: Makefile,v 1.11 2004/02/25 16:01:29 hshoexer Exp $
# $EOM: Makefile,v 1.7 2000/03/28 21:22:06 ho Exp $
# Test Crypto:
PROG= cryptotest
-SRCS= crypto.c cryptotest.c log.c
+SRCS= crypto.c cryptotest.c conf.c log.c sysdep.c util.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/crypto/cryptotest.c b/sbin/isakmpd/regress/crypto/cryptotest.c
index ee63702b8c4..68573731efb 100644
--- a/sbin/isakmpd/regress/crypto/cryptotest.c
+++ b/sbin/isakmpd/regress/crypto/cryptotest.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cryptotest.c,v 1.11 2003/09/24 11:12:31 markus Exp $ */
+/* $OpenBSD: cryptotest.c,v 1.12 2004/02/25 16:01:29 hshoexer Exp $ */
/* $EOM: cryptotest.c,v 1.5 1998/10/07 16:40:49 niklas Exp $ */
/*
@@ -58,7 +58,7 @@ verify_buf (u_int8_t *buf, u_int16_t len)
#define hexchar2bin(x) ((nibble2bin((x)[0]) << 4) + nibble2bin((x)[1]))
#define nibble2c(x) ((x) >= 10 ? ('a'-10+(x)) : ('0' + (x)))
-void asc2bin (u_int8_t *bin, u_int8_t *asc, u_int16_t len)
+static void asc2bin (u_int8_t *bin, u_int8_t *asc, u_int16_t len)
{
int i;
diff --git a/sbin/isakmpd/regress/dh/Makefile b/sbin/isakmpd/regress/dh/Makefile
index 3416377d463..e7f8d798364 100644
--- a/sbin/isakmpd/regress/dh/Makefile
+++ b/sbin/isakmpd/regress/dh/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.7 2001/01/27 11:24:41 niklas Exp $
+# $OpenBSD: Makefile,v 1.8 2004/02/25 16:01:29 hshoexer Exp $
# $EOM: Makefile,v 1.10 2000/04/07 20:19:43 niklas Exp $
# Test DH:
PROG= dhtest
SRCS= math_2n.c math_ec2n.c math_group.c dh.c dhtest.c log.c util.c \
- sysdep.c gmp_util.c
+ sysdep.c gmp_util.c conf.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/ec2n/Makefile b/sbin/isakmpd/regress/ec2n/Makefile
index b21842abb1d..827ecbe7b96 100644
--- a/sbin/isakmpd/regress/ec2n/Makefile
+++ b/sbin/isakmpd/regress/ec2n/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.6 2000/10/13 13:22:01 niklas Exp $
+# $OpenBSD: Makefile,v 1.7 2004/02/25 16:01:29 hshoexer Exp $
# $EOM: Makefile,v 1.9 2000/10/13 13:04:17 ho Exp $
# Test EC2N:
PROG= ec2ntest
-SRCS= math_2n.c math_ec2n.c ec2ntest.c log.c sysdep.c util.c
+SRCS= math_2n.c math_ec2n.c ec2ntest.c log.c sysdep.c util.c conf.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/group/Makefile b/sbin/isakmpd/regress/group/Makefile
index e15fef033f7..9dc9982d8cd 100644
--- a/sbin/isakmpd/regress/group/Makefile
+++ b/sbin/isakmpd/regress/group/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.7 2001/01/27 11:24:42 niklas Exp $
+# $OpenBSD: Makefile,v 1.8 2004/02/25 16:01:29 hshoexer Exp $
# $EOM: Makefile,v 1.12 2000/04/07 20:19:43 niklas Exp $
# Test Group:
PROG= grouptest
SRCS= math_2n.c math_ec2n.c math_group.c grouptest.c log.c util.c \
- sysdep.c gmp_util.c
+ sysdep.c gmp_util.c conf.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/prf/Makefile b/sbin/isakmpd/regress/prf/Makefile
index 84786d54721..5d9b1faa200 100644
--- a/sbin/isakmpd/regress/prf/Makefile
+++ b/sbin/isakmpd/regress/prf/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.6 2000/04/07 22:06:11 niklas Exp $
+# $OpenBSD: Makefile,v 1.7 2004/02/25 16:01:29 hshoexer Exp $
# $EOM: Makefile,v 1.6 2000/03/28 21:22:07 ho Exp $
# Test PRF:
PROG= prftest
-SRCS= prf.c hash.c log.c prftest.c
+SRCS= prf.c hash.c log.c prftest.c conf.c sysdep.c util.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 0fb9120dc7b..578a7b57d61 100644
--- a/sbin/isakmpd/regress/rsakeygen/Makefile
+++ b/sbin/isakmpd/regress/rsakeygen/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.14 2003/06/03 14:39:51 ho Exp $
+# $OpenBSD: Makefile,v 1.15 2004/02/25 16:01:29 hshoexer Exp $
# $EOM: Makefile,v 1.10 2000/03/28 21:23:24 ho Exp $
#
@@ -33,7 +33,7 @@
# RSA Key Generation
PROG= rsakeygen
-SRCS= libcrypto.c log.c rsakeygen.c sysdep.c util.c
+SRCS= libcrypto.c log.c rsakeygen.c sysdep.c util.c conf.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/rsakeygen.c b/sbin/isakmpd/regress/rsakeygen/rsakeygen.c
index 763797ba86f..00864078222 100644
--- a/sbin/isakmpd/regress/rsakeygen/rsakeygen.c
+++ b/sbin/isakmpd/regress/rsakeygen/rsakeygen.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rsakeygen.c,v 1.17 2003/06/03 14:39:51 ho Exp $ */
+/* $OpenBSD: rsakeygen.c,v 1.18 2004/02/25 16:01:29 hshoexer Exp $ */
/* $EOM: rsakeygen.c,v 1.10 2000/12/21 15:18:53 ho Exp $ */
/*
@@ -47,7 +47,7 @@
#define TEST_STRING "!Dies ist ein Test"
-void asc2bin (u_int8_t *bin, u_int8_t *asc, u_int16_t len)
+static void asc2bin (u_int8_t *bin, u_int8_t *asc, u_int16_t len)
{
int i;
diff --git a/sbin/isakmpd/regress/util/Makefile b/sbin/isakmpd/regress/util/Makefile
index ff2a19f6243..88c0785d860 100644
--- a/sbin/isakmpd/regress/util/Makefile
+++ b/sbin/isakmpd/regress/util/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.1 2001/07/01 19:25:11 niklas Exp $
+# $OpenBSD: Makefile,v 1.2 2004/02/25 16:01:29 hshoexer Exp $
# Test some utility functions
PROG= utiltest
-SRCS= log.c sysdep.c util.c utiltest.c
+SRCS= log.c sysdep.c util.c utiltest.c conf.c
TOPSRC= ${.CURDIR}/../..
TOPOBJ!= cd ${TOPSRC}; printf "all:\n\t@pwd\n" |${MAKE} -f-
OS!= awk '/^OS=/ { print $$2 }' ${.CURDIR}/../../Makefile
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-15 00:56:34 +0000