b454543f45
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. |
||
---|---|---|
.. | ||
libipsec | ||
racoon |