Commit Graph

110 Commits

Author SHA1 Message Date
thorpej
b454543f45 Apply patches as discussed on:
http://mail-index.netbsd.org/tech-net/2004/11/05/0004.html

Slightly modified to differentiate the version string from a stock racoon.

	* auth_gssapi.h (GSSAPI_DEF_NAME): Change from "ike" to "host".
	(gssapi_get_default_id): Rename to gssapi_get_id.
	(gssapi_get_default_gss_id): New prototype.
	* cfparse.y (GSSAPI_ID): Rename to GSS_ID.
	(GSS_ID_ENC, GSS_ID_ENCTYPE): New tokens.
	(gssenc_statement): New statement.
	(isakmpproposal_spec): Use GSS_ID token.
	(expand_isakmpspec): Fill in gssid in the new proposal only
	if authmethod is OAKLEY_ATTR_AUTH_METHOD_GSSAPI_KRB.  If the
	GSS ID is not provided, call gssapi_get_default_gss_id() to
	place the default ID in the proposal.
	* cftoken.l (S_GSSENC): New start condition.
	(<S_RMTP>gss_id): New, return the GSS_ID token.
	(<S_RMTP>gssapi_id): Return the GSS_ID token.
	(<S_INI>gss_id_enc, <S_GSSENC>latin1, <S_GSSENC>utf-16le)
	(<S_GSSENC>{semi}): New, tokenize the "gss_id_enc enctype;"
	statement.
	* gssapi.c: Include <unistd.h>.
	(gssapi_get_default_gss_id): New function.
	(gssapi_init): Disable a broken debugging message.  Make
	printf formats consistent in their handling of non-NUL-terminated
	strings.
	(gssapi_get_default_id): Rename to...
	(gssapi_get_id): ...this.  If the proposal has a gssid, vdup()
	that and return it.  Disable a broken debugging message.  Make
	printf formats consistent in their handling of non-NUL-terminated
	strings.
	* ipsec_doi.c: Include <iconv.h>.
	(get_ph1approval): Make printf formats consistent in their handling
	of non-NUL-terminated strings.  Call gssapi_get_id() instead of
	gssapi_get_default_id(), and remove some complexity that has been
	pushed into that function.
	(t2isakmpsa): When parsing the OAKLEY_ATTR_GSS_ID attribute,
	check convert the attribute from UTF-16LE to ISO-Latin-1, unless
	we are configured to assume the attribute is already ISO-Latin-1
	encoded.
	(setph1attr): When setting the OAKLEY_ATTR_GSS_ID attribute,
	convert the attribute from ISO-Latin-1 to UTF-16LE, unless we
	are configured to encode the attribute in ISO-Latin-1.
	* localconf.c (setdefault): Set the default GSS ID encoding type
	to UTF-16LE.
	* localconf.h (LC_GSSENC_UTF16LE, LC_GSSENC_LATIN1)
	(LC_GSSENC_MAX): New constants.
	(struct localconf): Add gss_id_enc member.
	* main.c (RACOON_VERSION): Append " - NetBSD 20041110" to the
	version string.
	* racoon.conf.5: Document changes to GSS ID encoding and default
	GSS ID computation.  Document "gss_id_enc enctype;" statement.
	* samples/racoon.conf.sample-gssapi: Update and add comments to
	provide more information.
2004-11-10 20:23:28 +00:00
dsl
e2f49bd9e2 Add (unsigned char) cast to ctype functions 2004-10-30 15:15:37 +00:00
mycroft
6e317e9e72 Disable the "may kill you" message, because:
1) It's not documented anywhere.
2) The problem it's attempting to warn about is not documented anywhere.
3) There are no example configs (or any I found with Google) that use the
   "listen" directive.
4) In any event, it's poorly worded and unclear what it's talking about.
2004-08-06 13:57:05 +00:00
itojun
166adfa9e5 sync w/ 20040617. 2004-06-17 03:42:55 +00:00
itojun
f7968a3c82 version 20040617a, includes important fix about cert handling 2004-06-17 03:38:44 +00:00
itojun
b4a3a9e6c1 properly validate phase 1 signature.
http://www.vuxml.org/freebsd/d8769838-8814-11d8-90d1-0020ed76ef5a.html
2004-04-12 03:34:05 +00:00
itojun
604a0b444a KAME racoon as of 2004/4/12 2004-04-12 03:26:57 +00:00
itojun
7fba5a69cf reject packet with too big isakmp message length field. 2004-03-31 07:19:27 +00:00
itojun
c6a556a5b6 endian mismatch. from iij seil team 2004-01-16 02:25:14 +00:00
itojun
3c3791b847 validate hash on info exchange. bugtraq <20040113213940.GA1727@hzeroseven.org> 2004-01-14 09:17:42 +00:00
itojun
2a85abd333 avoid memory leak. hint from Andrew Lunn 2003-11-23 08:33:13 +00:00
itojun
5451f8a14e do not malloc(0). Andrew Lunn 2003-11-23 08:23:02 +00:00
itojun
6de72ce0f8 typo. minoura 2003-11-13 10:35:40 +00:00
yamt
1356e8977e pfkey_dump_sadb: when it get an error using sysctl,
mimic an error msg from keysock so that caller can process it correctly.

