Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys fix build in the (FAST_)IPSEC & TCP_SIGNATURE case



details:   https://anonhg.NetBSD.org/src/rev/fa7264bb5b8b
branches:  trunk
changeset: 772668:fa7264bb5b8b
user:      drochner <drochner%NetBSD.org@localhost>
date:      Wed Jan 11 14:39:08 2012 +0000

description:
fix build in the (FAST_)IPSEC & TCP_SIGNATURE case

diffstat:

 sys/netinet/tcp_input.c  |  6 +++---
 sys/netipsec/xform_tcp.c |  7 ++++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diffs (55 lines):

diff -r 6f8666965d01 -r fa7264bb5b8b sys/netinet/tcp_input.c
--- a/sys/netinet/tcp_input.c   Wed Jan 11 14:37:45 2012 +0000
+++ b/sys/netinet/tcp_input.c   Wed Jan 11 14:39:08 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: tcp_input.c,v 1.320 2011/12/31 20:41:59 christos Exp $ */
+/*     $NetBSD: tcp_input.c,v 1.321 2012/01/11 14:39:08 drochner Exp $ */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -148,7 +148,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tcp_input.c,v 1.320 2011/12/31 20:41:59 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_input.c,v 1.321 2012/01/11 14:39:08 drochner Exp $");
 
 #include "opt_inet.h"
 #include "opt_ipsec.h"
@@ -3176,7 +3176,7 @@
        /*
         * Look up an SADB entry which matches the address of the peer.
         */
-       sav = KEY_ALLOCSA(&dst, IPPROTO_TCP, htonl(TCP_SIG_SPI));
+       sav = KEY_ALLOCSA(&dst, IPPROTO_TCP, htonl(TCP_SIG_SPI), 0, 0);
 #else
        if (ip)
                sav = key_allocsa(AF_INET, (void *)&ip->ip_src,
diff -r 6f8666965d01 -r fa7264bb5b8b sys/netipsec/xform_tcp.c
--- a/sys/netipsec/xform_tcp.c  Wed Jan 11 14:37:45 2012 +0000
+++ b/sys/netipsec/xform_tcp.c  Wed Jan 11 14:39:08 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: xform_tcp.c,v 1.7 2011/02/18 20:40:58 drochner Exp $ */
+/*     $NetBSD: xform_tcp.c,v 1.8 2012/01/11 14:39:08 drochner Exp $ */
 /*     $FreeBSD: sys/netipsec/xform_tcp.c,v 1.1.2.1 2004/02/14 22:24:09 bms Exp $ */
 
 /*
@@ -31,7 +31,7 @@
 /* TCP MD5 Signature Option (RFC2385) */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xform_tcp.c,v 1.7 2011/02/18 20:40:58 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xform_tcp.c,v 1.8 2012/01/11 14:39:08 drochner Exp $");
 
 #include "opt_inet.h"
 
@@ -160,7 +160,8 @@
 static struct xformsw tcpsignature_xformsw = {
        XF_TCPSIGNATURE,        XFT_AUTH,               "TCPMD5",
        tcpsignature_init,      tcpsignature_zeroize,
-       tcpsignature_input,     tcpsignature_output
+       tcpsignature_input,     tcpsignature_output,
+       NULL
 };
 
 INITFN void



Home | Main Index | Thread Index | Old Index