[src/netbsd-8]: src/sys/netipsec Pull up following revision(s) (requested by ...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/6a5d069cde8d
branches:  netbsd-8
changeset: 454221:6a5d069cde8d
user:      martin <martin%NetBSD.org@localhost>
date:      Tue Sep 10 16:03:53 2019 +0000

description:
Pull up following revision(s) (requested by maxv in ticket #1372):

        sys/netipsec/key.c: revision 1.266

Fix info leaks.

diffstat:

 sys/netipsec/key.c |  8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diffs (50 lines):

diff -r 801eba65aa31 -r 6a5d069cde8d sys/netipsec/key.c
--- a/sys/netipsec/key.c        Tue Sep 10 16:02:22 2019 +0000
+++ b/sys/netipsec/key.c        Tue Sep 10 16:03:53 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: key.c,v 1.163.2.12 2019/07/25 08:58:21 martin Exp $    */
+/*     $NetBSD: key.c,v 1.163.2.13 2019/09/10 16:03:53 martin Exp $    */
 /*     $FreeBSD: src/sys/netipsec/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.163.2.12 2019/07/25 08:58:21 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: key.c,v 1.163.2.13 2019/09/10 16:03:53 martin Exp $");
 
 /*
  * This code is referred to RFC 2367
@@ -7220,6 +7220,7 @@
                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++) {
@@ -7235,6 +7236,7 @@
                        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));
                }
        }
@@ -7244,6 +7246,7 @@
                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++) {
@@ -7257,6 +7260,7 @@
                        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));
                }
        }