PR/23122.
2003-11-09 15:37:24 +00:00
itojun
746d6bb953 bring in kame rev 1.32. PR 23122 2003-11-04 04:30:38 +00:00
itojun
f90a2e28b1 do not build "null ESP and no AUTH" proposal. (racoon 174) by Tom Lendacky 2003-10-23 07:23:50 +00:00
fvdl
6a6c3ca82f Don't assign NULL as an integer. 2003-10-21 03:06:55 +00:00
fvdl
73d47a4f07 Don't return NULL as an integer. 2003-10-21 03:03:39 +00:00
itojun
ac0a546d0d realloc error check failure; Greg Troxel, sync w/kame 2003-10-03 21:53:32 +00:00
itojun
48b0bfaad0 support policy w/o selector. 2003-10-02 19:53:01 +00:00
itojun
3c068c5948 correct unsafe realloc(). 2003-10-02 19:52:43 +00:00
mycroft
5749c53775 Fix what is obviously a bug: valloc() -> vmalloc(). Now racoon(8) doesn't core
dump all the time.
2003-09-25 01:00:32 +00:00
itojun
249c9d88ea use sysctl to dump SAs if possible (not really tested) 2003-09-12 08:44:34 +00:00
itojun
f13cb0c7b2 bzero() 2nd arg mistake. found by openbsd guys. from kame 2003-09-04 00:12:56 +00:00
itojun
d9c46578d1 update racoon to 2003/8/26 version. mostly minor bugfixes. 2003-08-26 03:31:50 +00:00
itojun
2cfb643fda KAME racoon, as of 2003/08/26 2003-08-26 03:27:01 +00:00
itojun
b5f8b9a7c0 KAME libipsec/libpfkey, 2003/08/26 2003-08-26 03:25:29 +00:00
itojun
965395c9f3 re-enable __RCSID, sys/cdefs_elf.h rev 1.15 fixed the problem 2003-07-30 00:34:16 +00:00
itojun
f33c57af22 disable __RCSID for now, somehow it puts some of integer variables
into .text region
2003-07-29 23:17:39 +00:00
itojun
308bb7eb39 remove unused macro. PR 21150 2003-07-29 04:45:39 +00:00
itojun
4c43ef4ce1 xx_keylen has to return bits, not bytes. KAME-PR-488 2003-07-29 04:30:54 +00:00
itojun
f4401cd869 upgrade openssl to 0.9.7b. (AES is now supported)
alter des.h to be friendly with openssl/des.h (you can include both in the
same file)
make libkrb to depend on libdes.  bump major.
massage various portioin of heimdal to be friendly with openssl 0.9.7b.
2003-07-24 14:16:30 +00:00
itojun
afdee9affa __RCSID. add missing copyright in *.y and *.l (sync w/kame) 2003-07-12 09:37:09 +00:00
itojun
03eefe2ecf sync w/ latest racoon 2003-07-12 09:02:24 +00:00
itojun
dc30725eaf kame racoon 2003/7/12. lots of lots of stability fixes. 2003-07-12 08:45:39 +00:00
wiz
f9cc3a858b Bump date for recent changes. 2003-07-04 12:33:11 +00:00
wiz
de2728383c Punctuation fixes. 2003-07-04 12:31:33 +00:00
wiz
5e88ad0f63 Remove superfluous macro calls, add newline where missing, and
use \&[ (and similar) instead of \*(lB, since it works with both old and new groff.
2003-06-27 22:31:29 +00:00
itojun
1430af815a discourage the use of aggressive mode 2003-06-16 08:40:11 +00:00
itojun
3f62dc6d24 strlcpy 2003-05-17 18:19:20 +00:00
itojun
0230a54dfb plug memory leak. jgraessley at apple.com 2003-05-09 05:32:36 +00:00
itojun
a59c37eb75 parse EOS before performing #include. Joshua Graessley of apple (via kame) 2003-05-08 07:58:54 +00:00
itojun
5116f9caae fix "round up to 8" code. from kame 2003-04-24 02:22:26 +00:00
itojun
bf3ca3dcee do not assume 32bit (%d fits into 12 chars); sumikawa@freebsd 2003-04-17 07:37:05 +00:00
itojun
670e872d62 10 char is not sufficient here. sync w/ kame 2003-04-15 07:31:23 +00:00
wiz
2b75215a67 IPsec, not IPSEC. From Igor Sobrado in PR 19691. 2003-04-06 20:24:35 +00:00
wiz
86932ac56e allocate, not alocate. Noted by mjl, not mjll. 2003-01-28 22:26:33 +00:00
darrenr
8084625896 racoon.conf can be found in /etc/racoon, not /etc 2002-11-27 09:51:50 +00:00
itojun
a426f44395 sync w/ kame source from 2002/11/20.
- plug some memory leaks
- correct phase 2 proposal reqid handling
- check for fd_set overrun
2002-11-20 03:35:57 +00:00
itojun
7285409e64 KAME racoon as of 2002/11/20 2002-11-20 03:30:18 +00:00