Menu
▾
▴
[Ipsec-tools-commits] ipsec-tools/src/racoon Makefile.am,NONE,1.1.2.1 crypto_openssl.c,1.32,1.32.2.1 isakmp.c,1.18,1.18.2.1 main.c,1.11,1.11.2.1 sockmisc.c,1.14,1.14.2.1 Makefile.in,1.25,NONE aclocal.m4,1.3,NONE client-puzzle.c,1.3,NONE config.guess,1.2,NONE config.sub,1.2,NONE configure.in,1.33,NONE install-sh,1.1.1.1,NONE
|
From: Michal L. <lu...@us...> - 2004-09-17 20:35:25
|
Update of /cvsroot/ipsec-tools/ipsec-tools/src/racoon In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16844/src/racoon Modified Files: Tag: autoconf crypto_openssl.c isakmp.c main.c sockmisc.c Added Files: Tag: autoconf Makefile.am Removed Files: Tag: autoconf Makefile.in aclocal.m4 client-puzzle.c config.guess config.sub configure.in install-sh Log Message: 2004-09-17 Michal Ludvig <ml...@su...> * configure.ac, Makefile.am, bootstrap: Autoconfigure the wole tree at once. * src/racoon/Makefile.am: New file. * src/racoon/client-puzzle.c, src/racoon/config.guess, src/racoon/config.sub, src/racoon/configure.in, src/racoon/install-sh, src/racoon/Makefile.in, src/racoon/aclocal.m4: Removed. * src/racoon/isakmp.c, src/racoon/sockmisc.c: Renamed ADVAPI to INET6_ADVAPI. * src/racoon/main.c: Cleanup. * src/racoon/doc/SantaBarbara-result.jp, src/racoon/doc/helsinki-result.jp, src/racoon/doc/ibm-result.jp, src/racoon/doc/pattern, src/racoon/doc/question, src/racoon/doc/racoonquestion.sh, src/racoon/doc/redmond.txt, src/racoon/doc/rules.jp, src/racoon/doc/sandiego-result.en, src/racoon/doc/sandiego-result.jp, src/racoon/doc/sandiego0009-result.en, src/racoon/samples/Makefile, src/racoon/samples/sandiego.pl: Removed. --- configure.in DELETED --- --- Makefile.in DELETED --- Index: isakmp.c =================================================================== RCS file: /cvsroot/ipsec-tools/ipsec-tools/src/racoon/isakmp.c,v retrieving revision 1.18 retrieving revision 1.18.2.1 diff -u -d -r1.18 -r1.18.2.1 --- isakmp.c 17 Sep 2004 17:59:34 -0000 1.18 +++ isakmp.c 17 Sep 2004 20:35:14 -0000 1.18.2.1 @@ -1472,7 +1472,7 @@ break; #ifdef INET6 case AF_INET6: -#ifdef ADVAPI +#ifdef INET6_ADVAPI #ifdef IPV6_RECVPKTINFO pktinfo = IPV6_RECVPKTINFO; #else /* old adv. API */ --- config.guess DELETED --- --- config.sub DELETED --- Index: crypto_openssl.c =================================================================== RCS file: /cvsroot/ipsec-tools/ipsec-tools/src/racoon/crypto_openssl.c,v retrieving revision 1.32 retrieving revision 1.32.2.1 diff -u -d -r1.32 -r1.32.2.1 --- crypto_openssl.c 17 Sep 2004 17:59:34 -0000 1.32 +++ crypto_openssl.c 17 Sep 2004 20:35:14 -0000 1.32.2.1 @@ -75,13 +75,7 @@ #ifdef HAVE_OPENSSL_ENGINE_H #include <openssl/engine.h> #endif -#ifdef HAVE_OPENSSL_IDEA_H -#include <openssl/idea.h> -#endif #include <openssl/blowfish.h> -#ifdef HAVE_OPENSSL_RC5_H -#include <openssl/rc5.h> -#endif #include <openssl/cast.h> #include <openssl/err.h> #if defined(HAVE_OPENSSL_AES_H) @@ -1202,41 +1196,6 @@ return evp_keylen(len, EVP_des_cbc()); } -#ifdef HAVE_OPENSSL_IDEA_H -/* - * IDEA-CBC - */ -vchar_t * -eay_idea_encrypt(data, key, iv) - vchar_t *data, *key, *iv; -{ - return evp_crypt(data, key, iv, EVP_idea_cbc(), 1); -} - -vchar_t * -eay_idea_decrypt(data, key, iv) - vchar_t *data, *key, *iv; -{ - return evp_crypt(data, key, iv, EVP_idea_cbc(), 0); -} - -int -eay_idea_weakkey(key) - vchar_t *key; -{ - return 0; -} - -int -eay_idea_keylen(len) - int len; -{ - if (len != 0 && len != 128) - return -1; - return 128; -} -#endif - /* * BLOWFISH-CBC */ @@ -1272,43 +1231,6 @@ return len; } -#ifdef HAVE_OPENSSL_RC5_H -/* - * RC5-CBC - */ -vchar_t * -eay_rc5_encrypt(data, key, iv) - vchar_t *data, *key, *iv; -{ - return evp_crypt(data, key, iv, EVP_rc5_32_12_16_cbc(), 1); -} - -vchar_t * -eay_rc5_decrypt(data, key, iv) - vchar_t *data, *key, *iv; -{ - return evp_crypt(data, key, iv, EVP_rc5_32_12_16_cbc(), 0); -} - -int -eay_rc5_weakkey(key) - vchar_t *key; -{ - return 0; /* No known weak keys when used with 16 rounds. */ -} - -int -eay_rc5_keylen(len) - int len; -{ - if (len == 0) - return 128; - if (len < 40 || len > 2040) - return -1; - return len; -} -#endif - /* * 3DES-CBC */ --- client-puzzle.c DELETED --- Index: sockmisc.c =================================================================== RCS file: /cvsroot/ipsec-tools/ipsec-tools/src/racoon/sockmisc.c,v retrieving revision 1.14 retrieving revision 1.14.2.1 diff -u -d -r1.14 -r1.14.2.1 --- sockmisc.c 15 Sep 2004 16:54:52 -0000 1.14 +++ sockmisc.c 17 Sep 2004 20:35:15 -0000 1.14.2.1 @@ -323,9 +323,9 @@ struct cmsghdr *cm; struct iovec iov[2]; u_char cmsgbuf[256]; -#if defined(INET6) && defined(ADVAPI) +#if defined(INET6) && defined(INET6_ADVAPI) struct in6_pktinfo *pi; -#endif /*ADVAPI*/ +#endif /*INET6_ADVAPI*/ struct sockaddr_in *sin; #ifdef INET6 struct sockaddr_in6 *sin6; @@ -364,7 +364,7 @@ plog(LLV_ERROR, LOCATION, NULL, "cmsg %d %d\n", cm->cmsg_level, cm->cmsg_type);) #endif -#if defined(INET6) && defined(ADVAPI) +#if defined(INET6) && defined(INET6_ADVAPI) if (ss.ss_family == AF_INET6 && cm->cmsg_level == IPPROTO_IPV6 && cm->cmsg_type == IPV6_PKTINFO @@ -488,7 +488,7 @@ } switch (src->sa_family) { -#if defined(INET6) && defined(ADVAPI) +#if defined(INET6) && defined(INET6_ADVAPI) // XXX: This block wasn't compiled on Linux - does it work? case AF_INET6: { --- aclocal.m4 DELETED --- --- install-sh DELETED --- Index: main.c =================================================================== RCS file: /cvsroot/ipsec-tools/ipsec-tools/src/racoon/main.c,v retrieving revision 1.11 retrieving revision 1.11.2.1 diff -u -d -r1.11 -r1.11.2.1 --- main.c 17 Sep 2004 17:59:34 -0000 1.11 +++ main.c 17 Sep 2004 20:35:15 -0000 1.11.2.1 @@ -83,13 +83,7 @@ #ifdef TOP_PACKAGE static char version[] = "@(#)" TOP_PACKAGE_STRING " (" TOP_PACKAGE_URL ")"; #else /* TOP_PACKAGE */ -#define RACOON_VERSION "20001216 sa...@ka..." -#ifdef RACOON_PKG_VERSION -static char version0[] = "@(#)package version " RACOON_PKG_VERSION ; -static char version[] = "@(#)internal version " RACOON_VERSION ; -#else -static char version[] = "@(#)racoon 20001216 " RACOON_VERSION ; -#endif +static char version[] = "@(#) racoon / IPsec-tools"; #endif /* TOP_PACKAGE */ static pid_t racoon_pid = 0; @@ -177,9 +171,6 @@ ploginit(); -#ifdef RACOON_PKG_VERSION - plog(LLV_INFO, LOCATION, NULL, "%s\n", version0); -#endif plog(LLV_INFO, LOCATION, NULL, "%s\n", version); plog(LLV_INFO, LOCATION, NULL, "@(#)" "This product linked %s (http://www.openssl.org/)" --- NEW FILE: Makefile.am --- # $Id: Makefile.am,v 1.1.2.1 2004/09/17 20:35:13 ludvigm Exp $ sbin_PROGRAMS = racoon racoonctl plainrsa-gen noinst_PROGRAMS = eaytest INCLUDES = -I${srcdir}/../libipsec AM_CFLAGS = @GLIBC_BUGS@ -DSYSCONFDIR=\"${sysconfdir}\" AM_LDFLAGS = -lcrypto racoon_SOURCES = \ main.c session.c isakmp.c handler.c \ isakmp_ident.c isakmp_agg.c isakmp_base.c \ isakmp_quick.c isakmp_inf.c isakmp_newg.c \ gssapi.c dnssec.c getcertsbyname.c \ pfkey.c admin.c ipsec_doi.c oakley.c grabmyaddr.c vendorid.c \ policy.c localconf.c remoteconf.c crypto_openssl.c algorithm.c \ proposal.c sainfo.c strnames.c \ vmbuf.c plog.c logger.c schedule.c str2val.c misc.c sockmisc.c \ safefile.c backupsa.c cfparse.c cftoken.c nattraversal.c \ prsa_tok.c prsa_par.c genlist.c rsalist.c racoon_LDFLAGS = ../libipsec/libipsec.la racoonctl_SOURCES = kmpstat.c vmbuf.c str2val.c racoonctl_LDFLAGS = ../libipsec/libipsec.la racoonctl_LDADD = misc_noplog.o plainrsa_gen_SOURCES = plainrsa-gen.c plog.c vmbuf.c \ crypto_openssl.c logger.c misc.c eaytest_SOURCES = eaytest.c vmbuf.c str2val.c plog.c logger.c eaytest_LDADD = crypto_openssl_test.o misc_noplog.o man5_MANS = racoon.conf.5 man8_MANS = racoon.8 plainrsa-gen.8 EXTRA_DIST= cftoken.l cfparse.y prsa_tok.l prsa_par.y \ doc/FAQ doc/README.certificate doc/README.gssapi \ contrib/sp.pl stats.pl \ samples/Makefile samples/psk.txt.sample samples/racoon.conf.sample \ samples/psk.txt.in samples/racoon.conf.in \ samples/racoon.conf.sample-gssapi samples/racoon.conf.sample-natt \ samples/racoon.conf.sample-inherit samples/racoon.conf.sample-plainrsa \ samples/racoon.conf.sample-cvpn # Config file parser cftoken.o: cftoken.c cfparse.h $(COMPILE) -c -o $@ $< cfparse.o: cfparse.c $(COMPILE) -c -o $@ $< cftoken.c: cftoken.l $(LEX) -ocftoken.c cftoken.l cfparse.h cfparse.c: cfparse.y $(YACC) -d cfparse.y mv y.tab.c cfparse.c mv y.tab.h cfparse.h # Plain-RSA parser prsa_tok.o: prsa_tok.c prsa_par.h $(COMPILE) -c -o $@ $< prsa_par.o: prsa_par.c $(COMPILE) -c -o $@ $< prsa_tok.c: prsa_tok.l $(LEX) -Pprsa -oprsa_tok.c prsa_tok.l prsa_par.h prsa_par.c: prsa_par.y $(YACC) -pprsa -d prsa_par.y mv y.tab.c prsa_par.c mv y.tab.h prsa_par.h # special object rules crypto_openssl_test.o: crypto_openssl.c $(COMPILE) -DEAYDEBUG -o crypto_openssl_test.o -c $(srcdir)/crypto_openssl.c misc_noplog.o: misc.c $(COMPILE) -DNOUSE_PLOG -o misc_noplog.o -c $(srcdir)/misc.c # missing/*.c strdup.o: $(srcdir)/missing/strdup.c $(COMPILE) -c $(srcdir)/missing/$*.c getaddrinfo.o: $(srcdir)/missing/getaddrinfo.c $(COMPILE) -c $(srcdir)/missing/$*.c getnameinfo.o: $(srcdir)/missing/getnameinfo.c $(COMPILE) -c $(srcdir)/missing/$*.c rijndael-api-fst.o: $(srcdir)/missing/crypto/rijndael/rijndael-api-fst.c $(COMPILE) -c $(srcdir)/missing/crypto/rijndael/$*.c rijndael-alg-fst.o: $(srcdir)/missing/crypto/rijndael/rijndael-alg-fst.c $(COMPILE) -c $(srcdir)/missing/crypto/rijndael/$*.c sha2.o: $(srcdir)/missing/crypto/sha2/sha2.c $(COMPILE) -c $(srcdir)/missing/crypto/sha2/$*.c |