Module Name: src Committed By: martin Date: Sun Sep 1 10:49:37 UTC 2019
Modified Files: src/sys/netipsec [netbsd-9]: key.c Log Message: Pull up following revision(s) (requested by maxv in ticket #127): sys/netipsec/key.c: revision 1.266 Fix info leaks. To generate a diff of this commit: cvs rdiff -u -r1.265 -r1.265.2.1 src/sys/netipsec/key.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/netipsec/key.c diff -u src/sys/netipsec/key.c:1.265 src/sys/netipsec/key.c:1.265.2.1 --- src/sys/netipsec/key.c:1.265 Tue Jul 23 04:29:26 2019 +++ src/sys/netipsec/key.c Sun Sep 1 10:49:37 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: key.c,v 1.265 2019/07/23 04:29:26 ozaki-r Exp $ */ +/* $NetBSD: key.c,v 1.265.2.1 2019/09/01 10:49:37 martin Exp $ */ /* $FreeBSD: key.c,v 1.3.2.3 2004/02/14 22:23:23 bms Exp $ */ /* $KAME: key.c,v 1.191 2001/06/27 10:46:49 sakane Exp $ */ @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: key.c,v 1.265 2019/07/23 04:29:26 ozaki-r Exp $"); +__KERNEL_RCSID(0, "$NetBSD: key.c,v 1.265.2.1 2019/09/01 10:49:37 martin Exp $"); /* * This code is referred to RFC 2367 @@ -7251,6 +7251,7 @@ key_api_register(struct socket *so, stru sup = (struct sadb_supported *)(mtod(n, char *) + off); sup->sadb_supported_len = PFKEY_UNIT64(alen); sup->sadb_supported_exttype = SADB_EXT_SUPPORTED_AUTH; + sup->sadb_supported_reserved = 0; off += PFKEY_ALIGN8(sizeof(*sup)); for (i = 1; i <= SADB_AALG_MAX; i++) { @@ -7266,6 +7267,7 @@ key_api_register(struct socket *so, stru key_getsizes_ah(aalgo, i, &minkeysize, &maxkeysize); alg->sadb_alg_minbits = _BITS(minkeysize); alg->sadb_alg_maxbits = _BITS(maxkeysize); + alg->sadb_alg_reserved = 0; off += PFKEY_ALIGN8(sizeof(*alg)); } } @@ -7275,6 +7277,7 @@ key_api_register(struct socket *so, stru sup = (struct sadb_supported *)(mtod(n, char *) + off); sup->sadb_supported_len = PFKEY_UNIT64(elen); sup->sadb_supported_exttype = SADB_EXT_SUPPORTED_ENCRYPT; + sup->sadb_supported_reserved = 0; off += PFKEY_ALIGN8(sizeof(*sup)); for (i = 1; i <= SADB_EALG_MAX; i++) { @@ -7288,6 +7291,7 @@ key_api_register(struct socket *so, stru alg->sadb_alg_ivlen = ealgo->blocksize; alg->sadb_alg_minbits = _BITS(ealgo->minkey); alg->sadb_alg_maxbits = _BITS(ealgo->maxkey); + alg->sadb_alg_reserved = 0; off += PFKEY_ALIGN8(sizeof(struct sadb_alg)); } }