diff options
| author | Andreas Steffen <andreas.steffen@strongswan.org> | 2007-08-15 08:29:55 +0000 |
|---|---|---|
| committer | Andreas Steffen <andreas.steffen@strongswan.org> | 2007-08-15 08:29:55 +0000 |
| commit | 96cc677c96d61f4682edd62cfe2fb527f9245d25 (patch) | |
| tree | 3ff096c193e94fed623a3253223d2013f02b6ddc /src/scepclient | |
| parent | 683d66fe93aae487efbd7edf58dc5f32863178f1 (diff) | |
| download | strongswan-96cc677c96d61f4682edd62cfe2fb527f9245d25.tar.bz2 strongswan-96cc677c96d61f4682edd62cfe2fb527f9245d25.tar.xz | |
removed oid.txt and oid.pl in pluto subdir
Diffstat (limited to 'src/scepclient')
| -rw-r--r-- | src/scepclient/Makefile.am | 27 | ||||
| -rw-r--r-- | src/scepclient/pkcs10.c | 2 | ||||
| -rw-r--r-- | src/scepclient/scep.c | 2 | ||||
| -rw-r--r-- | src/scepclient/scepclient.c | 2 |
4 files changed, 19 insertions, 14 deletions
diff --git a/src/scepclient/Makefile.am b/src/scepclient/Makefile.am index a4de3bc58..be2280511 100644 --- a/src/scepclient/Makefile.am +++ b/src/scepclient/Makefile.am @@ -1,17 +1,26 @@ ipsec_PROGRAMS = scepclient scepclient_SOURCES = rsakey.c rsakey.h pkcs10.c pkcs10.h scep.c scep.h scepclient.c +PLUTODIR=$(top_srcdir)/src/pluto +OPENACDIR=$(top_srcdir)/src/openac +WHACKDIR=$(top_srcdir)/src/whack +LIBFREESWANDIR=$(top_srcdir)/src/libfreeswan +LIBSTRONGSWANDIR=$(top_srcdir)/src/libstrongswan +LIBCRYPTODIR=$(top_srcdir)/src/libcrypto + INCLUDES = \ --I$(top_srcdir)/src/libfreeswan \ --I$(top_srcdir)/src/pluto \ --I$(top_srcdir)/src/whack \ --I$(top_srcdir)/src/libcrypto +-I$(LIBFREESWANDIR) \ +-I$(LIBSTRONGSWANDIR) \ +-I$(PLUTODIR) \ +-I$(LIBCRYPTODIR) \ +-I$(WHACKDIR) AM_CFLAGS = -DDEBUG -DNO_PLUTO -DIPSEC_CONFDIR=\"${confdir}\" + scepclient_LDADD = asn1.o ca.o crl.o certs.o constants.o defs.o fetch.o id.o \ keys.o lex.o md2.o md5.o mp_defs.o ocsp.o oid.o pem.o pgp.o \ pkcs1.o pkcs7.o rnd.o sha1.o smartcard.o x509.o loglite.o \ - $(top_srcdir)/src/libfreeswan/libfreeswan.a $(top_srcdir)/src/libcrypto/libcrypto.a \ + $(LIBFREESWANDIR)/libfreeswan.a $(LIBCRYPTODIR)/libcrypto.a \ -lgmp # This compile option activates dynamic URL fetching using libcurl @@ -26,10 +35,6 @@ endif dist_man_MANS = scepclient.8 -PLUTODIR=$(top_srcdir)/src/pluto -OPENACDIR=$(top_srcdir)/src/openac - - loglite.o: $(OPENACDIR)/loglite.c $(PLUTODIR)/log.h $(COMPILE) $(INCLUDES) -c -o $@ $< @@ -75,8 +80,8 @@ md5.o : $(PLUTODIR)/md5.c $(PLUTODIR)/md5.h ocsp.o : $(PLUTODIR)/ocsp.c $(PLUTODIR)/ocsp.h $(COMPILE) $(INCLUDES) -c -o $@ $< -oid.o : $(PLUTODIR)/oid.c $(PLUTODIR)/oid.h - $(COMPILE) $(INCLUDES) -c -o $@ $< +oid.o : $(LIBSTRONGSWANDIR)/asn1/oid.c $(LIBSTRONGSWANDIR)/asn1/oid.h + $(COMPILE) -c -o $@ $< pem.o : $(PLUTODIR)/pem.c $(PLUTODIR)/pem.h $(COMPILE) $(INCLUDES) -c -o $@ $< diff --git a/src/scepclient/pkcs10.c b/src/scepclient/pkcs10.c index de3f06e18..86267f508 100644 --- a/src/scepclient/pkcs10.c +++ b/src/scepclient/pkcs10.c @@ -26,10 +26,10 @@ #include <arpa/inet.h> #include <freeswan.h> +#include <asn1/oid.h> #include "../pluto/constants.h" #include "../pluto/defs.h" -#include "../pluto/oid.h" #include "../pluto/asn1.h" #include "../pluto/pkcs1.h" #include "../pluto/log.h" diff --git a/src/scepclient/scep.c b/src/scepclient/scep.c index 577191787..9e05561ed 100644 --- a/src/scepclient/scep.c +++ b/src/scepclient/scep.c @@ -24,6 +24,7 @@ #include <stdlib.h> #include <freeswan.h> +#include <asn1/oid.h> #ifdef LIBCURL #include <curl/curl.h> @@ -32,7 +33,6 @@ #include "../pluto/constants.h" #include "../pluto/defs.h" #include "../pluto/rnd.h" -#include "../pluto/oid.h" #include "../pluto/asn1.h" #include "../pluto/pkcs1.h" #include "../pluto/fetch.h" diff --git a/src/scepclient/scepclient.c b/src/scepclient/scepclient.c index bde460844..f4afe0b8f 100644 --- a/src/scepclient/scepclient.c +++ b/src/scepclient/scepclient.c @@ -35,11 +35,11 @@ #include <gmp.h> #include <freeswan.h> +#include <asn1/oid.h> #include "../pluto/constants.h" #include "../pluto/defs.h" #include "../pluto/log.h" -#include "../pluto/oid.h" #include "../pluto/asn1.h" #include "../pluto/pkcs1.h" #include "../pluto/pkcs7.h" |