CVS commit: src/sys/netipsec

[Ryota Ozaki]

Module Name:    src
Committed By:   ozaki-r
Date:           Mon Apr 17 05:48:18 UTC 2017

Modified Files:
        src/sys/netipsec: key.c

Log Message:
Accept AH with NULL algorithm of zero-length key


To generate a diff of this commit:
cvs rdiff -u -r1.105 -r1.106 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.105 src/sys/netipsec/key.c:1.106
--- src/sys/netipsec/key.c:1.105	Mon Apr 10 14:02:25 2017
+++ src/sys/netipsec/key.c	Mon Apr 17 05:48:18 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: key.c,v 1.105 2017/04/10 14:02:25 ozaki-r Exp $	*/
+/*	$NetBSD: key.c,v 1.106 2017/04/17 05:48:18 ozaki-r 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.105 2017/04/10 14:02:25 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: key.c,v 1.106 2017/04/17 05:48:18 ozaki-r Exp $");
 
 /*
  * This code is referd to RFC 2367
@@ -6121,7 +6121,7 @@ key_getsizes_ah(const struct auth_hash *
 		switch (alg) {
 		case SADB_X_AALG_MD5:	*ksmin = *ksmax = 16; break;
 		case SADB_X_AALG_SHA:	*ksmin = *ksmax = 20; break;
-		case SADB_X_AALG_NULL:	*ksmin = 1; *ksmax = 256; break;
+		case SADB_X_AALG_NULL:	*ksmin = 0; *ksmax = 256; break;
 		default:
 			DPRINTF(("key_getsizes_ah: unknown AH algorithm %u\n",
 				alg));