Mercurial > illumos > illumos-gate
changeset 3612:5e2207694c21
6520181 in.iked leaks memory when parsing config with duplicate encr_alg
6520196 ikeadm cannot configure keysizes
6520197 ikeadm should print keysizes of algorithms
| author | vk199839 |
|---|---|
| date | Wed, 07 Feb 2007 14:51:19 -0800 |
| parents | 9e3661edaad0 |
| children | d3ad3e7455e2 |
| files | usr/src/cmd/cmd-inet/usr.sbin/ikeadm.c usr/src/lib/libipsecutil/common/ikedoor.h |
| diffstat | 2 files changed, 9 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/usr/src/cmd/cmd-inet/usr.sbin/ikeadm.c Wed Feb 07 14:12:12 2007 -0800 +++ b/usr/src/cmd/cmd-inet/usr.sbin/ikeadm.c Wed Feb 07 14:51:19 2007 -0800 @@ -18,7 +18,7 @@ * * CDDL HEADER END * - * Copyright 2006 Sun Microsystems, Inc. All rights reserved. + * Copyright 2007 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -1421,6 +1421,10 @@ authmethstr(xfp->p1xf_auth_meth)); (void) printf(gettext("\n%s Encryption alg: "), prefix); (void) dump_ealg(xfp->p1xf_encr_alg, stdout); + if (xfp->p1xf_encr_low_bits != 0) { + (void) printf(gettext("(%d..%d)"), xfp->p1xf_encr_low_bits, + xfp->p1xf_encr_high_bits); + } (void) printf(gettext("; Authentication alg: ")); (void) dump_aalg(xfp->p1xf_auth_alg, stdout); (void) printf(gettext("\n%s PRF: %s"), prefix, prfstr(xfp->p1xf_prf));
--- a/usr/src/lib/libipsecutil/common/ikedoor.h Wed Feb 07 14:12:12 2007 -0800 +++ b/usr/src/lib/libipsecutil/common/ikedoor.h Wed Feb 07 14:51:19 2007 -0800 @@ -19,7 +19,7 @@ * CDDL HEADER END */ /* - * Copyright 2006 Sun Microsystems, Inc. All rights reserved. + * Copyright 2007 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -42,7 +42,7 @@ * getting confused if a structure is changed and a mismatch occurs. * This should be incremented each time a structure is changed. */ -#define DOORVER 1 +#define DOORVER 2 #define DOORNM "/var/run/ike_door" @@ -218,6 +218,8 @@ typedef struct { uint16_t p1xf_dh_group; uint16_t p1xf_encr_alg; + uint16_t p1xf_encr_low_bits; + uint16_t p1xf_encr_high_bits; uint16_t p1xf_auth_alg; uint16_t p1xf_auth_meth; uint16_t p1xf_prf;