diff options
| author | Niklas Hallqvist <niklas@cvs.openbsd.org> | 2001-01-27 11:24:46 +0000 |
|---|---|---|
| committer | Niklas Hallqvist <niklas@cvs.openbsd.org> | 2001-01-27 11:24:46 +0000 |
| commit | 56d57f2337659de8e0a7b7c22a89120aaacbc1a6 (patch) | |
| tree | a69dbb1c3e616d62656c349990da88f270641521 /sbin/isakmpd/regress/x509 | |
| parent | 35d3367f7e29fc08a3756aadfe63ed55eca709a6 (diff) | |
Cleanup the MP_FLAVOUR situation. Still needs work.
Diffstat (limited to 'sbin/isakmpd/regress/x509')
| -rw-r--r-- | sbin/isakmpd/regress/x509/Makefile | 10 | ||||
| -rw-r--r-- | sbin/isakmpd/regress/x509/x509test.c | 11 |
2 files changed, 13 insertions, 8 deletions
diff --git a/sbin/isakmpd/regress/x509/Makefile b/sbin/isakmpd/regress/x509/Makefile index ea9feffab78..83890f0d3f2 100644 --- a/sbin/isakmpd/regress/x509/Makefile +++ b/sbin/isakmpd/regress/x509/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.10 2000/10/07 07:00:53 niklas Exp $ +# $OpenBSD: Makefile,v 1.11 2001/01/27 11:24:44 niklas Exp $ # $EOM: Makefile,v 1.16 2000/09/28 12:53:27 niklas Exp $ # @@ -51,6 +51,14 @@ CFLAGS+= -I${TOPSRC} -I${TOPSRC}/sysdep/${OS} -I${TOPOBJ} -Wall \ NOMAN= DEBUG= -g +.if ${FEATURES:Mgmp} == "gmp" +CFLAGS+= -DMP_FLAVOUR=MP_FLAVOUR_GMP +LDADD+= -lgmp +DPADD+= ${LIBGMP} +.else +CFLAGS+= -DMP_FLAVOUR=MP_FLAVOUR_OPENSSL +.endif + .include "${TOPSRC}/sysdep/${OS}/Makefile.sysdep" .ifdef HAVE_DLOPEN diff --git a/sbin/isakmpd/regress/x509/x509test.c b/sbin/isakmpd/regress/x509/x509test.c index b14a0591ddf..a377bf87d41 100644 --- a/sbin/isakmpd/regress/x509/x509test.c +++ b/sbin/isakmpd/regress/x509/x509test.c @@ -1,4 +1,4 @@ -/* $OpenBSD: x509test.c,v 1.13 2001/01/26 12:35:47 niklas Exp $ */ +/* $OpenBSD: x509test.c,v 1.14 2001/01/27 11:24:44 niklas Exp $ */ /* $EOM: x509test.c,v 1.9 2000/12/21 15:24:25 ho Exp $ */ /* @@ -59,15 +59,12 @@ #include <netinet/in.h> #include <arpa/inet.h> -#if MP_FLAVOUR == MP_FLAVOUR_GMP -# include <gmp.h> -#endif - #include "conf.h" -#include "libcrypto.h" -#include "log.h" #include "ipsec_num.h" #include "isakmp_fld.h" +#include "libcrypto.h" +#include "log.h" +#include "math_mp.h" #include "x509.h" u_int32_t file_sz; |