summaryrefslogtreecommitdiff
path: root/sbin/isakmpd/regress
diff options
context:
space:
mode:
authorMarkus Friedl <markus@cvs.openbsd.org>2003-08-28 14:43:36 +0000
committerMarkus Friedl <markus@cvs.openbsd.org>2003-08-28 14:43:36 +0000
commitba917f6f40f567ab13d325271ce182f112393681 (patch)
treeff02cd602822369616ed1b6f74392b7265a037d5 /sbin/isakmpd/regress
parentb300592d218ec0e85df79884a4d7d7653ce7e3a9 (diff)
support AES in phase 1, too. switch to OpenSSL EVP interface;
with Hans-Joerg.Hoexer at yerbouti.franken.de; ok ho@
Diffstat (limited to 'sbin/isakmpd/regress')
-rw-r--r--sbin/isakmpd/regress/crypto/Makefile5
-rw-r--r--sbin/isakmpd/regress/crypto/cryptotest.c4
2 files changed, 6 insertions, 3 deletions
diff --git a/sbin/isakmpd/regress/crypto/Makefile b/sbin/isakmpd/regress/crypto/Makefile
index c4f9548984c..48739dbdc67 100644
--- a/sbin/isakmpd/regress/crypto/Makefile
+++ b/sbin/isakmpd/regress/crypto/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.9 2002/03/05 00:11:08 deraadt Exp $
+# $OpenBSD: Makefile,v 1.10 2003/08/28 14:43:35 markus Exp $
# $EOM: Makefile,v 1.7 2000/03/28 21:22:06 ho Exp $
# Test Crypto:
@@ -10,7 +10,8 @@ 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 \
- -DUSE_TRIPLEDES -DUSE_CAST -DUSE_BLOWFISH -DUSE_DES
+ -DUSE_TRIPLEDES -DUSE_CAST -DUSE_BLOWFISH -DUSE_DES \
+ -DUSE_AES
LDADD+= -lcrypto -ldes
DPADD+= ${LIBCRYPTO} ${LIBDES}
NOMAN=
diff --git a/sbin/isakmpd/regress/crypto/cryptotest.c b/sbin/isakmpd/regress/crypto/cryptotest.c
index fbdaeae2a4f..6a9940f84f6 100644
--- a/sbin/isakmpd/regress/crypto/cryptotest.c
+++ b/sbin/isakmpd/regress/crypto/cryptotest.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cryptotest.c,v 1.8 2003/06/03 14:39:50 ho Exp $ */
+/* $OpenBSD: cryptotest.c,v 1.9 2003/08/28 14:43:35 markus Exp $ */
/* $EOM: cryptotest.c,v 1.5 1998/10/07 16:40:49 niklas Exp $ */
/*
@@ -125,6 +125,8 @@ main (void)
test_crypto (CAST_CBC);
+ test_crypto (AES_CBC);
+
special_test_blf ();
return 1;