Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/netinet/udp_usrreq.c,v
retrieving revision 1.183
retrieving revision 1.183.2.2
diff -u -p -r1.183 -r1.183.2.2
--- src/sys/netinet/udp_usrreq.c	2011/09/24 17:18:17	1.183
+++ src/sys/netinet/udp_usrreq.c	2012/10/30 17:22:47	1.183.2.2
@@ -1,4 +1,4 @@
-/*	$NetBSD: udp_usrreq.c,v 1.183 2011/09/24 17:18:17 christos Exp $	*/
+/*	$NetBSD: udp_usrreq.c,v 1.183.2.2 2012/10/30 17:22:47 yamt Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -61,7 +61,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: udp_usrreq.c,v 1.183 2011/09/24 17:18:17 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: udp_usrreq.c,v 1.183.2.2 2012/10/30 17:22:47 yamt Exp $");
 
 #include "opt_inet.h"
 #include "opt_compat_netbsd.h"
@@ -96,7 +96,6 @@ __KERNEL_RCSID(0, "$NetBSD: udp_usrreq.c
 #include <netinet/udp.h>
 #include <netinet/udp_var.h>
 #include <netinet/udp_private.h>
-#include <netinet/rfc6056.h>
 
 #ifdef INET6
 #include <netinet/ip6.h>
@@ -129,13 +128,6 @@ __KERNEL_RCSID(0, "$NetBSD: udp_usrreq.c
 #endif
 #endif	/* FAST_IPSEC */
 
-#ifdef IPSEC
-#include <netinet6/ipsec.h>
-#include <netinet6/ipsec_private.h>
-#include <netinet6/esp.h>
-#include <netkey/key.h>
-#endif /* IPSEC */
-
 #ifdef COMPAT_50
 #include <compat/sys/socket.h>
 #endif
@@ -634,7 +626,7 @@ udp4_sendup(struct mbuf *m, int off /* o
 		return;
 	}
 
-#if defined(IPSEC) || defined(FAST_IPSEC)
+#if defined(FAST_IPSEC)
 	/* check AH/ESP integrity. */
 	if (so != NULL && ipsec4_in_reject_so(m, so)) {
 		IPSEC_STATINC(IPSEC_STAT_IN_POLVIO);
@@ -684,7 +676,7 @@ udp6_sendup(struct mbuf *m, int off /* o
 		return;
 	in6p = sotoin6pcb(so);
 
-#if defined(IPSEC) || defined(FAST_IPSEC)
+#if defined(FAST_IPSEC)
 	/* check AH/ESP integrity. */
 	if (so != NULL && ipsec6_in_reject_so(m, so)) {
 		IPSEC6_STATINC(IPSEC_STAT_IN_POLVIO);
@@ -1087,15 +1079,6 @@ udp_ctloutput(int op, struct socket *so,
 			}
 			break;
 		
-		case UDP_RFC6056ALGO:
-			error = sockopt_getint(sopt, &optval);
-			if (error)
-				break;
-
-			error = rfc6056_algo_index_select(
-			    (struct inpcb_hdr *)inp, optval);
-			break;
-
 		default:
 			error = ENOPROTOOPT;
 			break;
@@ -1384,8 +1367,6 @@ sysctl_net_inet_udp_stats(SYSCTLFN_ARGS)
 static void
 sysctl_net_inet_udp_setup(struct sysctllog **clog)
 {
-	const struct sysctlnode *rfc6056_node;
-	
 	sysctl_createv(clog, 0, NULL, NULL,
 		       CTLFLAG_PERMANENT,
 		       CTLTYPE_NODE, "net", NULL,
@@ -1445,25 +1426,6 @@ sysctl_net_inet_udp_setup(struct sysctll
 		       sysctl_net_inet_udp_stats, 0, NULL, 0,
 		       CTL_NET, PF_INET, IPPROTO_UDP, UDPCTL_STATS,
 		       CTL_EOL);
-	/* RFC6056 subtree */
-	sysctl_createv(clog, 0, NULL, &rfc6056_node,
-		       CTLFLAG_PERMANENT,
-		       CTLTYPE_NODE, "rfc6056",
-		       SYSCTL_DESCR("RFC 6056"),
-	    	       NULL, 0, NULL, 0,
-		       CTL_NET, PF_INET, IPPROTO_UDP, CTL_CREATE, CTL_EOL);
-	sysctl_createv(clog, 0, &rfc6056_node, NULL,
-		       CTLFLAG_PERMANENT,
-		       CTLTYPE_STRING, "available",
-		       SYSCTL_DESCR("RFC 6056 available algorithms"),
-		       sysctl_rfc6056_available, 0, NULL, RFC6056_MAXLEN,
-		       CTL_CREATE, CTL_EOL);
-	sysctl_createv(clog, 0, &rfc6056_node, NULL,
-		       CTLFLAG_PERMANENT|CTLFLAG_READWRITE,
-		       CTLTYPE_STRING, "selected",
-		       SYSCTL_DESCR("RFC 6056 selected algorithm"),
-		       sysctl_rfc6056_selected, 0, NULL, RFC6056_MAXLEN,
-		       CTL_CREATE, CTL_EOL);
 }
 #endif
 
@@ -1611,7 +1573,7 @@ udp4_espinudp(struct mbuf **mp, int off,
 	esp4_input(n, iphdrlen);
 #endif
 
-	/* We handled it, it shoudln't be handled by UDP */
+	/* We handled it, it shouldn't be handled by UDP */
 	return 1;
 }
 #endif