Module Name: src
Committed By: ozaki-r
Date: Wed Apr 26 03:16:06 UTC 2017
Modified Files:
src/crypto/dist/ipsec-tools/src/libipsec: key_debug.c
src/sys/netipsec: key_debug.c
Log Message:
Correct the length of the SADB_EXT header in debug outputs
The length is shifted 3 bits in PF_KEY protocol.
Originally fixed by hsuenaga@IIJ
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 \
src/crypto/dist/ipsec-tools/src/libipsec/key_debug.c
cvs rdiff -u -r1.16 -r1.17 src/sys/netipsec/key_debug.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/dist/ipsec-tools/src/libipsec/key_debug.c
diff -u src/crypto/dist/ipsec-tools/src/libipsec/key_debug.c:1.10 src/crypto/dist/ipsec-tools/src/libipsec/key_debug.c:1.11
--- src/crypto/dist/ipsec-tools/src/libipsec/key_debug.c:1.10 Mon Jan 9 15:25:13 2012
+++ src/crypto/dist/ipsec-tools/src/libipsec/key_debug.c Wed Apr 26 03:16:06 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: key_debug.c,v 1.10 2012/01/09 15:25:13 drochner Exp $ */
+/* $NetBSD: key_debug.c,v 1.11 2017/04/26 03:16:06 ozaki-r Exp $ */
/* $KAME: key_debug.c,v 1.29 2001/08/16 14:25:41 itojun Exp $ */
@@ -133,7 +133,7 @@ kdebug_sadb(base)
while (tlen > 0) {
printf("sadb_ext{ len=%u type=%u }\n",
- ext->sadb_ext_len, ext->sadb_ext_type);
+ PFKEY_UNUNIT64(ext->sadb_ext_len), ext->sadb_ext_type);
if (ext->sadb_ext_len == 0) {
printf("kdebug_sadb: invalid ext_len=0 was passed.\n");
Index: src/sys/netipsec/key_debug.c
diff -u src/sys/netipsec/key_debug.c:1.16 src/sys/netipsec/key_debug.c:1.17
--- src/sys/netipsec/key_debug.c:1.16 Tue Apr 18 10:49:35 2017
+++ src/sys/netipsec/key_debug.c Wed Apr 26 03:16:06 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: key_debug.c,v 1.16 2017/04/18 10:49:35 ozaki-r Exp $ */
+/* $NetBSD: key_debug.c,v 1.17 2017/04/26 03:16:06 ozaki-r Exp $ */
/* $FreeBSD: src/sys/netipsec/key_debug.c,v 1.1.4.1 2003/01/24 05:11:36 sam Exp $ */
/* $KAME: key_debug.c,v 1.26 2001/06/27 10:46:50 sakane Exp $ */
@@ -33,7 +33,7 @@
#ifdef _KERNEL
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: key_debug.c,v 1.16 2017/04/18 10:49:35 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: key_debug.c,v 1.17 2017/04/26 03:16:06 ozaki-r Exp $");
#endif
#if defined(_KERNEL_OPT)
@@ -105,7 +105,7 @@ kdebug_sadb(const struct sadb_msg *base)
while (tlen > 0) {
printf("sadb_ext{ len=%u type=%u }\n",
- ext->sadb_ext_len, ext->sadb_ext_type);
+ PFKEY_UNUNIT64(ext->sadb_ext_len), ext->sadb_ext_type);
if (ext->sadb_ext_len == 0) {
printf("kdebug_sadb: invalid ext_len=0 was passed.\n");
