2002-10-16 02:10:08 +00:00
|
|
|
/* $FreeBSD$ */
|
|
|
|
/* $OpenBSD: ip_ah.c,v 1.63 2001/06/26 06:18:58 angelos Exp $ */
|
2005-01-07 01:45:51 +00:00
|
|
|
/*-
|
2002-10-16 02:10:08 +00:00
|
|
|
* The authors of this code are John Ioannidis (ji@tla.org),
|
|
|
|
* Angelos D. Keromytis (kermit@csd.uch.gr) and
|
|
|
|
* Niels Provos (provos@physnet.uni-hamburg.de).
|
|
|
|
*
|
|
|
|
* The original version of this code was written by John Ioannidis
|
|
|
|
* for BSD/OS in Athens, Greece, in November 1995.
|
|
|
|
*
|
|
|
|
* Ported to OpenBSD and NetBSD, with additional transforms, in December 1996,
|
|
|
|
* by Angelos D. Keromytis.
|
|
|
|
*
|
|
|
|
* Additional transforms and features in 1997 and 1998 by Angelos D. Keromytis
|
|
|
|
* and Niels Provos.
|
|
|
|
*
|
|
|
|
* Additional features in 1999 by Angelos D. Keromytis and Niklas Hallqvist.
|
|
|
|
*
|
|
|
|
* Copyright (c) 1995, 1996, 1997, 1998, 1999 by John Ioannidis,
|
|
|
|
* Angelos D. Keromytis and Niels Provos.
|
|
|
|
* Copyright (c) 1999 Niklas Hallqvist.
|
|
|
|
* Copyright (c) 2001 Angelos D. Keromytis.
|
|
|
|
*
|
|
|
|
* Permission to use, copy, and modify this software with or without fee
|
|
|
|
* is hereby granted, provided that this entire notice is included in
|
|
|
|
* all copies of any software which is or includes a copy or
|
|
|
|
* modification of this software.
|
|
|
|
* You may use this code under the GNU public license if you so wish. Please
|
|
|
|
* contribute changes back to the authors under this freer than GPL license
|
|
|
|
* so that we may further the use of strong encryption without limitations to
|
|
|
|
* all.
|
|
|
|
*
|
|
|
|
* THIS SOFTWARE IS BEING PROVIDED "AS IS", WITHOUT ANY EXPRESS OR
|
|
|
|
* IMPLIED WARRANTY. IN PARTICULAR, NONE OF THE AUTHORS MAKES ANY
|
|
|
|
* REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE
|
|
|
|
* MERCHANTABILITY OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR
|
|
|
|
* PURPOSE.
|
|
|
|
*/
|
|
|
|
#include "opt_inet.h"
|
|
|
|
#include "opt_inet6.h"
|
|
|
|
|
|
|
|
#include <sys/param.h>
|
|
|
|
#include <sys/systm.h>
|
|
|
|
#include <sys/mbuf.h>
|
|
|
|
#include <sys/socket.h>
|
|
|
|
#include <sys/syslog.h>
|
|
|
|
#include <sys/kernel.h>
|
|
|
|
#include <sys/sysctl.h>
|
Commit step 1 of the vimage project, (network stack)
virtualization work done by Marko Zec (zec@).
This is the first in a series of commits over the course
of the next few weeks.
Mark all uses of global variables to be virtualized
with a V_ prefix.
Use macros to map them back to their global names for
now, so this is a NOP change only.
We hope to have caught at least 85-90% of what is needed
so we do not invalidate a lot of outstanding patches again.
Obtained from: //depot/projects/vimage-commit2/...
Reviewed by: brooks, des, ed, mav, julian,
jamie, kris, rwatson, zec, ...
(various people I forgot, different versions)
md5 (with a bit of help)
Sponsored by: NLnet Foundation, The FreeBSD Foundation
X-MFC after: never
V_Commit_Message_Reviewed_By: more people than the patch
2008-08-17 23:27:27 +00:00
|
|
|
#include <sys/vimage.h>
|
2002-10-16 02:10:08 +00:00
|
|
|
|
|
|
|
#include <net/if.h>
|
|
|
|
|
|
|
|
#include <netinet/in.h>
|
|
|
|
#include <netinet/in_systm.h>
|
|
|
|
#include <netinet/ip.h>
|
|
|
|
#include <netinet/ip_ecn.h>
|
|
|
|
#include <netinet/ip6.h>
|
|
|
|
|
|
|
|
#include <net/route.h>
|
|
|
|
#include <netipsec/ipsec.h>
|
|
|
|
#include <netipsec/ah.h>
|
|
|
|
#include <netipsec/ah_var.h>
|
|
|
|
#include <netipsec/xform.h>
|
|
|
|
|
|
|
|
#ifdef INET6
|
|
|
|
#include <netinet6/ip6_var.h>
|
|
|
|
#include <netipsec/ipsec6.h>
|
|
|
|
#include <netinet6/ip6_ecn.h>
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#include <netipsec/key.h>
|
|
|
|
#include <netipsec/key_debug.h>
|
|
|
|
|
|
|
|
#include <opencrypto/cryptodev.h>
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Return header size in bytes. The old protocol did not support
|
|
|
|
* the replay counter; the new protocol always includes the counter.
|
|
|
|
*/
|
|
|
|
#define HDRSIZE(sav) \
|
|
|
|
(((sav)->flags & SADB_X_EXT_OLD) ? \
|
|
|
|
sizeof (struct ah) : sizeof (struct ah) + sizeof (u_int32_t))
|
|
|
|
/*
|
|
|
|
* Return authenticator size in bytes. The old protocol is known
|
2006-05-17 18:30:28 +00:00
|
|
|
* to use a fixed 16-byte authenticator. The new algorithm use 12-byte
|
|
|
|
* authenticator.
|
2002-10-16 02:10:08 +00:00
|
|
|
*/
|
|
|
|
#define AUTHSIZE(sav) \
|
2006-05-17 18:30:28 +00:00
|
|
|
((sav->flags & SADB_X_EXT_OLD) ? 16 : AH_HMAC_HASHLEN)
|
2002-10-16 02:10:08 +00:00
|
|
|
|
|
|
|
int ah_enable = 1; /* control flow of packets with AH */
|
|
|
|
int ah_cleartos = 1; /* clear ip_tos when doing AH calc */
|
|
|
|
struct ahstat ahstat;
|
|
|
|
|
|
|
|
SYSCTL_DECL(_net_inet_ah);
|
Step 1.5 of importing the network stack virtualization infrastructure
from the vimage project, as per plan established at devsummit 08/08:
http://wiki.freebsd.org/Image/Notes200808DevSummit
Introduce INIT_VNET_*() initializer macros, VNET_FOREACH() iterator
macros, and CURVNET_SET() context setting macros, all currently
resolving to NOPs.
Prepare for virtualization of selected SYSCTL objects by introducing a
family of SYSCTL_V_*() macros, currently resolving to their global
counterparts, i.e. SYSCTL_V_INT() == SYSCTL_INT().
Move selected #defines from sys/sys/vimage.h to newly introduced header
files specific to virtualized subsystems (sys/net/vnet.h,
sys/netinet/vinet.h etc.).
All the changes are verified to have zero functional impact at this
point in time by doing MD5 comparision between pre- and post-change
object files(*).
(*) netipsec/keysock.c did not validate depending on compile time options.
Implemented by: julian, bz, brooks, zec
Reviewed by: julian, bz, brooks, kris, rwatson, ...
Approved by: julian (mentor)
Obtained from: //depot/projects/vimage-commit2/...
X-MFC after: never
Sponsored by: NLnet Foundation, The FreeBSD Foundation
2008-10-02 15:37:58 +00:00
|
|
|
SYSCTL_V_INT(V_NET, vnet_ipsec, _net_inet_ah, OID_AUTO,
|
|
|
|
ah_enable, CTLFLAG_RW, ah_enable, 0, "");
|
|
|
|
SYSCTL_V_INT(V_NET, vnet_ipsec, _net_inet_ah, OID_AUTO,
|
|
|
|
ah_cleartos, CTLFLAG_RW, ah_cleartos, 0, "");
|
|
|
|
SYSCTL_V_STRUCT(V_NET, vnet_ipsec, _net_inet_ah, IPSECCTL_STATS,
|
|
|
|
stats, CTLFLAG_RD, ahstat, ahstat, "");
|
2002-10-16 02:10:08 +00:00
|
|
|
|
|
|
|
static unsigned char ipseczeroes[256]; /* larger than an ip6 extension hdr */
|
|
|
|
|
|
|
|
static int ah_input_cb(struct cryptop*);
|
|
|
|
static int ah_output_cb(struct cryptop*);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* NB: this is public for use by the PF_KEY support.
|
|
|
|
*/
|
|
|
|
struct auth_hash *
|
|
|
|
ah_algorithm_lookup(int alg)
|
|
|
|
{
|
2007-07-01 11:41:27 +00:00
|
|
|
if (alg > SADB_AALG_MAX)
|
2002-10-16 02:10:08 +00:00
|
|
|
return NULL;
|
|
|
|
switch (alg) {
|
|
|
|
case SADB_X_AALG_NULL:
|
|
|
|
return &auth_hash_null;
|
|
|
|
case SADB_AALG_MD5HMAC:
|
2006-05-17 18:30:28 +00:00
|
|
|
return &auth_hash_hmac_md5;
|
2002-10-16 02:10:08 +00:00
|
|
|
case SADB_AALG_SHA1HMAC:
|
2006-05-17 18:30:28 +00:00
|
|
|
return &auth_hash_hmac_sha1;
|
2002-10-16 02:10:08 +00:00
|
|
|
case SADB_X_AALG_RIPEMD160HMAC:
|
2006-05-17 18:30:28 +00:00
|
|
|
return &auth_hash_hmac_ripemd_160;
|
2002-10-16 02:10:08 +00:00
|
|
|
case SADB_X_AALG_MD5:
|
|
|
|
return &auth_hash_key_md5;
|
|
|
|
case SADB_X_AALG_SHA:
|
|
|
|
return &auth_hash_key_sha1;
|
|
|
|
case SADB_X_AALG_SHA2_256:
|
|
|
|
return &auth_hash_hmac_sha2_256;
|
|
|
|
case SADB_X_AALG_SHA2_384:
|
|
|
|
return &auth_hash_hmac_sha2_384;
|
|
|
|
case SADB_X_AALG_SHA2_512:
|
|
|
|
return &auth_hash_hmac_sha2_512;
|
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
size_t
|
|
|
|
ah_hdrsiz(struct secasvar *sav)
|
|
|
|
{
|
|
|
|
size_t size;
|
|
|
|
|
|
|
|
if (sav != NULL) {
|
|
|
|
int authsize;
|
2003-09-29 22:57:43 +00:00
|
|
|
IPSEC_ASSERT(sav->tdb_authalgxform != NULL, ("null xform"));
|
2002-10-16 02:10:08 +00:00
|
|
|
/*XXX not right for null algorithm--does it matter??*/
|
|
|
|
authsize = AUTHSIZE(sav);
|
|
|
|
size = roundup(authsize, sizeof (u_int32_t)) + HDRSIZE(sav);
|
|
|
|
} else {
|
|
|
|
/* default guess */
|
|
|
|
size = sizeof (struct ah) + sizeof (u_int32_t) + 16;
|
|
|
|
}
|
|
|
|
return size;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* NB: public for use by esp_init.
|
|
|
|
*/
|
|
|
|
int
|
|
|
|
ah_init0(struct secasvar *sav, struct xformsw *xsp, struct cryptoini *cria)
|
|
|
|
{
|
Step 1.5 of importing the network stack virtualization infrastructure
from the vimage project, as per plan established at devsummit 08/08:
http://wiki.freebsd.org/Image/Notes200808DevSummit
Introduce INIT_VNET_*() initializer macros, VNET_FOREACH() iterator
macros, and CURVNET_SET() context setting macros, all currently
resolving to NOPs.
Prepare for virtualization of selected SYSCTL objects by introducing a
family of SYSCTL_V_*() macros, currently resolving to their global
counterparts, i.e. SYSCTL_V_INT() == SYSCTL_INT().
Move selected #defines from sys/sys/vimage.h to newly introduced header
files specific to virtualized subsystems (sys/net/vnet.h,
sys/netinet/vinet.h etc.).
All the changes are verified to have zero functional impact at this
point in time by doing MD5 comparision between pre- and post-change
object files(*).
(*) netipsec/keysock.c did not validate depending on compile time options.
Implemented by: julian, bz, brooks, zec
Reviewed by: julian, bz, brooks, kris, rwatson, ...
Approved by: julian (mentor)
Obtained from: //depot/projects/vimage-commit2/...
X-MFC after: never
Sponsored by: NLnet Foundation, The FreeBSD Foundation
2008-10-02 15:37:58 +00:00
|
|
|
INIT_VNET_IPSEC(curvnet);
|
2002-10-16 02:10:08 +00:00
|
|
|
struct auth_hash *thash;
|
|
|
|
int keylen;
|
|
|
|
|
|
|
|
thash = ah_algorithm_lookup(sav->alg_auth);
|
|
|
|
if (thash == NULL) {
|
2003-09-29 22:57:43 +00:00
|
|
|
DPRINTF(("%s: unsupported authentication algorithm %u\n",
|
|
|
|
__func__, sav->alg_auth));
|
2002-10-16 02:10:08 +00:00
|
|
|
return EINVAL;
|
|
|
|
}
|
|
|
|
/*
|
|
|
|
* Verify the replay state block allocation is consistent with
|
|
|
|
* the protocol type. We check here so we can make assumptions
|
|
|
|
* later during protocol processing.
|
|
|
|
*/
|
|
|
|
/* NB: replay state is setup elsewhere (sigh) */
|
|
|
|
if (((sav->flags&SADB_X_EXT_OLD) == 0) ^ (sav->replay != NULL)) {
|
2003-09-29 22:57:43 +00:00
|
|
|
DPRINTF(("%s: replay state block inconsistency, "
|
|
|
|
"%s algorithm %s replay state\n", __func__,
|
2002-10-16 02:10:08 +00:00
|
|
|
(sav->flags & SADB_X_EXT_OLD) ? "old" : "new",
|
|
|
|
sav->replay == NULL ? "without" : "with"));
|
|
|
|
return EINVAL;
|
|
|
|
}
|
|
|
|
if (sav->key_auth == NULL) {
|
2003-09-29 22:57:43 +00:00
|
|
|
DPRINTF(("%s: no authentication key for %s algorithm\n",
|
|
|
|
__func__, thash->name));
|
2002-10-16 02:10:08 +00:00
|
|
|
return EINVAL;
|
|
|
|
}
|
|
|
|
keylen = _KEYLEN(sav->key_auth);
|
|
|
|
if (keylen != thash->keysize && thash->keysize != 0) {
|
2003-09-29 22:57:43 +00:00
|
|
|
DPRINTF(("%s: invalid keylength %d, algorithm %s requires "
|
|
|
|
"keysize %d\n", __func__,
|
2002-10-16 02:10:08 +00:00
|
|
|
keylen, thash->name, thash->keysize));
|
|
|
|
return EINVAL;
|
|
|
|
}
|
|
|
|
|
|
|
|
sav->tdb_xform = xsp;
|
|
|
|
sav->tdb_authalgxform = thash;
|
|
|
|
|
|
|
|
/* Initialize crypto session. */
|
|
|
|
bzero(cria, sizeof (*cria));
|
|
|
|
cria->cri_alg = sav->tdb_authalgxform->type;
|
|
|
|
cria->cri_klen = _KEYBITS(sav->key_auth);
|
2006-03-25 13:38:52 +00:00
|
|
|
cria->cri_key = sav->key_auth->key_data;
|
2006-05-17 18:30:28 +00:00
|
|
|
cria->cri_mlen = AUTHSIZE(sav);
|
2002-10-16 02:10:08 +00:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* ah_init() is called when an SPI is being set up.
|
|
|
|
*/
|
|
|
|
static int
|
|
|
|
ah_init(struct secasvar *sav, struct xformsw *xsp)
|
|
|
|
{
|
Step 1.5 of importing the network stack virtualization infrastructure
from the vimage project, as per plan established at devsummit 08/08:
http://wiki.freebsd.org/Image/Notes200808DevSummit
Introduce INIT_VNET_*() initializer macros, VNET_FOREACH() iterator
macros, and CURVNET_SET() context setting macros, all currently
resolving to NOPs.
Prepare for virtualization of selected SYSCTL objects by introducing a
family of SYSCTL_V_*() macros, currently resolving to their global
counterparts, i.e. SYSCTL_V_INT() == SYSCTL_INT().
Move selected #defines from sys/sys/vimage.h to newly introduced header
files specific to virtualized subsystems (sys/net/vnet.h,
sys/netinet/vinet.h etc.).
All the changes are verified to have zero functional impact at this
point in time by doing MD5 comparision between pre- and post-change
object files(*).
(*) netipsec/keysock.c did not validate depending on compile time options.
Implemented by: julian, bz, brooks, zec
Reviewed by: julian, bz, brooks, kris, rwatson, ...
Approved by: julian (mentor)
Obtained from: //depot/projects/vimage-commit2/...
X-MFC after: never
Sponsored by: NLnet Foundation, The FreeBSD Foundation
2008-10-02 15:37:58 +00:00
|
|
|
INIT_VNET_IPSEC(curvnet);
|
2002-10-16 02:10:08 +00:00
|
|
|
struct cryptoini cria;
|
|
|
|
int error;
|
|
|
|
|
|
|
|
error = ah_init0(sav, xsp, &cria);
|
|
|
|
return error ? error :
|
Commit step 1 of the vimage project, (network stack)
virtualization work done by Marko Zec (zec@).
This is the first in a series of commits over the course
of the next few weeks.
Mark all uses of global variables to be virtualized
with a V_ prefix.
Use macros to map them back to their global names for
now, so this is a NOP change only.
We hope to have caught at least 85-90% of what is needed
so we do not invalidate a lot of outstanding patches again.
Obtained from: //depot/projects/vimage-commit2/...
Reviewed by: brooks, des, ed, mav, julian,
jamie, kris, rwatson, zec, ...
(various people I forgot, different versions)
md5 (with a bit of help)
Sponsored by: NLnet Foundation, The FreeBSD Foundation
X-MFC after: never
V_Commit_Message_Reviewed_By: more people than the patch
2008-08-17 23:27:27 +00:00
|
|
|
crypto_newsession(&sav->tdb_cryptoid, &cria, V_crypto_support);
|
2002-10-16 02:10:08 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Paranoia.
|
|
|
|
*
|
|
|
|
* NB: public for use by esp_zeroize (XXX).
|
|
|
|
*/
|
|
|
|
int
|
|
|
|
ah_zeroize(struct secasvar *sav)
|
|
|
|
{
|
|
|
|
int err;
|
|
|
|
|
|
|
|
if (sav->key_auth)
|
2006-03-25 13:38:52 +00:00
|
|
|
bzero(sav->key_auth->key_data, _KEYLEN(sav->key_auth));
|
2002-10-16 02:10:08 +00:00
|
|
|
|
|
|
|
err = crypto_freesession(sav->tdb_cryptoid);
|
|
|
|
sav->tdb_cryptoid = 0;
|
|
|
|
sav->tdb_authalgxform = NULL;
|
|
|
|
sav->tdb_xform = NULL;
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Massage IPv4/IPv6 headers for AH processing.
|
|
|
|
*/
|
|
|
|
static int
|
|
|
|
ah_massage_headers(struct mbuf **m0, int proto, int skip, int alg, int out)
|
|
|
|
{
|
Step 1.5 of importing the network stack virtualization infrastructure
from the vimage project, as per plan established at devsummit 08/08:
http://wiki.freebsd.org/Image/Notes200808DevSummit
Introduce INIT_VNET_*() initializer macros, VNET_FOREACH() iterator
macros, and CURVNET_SET() context setting macros, all currently
resolving to NOPs.
Prepare for virtualization of selected SYSCTL objects by introducing a
family of SYSCTL_V_*() macros, currently resolving to their global
counterparts, i.e. SYSCTL_V_INT() == SYSCTL_INT().
Move selected #defines from sys/sys/vimage.h to newly introduced header
files specific to virtualized subsystems (sys/net/vnet.h,
sys/netinet/vinet.h etc.).
All the changes are verified to have zero functional impact at this
point in time by doing MD5 comparision between pre- and post-change
object files(*).
(*) netipsec/keysock.c did not validate depending on compile time options.
Implemented by: julian, bz, brooks, zec
Reviewed by: julian, bz, brooks, kris, rwatson, ...
Approved by: julian (mentor)
Obtained from: //depot/projects/vimage-commit2/...
X-MFC after: never
Sponsored by: NLnet Foundation, The FreeBSD Foundation
2008-10-02 15:37:58 +00:00
|
|
|
INIT_VNET_IPSEC(curvnet);
|
2002-10-16 02:10:08 +00:00
|
|
|
struct mbuf *m = *m0;
|
|
|
|
unsigned char *ptr;
|
|
|
|
int off, count;
|
|
|
|
|
|
|
|
#ifdef INET
|
|
|
|
struct ip *ip;
|
|
|
|
#endif /* INET */
|
|
|
|
|
|
|
|
#ifdef INET6
|
|
|
|
struct ip6_ext *ip6e;
|
|
|
|
struct ip6_hdr ip6;
|
|
|
|
int alloc, len, ad;
|
|
|
|
#endif /* INET6 */
|
|
|
|
|
|
|
|
switch (proto) {
|
|
|
|
#ifdef INET
|
|
|
|
case AF_INET:
|
|
|
|
/*
|
|
|
|
* This is the least painful way of dealing with IPv4 header
|
|
|
|
* and option processing -- just make sure they're in
|
|
|
|
* contiguous memory.
|
|
|
|
*/
|
|
|
|
*m0 = m = m_pullup(m, skip);
|
|
|
|
if (m == NULL) {
|
2003-09-29 22:57:43 +00:00
|
|
|
DPRINTF(("%s: m_pullup failed\n", __func__));
|
2002-10-16 02:10:08 +00:00
|
|
|
return ENOBUFS;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Fix the IP header */
|
|
|
|
ip = mtod(m, struct ip *);
|
Commit step 1 of the vimage project, (network stack)
virtualization work done by Marko Zec (zec@).
This is the first in a series of commits over the course
of the next few weeks.
Mark all uses of global variables to be virtualized
with a V_ prefix.
Use macros to map them back to their global names for
now, so this is a NOP change only.
We hope to have caught at least 85-90% of what is needed
so we do not invalidate a lot of outstanding patches again.
Obtained from: //depot/projects/vimage-commit2/...
Reviewed by: brooks, des, ed, mav, julian,
jamie, kris, rwatson, zec, ...
(various people I forgot, different versions)
md5 (with a bit of help)
Sponsored by: NLnet Foundation, The FreeBSD Foundation
X-MFC after: never
V_Commit_Message_Reviewed_By: more people than the patch
2008-08-17 23:27:27 +00:00
|
|
|
if (V_ah_cleartos)
|
2002-10-16 02:10:08 +00:00
|
|
|
ip->ip_tos = 0;
|
|
|
|
ip->ip_ttl = 0;
|
|
|
|
ip->ip_sum = 0;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* On input, fix ip_len which has been byte-swapped
|
|
|
|
* at ip_input().
|
|
|
|
*/
|
|
|
|
if (!out) {
|
|
|
|
ip->ip_len = htons(ip->ip_len + skip);
|
|
|
|
|
|
|
|
if (alg == CRYPTO_MD5_KPDK || alg == CRYPTO_SHA1_KPDK)
|
|
|
|
ip->ip_off = htons(ip->ip_off & IP_DF);
|
|
|
|
else
|
|
|
|
ip->ip_off = 0;
|
|
|
|
} else {
|
|
|
|
if (alg == CRYPTO_MD5_KPDK || alg == CRYPTO_SHA1_KPDK)
|
|
|
|
ip->ip_off = htons(ntohs(ip->ip_off) & IP_DF);
|
|
|
|
else
|
|
|
|
ip->ip_off = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
ptr = mtod(m, unsigned char *) + sizeof(struct ip);
|
|
|
|
|
|
|
|
/* IPv4 option processing */
|
|
|
|
for (off = sizeof(struct ip); off < skip;) {
|
|
|
|
if (ptr[off] == IPOPT_EOL || ptr[off] == IPOPT_NOP ||
|
|
|
|
off + 1 < skip)
|
|
|
|
;
|
|
|
|
else {
|
2003-09-29 22:57:43 +00:00
|
|
|
DPRINTF(("%s: illegal IPv4 option length for "
|
|
|
|
"option %d\n", __func__, ptr[off]));
|
2002-10-16 02:10:08 +00:00
|
|
|
|
|
|
|
m_freem(m);
|
|
|
|
return EINVAL;
|
|
|
|
}
|
|
|
|
|
|
|
|
switch (ptr[off]) {
|
|
|
|
case IPOPT_EOL:
|
|
|
|
off = skip; /* End the loop. */
|
|
|
|
break;
|
|
|
|
|
|
|
|
case IPOPT_NOP:
|
|
|
|
off++;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case IPOPT_SECURITY: /* 0x82 */
|
|
|
|
case 0x85: /* Extended security. */
|
|
|
|
case 0x86: /* Commercial security. */
|
|
|
|
case 0x94: /* Router alert */
|
|
|
|
case 0x95: /* RFC1770 */
|
|
|
|
/* Sanity check for option length. */
|
|
|
|
if (ptr[off + 1] < 2) {
|
2003-09-29 22:57:43 +00:00
|
|
|
DPRINTF(("%s: illegal IPv4 option "
|
|
|
|
"length for option %d\n",
|
|
|
|
__func__, ptr[off]));
|
2002-10-16 02:10:08 +00:00
|
|
|
|
|
|
|
m_freem(m);
|
|
|
|
return EINVAL;
|
|
|
|
}
|
|
|
|
|
|
|
|
off += ptr[off + 1];
|
|
|
|
break;
|
|
|
|
|
|
|
|
case IPOPT_LSRR:
|
|
|
|
case IPOPT_SSRR:
|
|
|
|
/* Sanity check for option length. */
|
|
|
|
if (ptr[off + 1] < 2) {
|
2003-09-29 22:57:43 +00:00
|
|
|
DPRINTF(("%s: illegal IPv4 option "
|
|
|
|
"length for option %d\n",
|
|
|
|
__func__, ptr[off]));
|
2002-10-16 02:10:08 +00:00
|
|
|
|
|
|
|
m_freem(m);
|
|
|
|
return EINVAL;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* On output, if we have either of the
|
|
|
|
* source routing options, we should
|
|
|
|
* swap the destination address of the
|
|
|
|
* IP header with the last address
|
|
|
|
* specified in the option, as that is
|
|
|
|
* what the destination's IP header
|
|
|
|
* will look like.
|
|
|
|
*/
|
|
|
|
if (out)
|
|
|
|
bcopy(ptr + off + ptr[off + 1] -
|
|
|
|
sizeof(struct in_addr),
|
|
|
|
&(ip->ip_dst), sizeof(struct in_addr));
|
|
|
|
|
|
|
|
/* Fall through */
|
|
|
|
default:
|
|
|
|
/* Sanity check for option length. */
|
|
|
|
if (ptr[off + 1] < 2) {
|
2003-09-29 22:57:43 +00:00
|
|
|
DPRINTF(("%s: illegal IPv4 option "
|
|
|
|
"length for option %d\n",
|
|
|
|
__func__, ptr[off]));
|
2002-10-16 02:10:08 +00:00
|
|
|
m_freem(m);
|
|
|
|
return EINVAL;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Zeroize all other options. */
|
|
|
|
count = ptr[off + 1];
|
|
|
|
bcopy(ipseczeroes, ptr, count);
|
|
|
|
off += count;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Sanity check. */
|
|
|
|
if (off > skip) {
|
2003-09-29 22:57:43 +00:00
|
|
|
DPRINTF(("%s: malformed IPv4 options header\n",
|
|
|
|
__func__));
|
2002-10-16 02:10:08 +00:00
|
|
|
|
|
|
|
m_freem(m);
|
|
|
|
return EINVAL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
break;
|
|
|
|
#endif /* INET */
|
|
|
|
|
|
|
|
#ifdef INET6
|
|
|
|
case AF_INET6: /* Ugly... */
|
|
|
|
/* Copy and "cook" the IPv6 header. */
|
|
|
|
m_copydata(m, 0, sizeof(ip6), (caddr_t) &ip6);
|
|
|
|
|
|
|
|
/* We don't do IPv6 Jumbograms. */
|
|
|
|
if (ip6.ip6_plen == 0) {
|
2003-09-29 22:57:43 +00:00
|
|
|
DPRINTF(("%s: unsupported IPv6 jumbogram\n", __func__));
|
2002-10-16 02:10:08 +00:00
|
|
|
m_freem(m);
|
|
|
|
return EMSGSIZE;
|
|
|
|
}
|
|
|
|
|
|
|
|
ip6.ip6_flow = 0;
|
|
|
|
ip6.ip6_hlim = 0;
|
|
|
|
ip6.ip6_vfc &= ~IPV6_VERSION_MASK;
|
|
|
|
ip6.ip6_vfc |= IPV6_VERSION;
|
|
|
|
|
|
|
|
/* Scoped address handling. */
|
|
|
|
if (IN6_IS_SCOPE_LINKLOCAL(&ip6.ip6_src))
|
|
|
|
ip6.ip6_src.s6_addr16[1] = 0;
|
|
|
|
if (IN6_IS_SCOPE_LINKLOCAL(&ip6.ip6_dst))
|
|
|
|
ip6.ip6_dst.s6_addr16[1] = 0;
|
|
|
|
|
|
|
|
/* Done with IPv6 header. */
|
|
|
|
m_copyback(m, 0, sizeof(struct ip6_hdr), (caddr_t) &ip6);
|
|
|
|
|
|
|
|
/* Let's deal with the remaining headers (if any). */
|
|
|
|
if (skip - sizeof(struct ip6_hdr) > 0) {
|
|
|
|
if (m->m_len <= skip) {
|
|
|
|
ptr = (unsigned char *) malloc(
|
|
|
|
skip - sizeof(struct ip6_hdr),
|
|
|
|
M_XDATA, M_NOWAIT);
|
|
|
|
if (ptr == NULL) {
|
2003-09-29 22:57:43 +00:00
|
|
|
DPRINTF(("%s: failed to allocate memory"
|
|
|
|
"for IPv6 headers\n",__func__));
|
2002-10-16 02:10:08 +00:00
|
|
|
m_freem(m);
|
|
|
|
return ENOBUFS;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Copy all the protocol headers after
|
|
|
|
* the IPv6 header.
|
|
|
|
*/
|
|
|
|
m_copydata(m, sizeof(struct ip6_hdr),
|
|
|
|
skip - sizeof(struct ip6_hdr), ptr);
|
|
|
|
alloc = 1;
|
|
|
|
} else {
|
|
|
|
/* No need to allocate memory. */
|
|
|
|
ptr = mtod(m, unsigned char *) +
|
|
|
|
sizeof(struct ip6_hdr);
|
|
|
|
alloc = 0;
|
|
|
|
}
|
|
|
|
} else
|
|
|
|
break;
|
|
|
|
|
|
|
|
off = ip6.ip6_nxt & 0xff; /* Next header type. */
|
|
|
|
|
|
|
|
for (len = 0; len < skip - sizeof(struct ip6_hdr);)
|
|
|
|
switch (off) {
|
|
|
|
case IPPROTO_HOPOPTS:
|
|
|
|
case IPPROTO_DSTOPTS:
|
|
|
|
ip6e = (struct ip6_ext *) (ptr + len);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Process the mutable/immutable
|
|
|
|
* options -- borrows heavily from the
|
|
|
|
* KAME code.
|
|
|
|
*/
|
|
|
|
for (count = len + sizeof(struct ip6_ext);
|
|
|
|
count < len + ((ip6e->ip6e_len + 1) << 3);) {
|
|
|
|
if (ptr[count] == IP6OPT_PAD1) {
|
|
|
|
count++;
|
|
|
|
continue; /* Skip padding. */
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Sanity check. */
|
|
|
|
if (count > len +
|
|
|
|
((ip6e->ip6e_len + 1) << 3)) {
|
|
|
|
m_freem(m);
|
|
|
|
|
|
|
|
/* Free, if we allocated. */
|
|
|
|
if (alloc)
|
2008-10-23 15:53:51 +00:00
|
|
|
free(ptr, M_XDATA);
|
2002-10-16 02:10:08 +00:00
|
|
|
return EINVAL;
|
|
|
|
}
|
|
|
|
|
|
|
|
ad = ptr[count + 1];
|
|
|
|
|
|
|
|
/* If mutable option, zeroize. */
|
|
|
|
if (ptr[count] & IP6OPT_MUTABLE)
|
|
|
|
bcopy(ipseczeroes, ptr + count,
|
|
|
|
ptr[count + 1]);
|
|
|
|
|
|
|
|
count += ad;
|
|
|
|
|
|
|
|
/* Sanity check. */
|
|
|
|
if (count >
|
|
|
|
skip - sizeof(struct ip6_hdr)) {
|
|
|
|
m_freem(m);
|
|
|
|
|
|
|
|
/* Free, if we allocated. */
|
|
|
|
if (alloc)
|
2008-10-23 15:53:51 +00:00
|
|
|
free(ptr, M_XDATA);
|
2002-10-16 02:10:08 +00:00
|
|
|
return EINVAL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Advance. */
|
|
|
|
len += ((ip6e->ip6e_len + 1) << 3);
|
|
|
|
off = ip6e->ip6e_nxt;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case IPPROTO_ROUTING:
|
|
|
|
/*
|
|
|
|
* Always include routing headers in
|
|
|
|
* computation.
|
|
|
|
*/
|
|
|
|
ip6e = (struct ip6_ext *) (ptr + len);
|
|
|
|
len += ((ip6e->ip6e_len + 1) << 3);
|
|
|
|
off = ip6e->ip6e_nxt;
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
2003-09-29 22:57:43 +00:00
|
|
|
DPRINTF(("%s: unexpected IPv6 header type %d",
|
|
|
|
__func__, off));
|
2002-10-16 02:10:08 +00:00
|
|
|
if (alloc)
|
2008-10-23 15:53:51 +00:00
|
|
|
free(ptr, M_XDATA);
|
2002-10-16 02:10:08 +00:00
|
|
|
m_freem(m);
|
|
|
|
return EINVAL;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Copyback and free, if we allocated. */
|
|
|
|
if (alloc) {
|
|
|
|
m_copyback(m, sizeof(struct ip6_hdr),
|
|
|
|
skip - sizeof(struct ip6_hdr), ptr);
|
|
|
|
free(ptr, M_XDATA);
|
|
|
|
}
|
|
|
|
|
|
|
|
break;
|
|
|
|
#endif /* INET6 */
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* ah_input() gets called to verify that an input packet
|
|
|
|
* passes authentication.
|
|
|
|
*/
|
|
|
|
static int
|
|
|
|
ah_input(struct mbuf *m, struct secasvar *sav, int skip, int protoff)
|
|
|
|
{
|
Step 1.5 of importing the network stack virtualization infrastructure
from the vimage project, as per plan established at devsummit 08/08:
http://wiki.freebsd.org/Image/Notes200808DevSummit
Introduce INIT_VNET_*() initializer macros, VNET_FOREACH() iterator
macros, and CURVNET_SET() context setting macros, all currently
resolving to NOPs.
Prepare for virtualization of selected SYSCTL objects by introducing a
family of SYSCTL_V_*() macros, currently resolving to their global
counterparts, i.e. SYSCTL_V_INT() == SYSCTL_INT().
Move selected #defines from sys/sys/vimage.h to newly introduced header
files specific to virtualized subsystems (sys/net/vnet.h,
sys/netinet/vinet.h etc.).
All the changes are verified to have zero functional impact at this
point in time by doing MD5 comparision between pre- and post-change
object files(*).
(*) netipsec/keysock.c did not validate depending on compile time options.
Implemented by: julian, bz, brooks, zec
Reviewed by: julian, bz, brooks, kris, rwatson, ...
Approved by: julian (mentor)
Obtained from: //depot/projects/vimage-commit2/...
X-MFC after: never
Sponsored by: NLnet Foundation, The FreeBSD Foundation
2008-10-02 15:37:58 +00:00
|
|
|
INIT_VNET_IPSEC(curvnet);
|
2002-10-16 02:10:08 +00:00
|
|
|
struct auth_hash *ahx;
|
|
|
|
struct tdb_ident *tdbi;
|
|
|
|
struct tdb_crypto *tc;
|
|
|
|
struct m_tag *mtag;
|
|
|
|
struct newah *ah;
|
|
|
|
int hl, rplen, authsize;
|
|
|
|
|
|
|
|
struct cryptodesc *crda;
|
|
|
|
struct cryptop *crp;
|
|
|
|
|
2003-09-29 22:57:43 +00:00
|
|
|
IPSEC_ASSERT(sav != NULL, ("null SA"));
|
|
|
|
IPSEC_ASSERT(sav->key_auth != NULL, ("null authentication key"));
|
|
|
|
IPSEC_ASSERT(sav->tdb_authalgxform != NULL,
|
|
|
|
("null authentication xform"));
|
2002-10-16 02:10:08 +00:00
|
|
|
|
|
|
|
/* Figure out header size. */
|
|
|
|
rplen = HDRSIZE(sav);
|
|
|
|
|
|
|
|
/* XXX don't pullup, just copy header */
|
|
|
|
IP6_EXTHDR_GET(ah, struct newah *, m, skip, rplen);
|
|
|
|
if (ah == NULL) {
|
|
|
|
DPRINTF(("ah_input: cannot pullup header\n"));
|
Commit step 1 of the vimage project, (network stack)
virtualization work done by Marko Zec (zec@).
This is the first in a series of commits over the course
of the next few weeks.
Mark all uses of global variables to be virtualized
with a V_ prefix.
Use macros to map them back to their global names for
now, so this is a NOP change only.
We hope to have caught at least 85-90% of what is needed
so we do not invalidate a lot of outstanding patches again.
Obtained from: //depot/projects/vimage-commit2/...
Reviewed by: brooks, des, ed, mav, julian,
jamie, kris, rwatson, zec, ...
(various people I forgot, different versions)
md5 (with a bit of help)
Sponsored by: NLnet Foundation, The FreeBSD Foundation
X-MFC after: never
V_Commit_Message_Reviewed_By: more people than the patch
2008-08-17 23:27:27 +00:00
|
|
|
V_ahstat.ahs_hdrops++; /*XXX*/
|
2002-10-16 02:10:08 +00:00
|
|
|
m_freem(m);
|
|
|
|
return ENOBUFS;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Check replay window, if applicable. */
|
|
|
|
if (sav->replay && !ipsec_chkreplay(ntohl(ah->ah_seq), sav)) {
|
Commit step 1 of the vimage project, (network stack)
virtualization work done by Marko Zec (zec@).
This is the first in a series of commits over the course
of the next few weeks.
Mark all uses of global variables to be virtualized
with a V_ prefix.
Use macros to map them back to their global names for
now, so this is a NOP change only.
We hope to have caught at least 85-90% of what is needed
so we do not invalidate a lot of outstanding patches again.
Obtained from: //depot/projects/vimage-commit2/...
Reviewed by: brooks, des, ed, mav, julian,
jamie, kris, rwatson, zec, ...
(various people I forgot, different versions)
md5 (with a bit of help)
Sponsored by: NLnet Foundation, The FreeBSD Foundation
X-MFC after: never
V_Commit_Message_Reviewed_By: more people than the patch
2008-08-17 23:27:27 +00:00
|
|
|
V_ahstat.ahs_replay++;
|
2003-09-29 22:57:43 +00:00
|
|
|
DPRINTF(("%s: packet replay failure: %s\n", __func__,
|
2002-10-16 02:10:08 +00:00
|
|
|
ipsec_logsastr(sav)));
|
|
|
|
m_freem(m);
|
|
|
|
return ENOBUFS;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Verify AH header length. */
|
|
|
|
hl = ah->ah_len * sizeof (u_int32_t);
|
|
|
|
ahx = sav->tdb_authalgxform;
|
|
|
|
authsize = AUTHSIZE(sav);
|
|
|
|
if (hl != authsize + rplen - sizeof (struct ah)) {
|
2003-09-29 22:57:43 +00:00
|
|
|
DPRINTF(("%s: bad authenticator length %u (expecting %lu)"
|
|
|
|
" for packet in SA %s/%08lx\n", __func__,
|
2002-10-16 02:10:08 +00:00
|
|
|
hl, (u_long) (authsize + rplen - sizeof (struct ah)),
|
|
|
|
ipsec_address(&sav->sah->saidx.dst),
|
|
|
|
(u_long) ntohl(sav->spi)));
|
Commit step 1 of the vimage project, (network stack)
virtualization work done by Marko Zec (zec@).
This is the first in a series of commits over the course
of the next few weeks.
Mark all uses of global variables to be virtualized
with a V_ prefix.
Use macros to map them back to their global names for
now, so this is a NOP change only.
We hope to have caught at least 85-90% of what is needed
so we do not invalidate a lot of outstanding patches again.
Obtained from: //depot/projects/vimage-commit2/...
Reviewed by: brooks, des, ed, mav, julian,
jamie, kris, rwatson, zec, ...
(various people I forgot, different versions)
md5 (with a bit of help)
Sponsored by: NLnet Foundation, The FreeBSD Foundation
X-MFC after: never
V_Commit_Message_Reviewed_By: more people than the patch
2008-08-17 23:27:27 +00:00
|
|
|
V_ahstat.ahs_badauthl++;
|
2002-10-16 02:10:08 +00:00
|
|
|
m_freem(m);
|
|
|
|
return EACCES;
|
|
|
|
}
|
Commit step 1 of the vimage project, (network stack)
virtualization work done by Marko Zec (zec@).
This is the first in a series of commits over the course
of the next few weeks.
Mark all uses of global variables to be virtualized
with a V_ prefix.
Use macros to map them back to their global names for
now, so this is a NOP change only.
We hope to have caught at least 85-90% of what is needed
so we do not invalidate a lot of outstanding patches again.
Obtained from: //depot/projects/vimage-commit2/...
Reviewed by: brooks, des, ed, mav, julian,
jamie, kris, rwatson, zec, ...
(various people I forgot, different versions)
md5 (with a bit of help)
Sponsored by: NLnet Foundation, The FreeBSD Foundation
X-MFC after: never
V_Commit_Message_Reviewed_By: more people than the patch
2008-08-17 23:27:27 +00:00
|
|
|
V_ahstat.ahs_ibytes += m->m_pkthdr.len - skip - hl;
|
2002-10-16 02:10:08 +00:00
|
|
|
|
|
|
|
/* Get crypto descriptors. */
|
|
|
|
crp = crypto_getreq(1);
|
|
|
|
if (crp == NULL) {
|
2003-09-29 22:57:43 +00:00
|
|
|
DPRINTF(("%s: failed to acquire crypto descriptor\n",__func__));
|
Commit step 1 of the vimage project, (network stack)
virtualization work done by Marko Zec (zec@).
This is the first in a series of commits over the course
of the next few weeks.
Mark all uses of global variables to be virtualized
with a V_ prefix.
Use macros to map them back to their global names for
now, so this is a NOP change only.
We hope to have caught at least 85-90% of what is needed
so we do not invalidate a lot of outstanding patches again.
Obtained from: //depot/projects/vimage-commit2/...
Reviewed by: brooks, des, ed, mav, julian,
jamie, kris, rwatson, zec, ...
(various people I forgot, different versions)
md5 (with a bit of help)
Sponsored by: NLnet Foundation, The FreeBSD Foundation
X-MFC after: never
V_Commit_Message_Reviewed_By: more people than the patch
2008-08-17 23:27:27 +00:00
|
|
|
V_ahstat.ahs_crypto++;
|
2002-10-16 02:10:08 +00:00
|
|
|
m_freem(m);
|
|
|
|
return ENOBUFS;
|
|
|
|
}
|
|
|
|
|
|
|
|
crda = crp->crp_desc;
|
2003-09-29 22:57:43 +00:00
|
|
|
IPSEC_ASSERT(crda != NULL, ("null crypto descriptor"));
|
2002-10-16 02:10:08 +00:00
|
|
|
|
|
|
|
crda->crd_skip = 0;
|
|
|
|
crda->crd_len = m->m_pkthdr.len;
|
|
|
|
crda->crd_inject = skip + rplen;
|
|
|
|
|
|
|
|
/* Authentication operation. */
|
|
|
|
crda->crd_alg = ahx->type;
|
|
|
|
crda->crd_klen = _KEYBITS(sav->key_auth);
|
2006-03-25 13:38:52 +00:00
|
|
|
crda->crd_key = sav->key_auth->key_data;
|
2002-10-16 02:10:08 +00:00
|
|
|
|
|
|
|
/* Find out if we've already done crypto. */
|
|
|
|
for (mtag = m_tag_find(m, PACKET_TAG_IPSEC_IN_CRYPTO_DONE, NULL);
|
|
|
|
mtag != NULL;
|
|
|
|
mtag = m_tag_find(m, PACKET_TAG_IPSEC_IN_CRYPTO_DONE, mtag)) {
|
|
|
|
tdbi = (struct tdb_ident *) (mtag + 1);
|
|
|
|
if (tdbi->proto == sav->sah->saidx.proto &&
|
|
|
|
tdbi->spi == sav->spi &&
|
|
|
|
!bcmp(&tdbi->dst, &sav->sah->saidx.dst,
|
|
|
|
sizeof (union sockaddr_union)))
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Allocate IPsec-specific opaque crypto info. */
|
|
|
|
if (mtag == NULL) {
|
|
|
|
tc = (struct tdb_crypto *) malloc(sizeof (struct tdb_crypto) +
|
|
|
|
skip + rplen + authsize, M_XDATA, M_NOWAIT|M_ZERO);
|
|
|
|
} else {
|
|
|
|
/* Hash verification has already been done successfully. */
|
|
|
|
tc = (struct tdb_crypto *) malloc(sizeof (struct tdb_crypto),
|
|
|
|
M_XDATA, M_NOWAIT|M_ZERO);
|
|
|
|
}
|
|
|
|
if (tc == NULL) {
|
2003-09-29 22:57:43 +00:00
|
|
|
DPRINTF(("%s: failed to allocate tdb_crypto\n", __func__));
|
Commit step 1 of the vimage project, (network stack)
virtualization work done by Marko Zec (zec@).
This is the first in a series of commits over the course
of the next few weeks.
Mark all uses of global variables to be virtualized
with a V_ prefix.
Use macros to map them back to their global names for
now, so this is a NOP change only.
We hope to have caught at least 85-90% of what is needed
so we do not invalidate a lot of outstanding patches again.
Obtained from: //depot/projects/vimage-commit2/...
Reviewed by: brooks, des, ed, mav, julian,
jamie, kris, rwatson, zec, ...
(various people I forgot, different versions)
md5 (with a bit of help)
Sponsored by: NLnet Foundation, The FreeBSD Foundation
X-MFC after: never
V_Commit_Message_Reviewed_By: more people than the patch
2008-08-17 23:27:27 +00:00
|
|
|
V_ahstat.ahs_crypto++;
|
2002-10-16 02:10:08 +00:00
|
|
|
crypto_freereq(crp);
|
|
|
|
m_freem(m);
|
|
|
|
return ENOBUFS;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Only save information if crypto processing is needed. */
|
|
|
|
if (mtag == NULL) {
|
|
|
|
int error;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Save the authenticator, the skipped portion of the packet,
|
|
|
|
* and the AH header.
|
|
|
|
*/
|
|
|
|
m_copydata(m, 0, skip + rplen + authsize, (caddr_t)(tc+1));
|
|
|
|
|
|
|
|
/* Zeroize the authenticator on the packet. */
|
|
|
|
m_copyback(m, skip + rplen, authsize, ipseczeroes);
|
|
|
|
|
|
|
|
/* "Massage" the packet headers for crypto processing. */
|
|
|
|
error = ah_massage_headers(&m, sav->sah->saidx.dst.sa.sa_family,
|
|
|
|
skip, ahx->type, 0);
|
|
|
|
if (error != 0) {
|
|
|
|
/* NB: mbuf is free'd by ah_massage_headers */
|
Commit step 1 of the vimage project, (network stack)
virtualization work done by Marko Zec (zec@).
This is the first in a series of commits over the course
of the next few weeks.
Mark all uses of global variables to be virtualized
with a V_ prefix.
Use macros to map them back to their global names for
now, so this is a NOP change only.
We hope to have caught at least 85-90% of what is needed
so we do not invalidate a lot of outstanding patches again.
Obtained from: //depot/projects/vimage-commit2/...
Reviewed by: brooks, des, ed, mav, julian,
jamie, kris, rwatson, zec, ...
(various people I forgot, different versions)
md5 (with a bit of help)
Sponsored by: NLnet Foundation, The FreeBSD Foundation
X-MFC after: never
V_Commit_Message_Reviewed_By: more people than the patch
2008-08-17 23:27:27 +00:00
|
|
|
V_ahstat.ahs_hdrops++;
|
2002-10-16 02:10:08 +00:00
|
|
|
free(tc, M_XDATA);
|
|
|
|
crypto_freereq(crp);
|
|
|
|
return error;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Crypto operation descriptor. */
|
|
|
|
crp->crp_ilen = m->m_pkthdr.len; /* Total input length. */
|
2003-06-30 05:09:32 +00:00
|
|
|
crp->crp_flags = CRYPTO_F_IMBUF | CRYPTO_F_CBIFSYNC;
|
2002-10-16 02:10:08 +00:00
|
|
|
crp->crp_buf = (caddr_t) m;
|
|
|
|
crp->crp_callback = ah_input_cb;
|
|
|
|
crp->crp_sid = sav->tdb_cryptoid;
|
|
|
|
crp->crp_opaque = (caddr_t) tc;
|
|
|
|
|
|
|
|
/* These are passed as-is to the callback. */
|
|
|
|
tc->tc_spi = sav->spi;
|
|
|
|
tc->tc_dst = sav->sah->saidx.dst;
|
|
|
|
tc->tc_proto = sav->sah->saidx.proto;
|
|
|
|
tc->tc_nxt = ah->ah_nxt;
|
|
|
|
tc->tc_protoff = protoff;
|
|
|
|
tc->tc_skip = skip;
|
|
|
|
tc->tc_ptr = (caddr_t) mtag; /* Save the mtag we've identified. */
|
|
|
|
|
|
|
|
if (mtag == NULL)
|
|
|
|
return crypto_dispatch(crp);
|
|
|
|
else
|
|
|
|
return ah_input_cb(crp);
|
|
|
|
}
|
|
|
|
|
|
|
|
#ifdef INET6
|
|
|
|
#define IPSEC_COMMON_INPUT_CB(m, sav, skip, protoff, mtag) do { \
|
|
|
|
if (saidx->dst.sa.sa_family == AF_INET6) { \
|
|
|
|
error = ipsec6_common_input_cb(m, sav, skip, protoff, mtag); \
|
|
|
|
} else { \
|
|
|
|
error = ipsec4_common_input_cb(m, sav, skip, protoff, mtag); \
|
|
|
|
} \
|
|
|
|
} while (0)
|
|
|
|
#else
|
|
|
|
#define IPSEC_COMMON_INPUT_CB(m, sav, skip, protoff, mtag) \
|
|
|
|
(error = ipsec4_common_input_cb(m, sav, skip, protoff, mtag))
|
|
|
|
#endif
|
|
|
|
|
|
|
|
/*
|
|
|
|
* AH input callback from the crypto driver.
|
|
|
|
*/
|
|
|
|
static int
|
|
|
|
ah_input_cb(struct cryptop *crp)
|
|
|
|
{
|
Step 1.5 of importing the network stack virtualization infrastructure
from the vimage project, as per plan established at devsummit 08/08:
http://wiki.freebsd.org/Image/Notes200808DevSummit
Introduce INIT_VNET_*() initializer macros, VNET_FOREACH() iterator
macros, and CURVNET_SET() context setting macros, all currently
resolving to NOPs.
Prepare for virtualization of selected SYSCTL objects by introducing a
family of SYSCTL_V_*() macros, currently resolving to their global
counterparts, i.e. SYSCTL_V_INT() == SYSCTL_INT().
Move selected #defines from sys/sys/vimage.h to newly introduced header
files specific to virtualized subsystems (sys/net/vnet.h,
sys/netinet/vinet.h etc.).
All the changes are verified to have zero functional impact at this
point in time by doing MD5 comparision between pre- and post-change
object files(*).
(*) netipsec/keysock.c did not validate depending on compile time options.
Implemented by: julian, bz, brooks, zec
Reviewed by: julian, bz, brooks, kris, rwatson, ...
Approved by: julian (mentor)
Obtained from: //depot/projects/vimage-commit2/...
X-MFC after: never
Sponsored by: NLnet Foundation, The FreeBSD Foundation
2008-10-02 15:37:58 +00:00
|
|
|
INIT_VNET_IPSEC(curvnet);
|
2002-10-16 02:10:08 +00:00
|
|
|
int rplen, error, skip, protoff;
|
|
|
|
unsigned char calc[AH_ALEN_MAX];
|
|
|
|
struct mbuf *m;
|
|
|
|
struct cryptodesc *crd;
|
|
|
|
struct auth_hash *ahx;
|
|
|
|
struct tdb_crypto *tc;
|
|
|
|
struct m_tag *mtag;
|
|
|
|
struct secasvar *sav;
|
|
|
|
struct secasindex *saidx;
|
|
|
|
u_int8_t nxt;
|
|
|
|
caddr_t ptr;
|
2003-09-01 05:35:55 +00:00
|
|
|
int authsize;
|
2002-10-16 02:10:08 +00:00
|
|
|
|
|
|
|
crd = crp->crp_desc;
|
|
|
|
|
|
|
|
tc = (struct tdb_crypto *) crp->crp_opaque;
|
2003-09-29 22:57:43 +00:00
|
|
|
IPSEC_ASSERT(tc != NULL, ("null opaque crypto data area!"));
|
2002-10-16 02:10:08 +00:00
|
|
|
skip = tc->tc_skip;
|
|
|
|
nxt = tc->tc_nxt;
|
|
|
|
protoff = tc->tc_protoff;
|
|
|
|
mtag = (struct m_tag *) tc->tc_ptr;
|
|
|
|
m = (struct mbuf *) crp->crp_buf;
|
|
|
|
|
|
|
|
sav = KEY_ALLOCSA(&tc->tc_dst, tc->tc_proto, tc->tc_spi);
|
|
|
|
if (sav == NULL) {
|
Commit step 1 of the vimage project, (network stack)
virtualization work done by Marko Zec (zec@).
This is the first in a series of commits over the course
of the next few weeks.
Mark all uses of global variables to be virtualized
with a V_ prefix.
Use macros to map them back to their global names for
now, so this is a NOP change only.
We hope to have caught at least 85-90% of what is needed
so we do not invalidate a lot of outstanding patches again.
Obtained from: //depot/projects/vimage-commit2/...
Reviewed by: brooks, des, ed, mav, julian,
jamie, kris, rwatson, zec, ...
(various people I forgot, different versions)
md5 (with a bit of help)
Sponsored by: NLnet Foundation, The FreeBSD Foundation
X-MFC after: never
V_Commit_Message_Reviewed_By: more people than the patch
2008-08-17 23:27:27 +00:00
|
|
|
V_ahstat.ahs_notdb++;
|
2003-09-29 22:57:43 +00:00
|
|
|
DPRINTF(("%s: SA expired while in crypto\n", __func__));
|
2002-10-16 02:10:08 +00:00
|
|
|
error = ENOBUFS; /*XXX*/
|
|
|
|
goto bad;
|
|
|
|
}
|
|
|
|
|
|
|
|
saidx = &sav->sah->saidx;
|
2003-09-29 22:57:43 +00:00
|
|
|
IPSEC_ASSERT(saidx->dst.sa.sa_family == AF_INET ||
|
2002-10-16 02:10:08 +00:00
|
|
|
saidx->dst.sa.sa_family == AF_INET6,
|
2003-09-29 22:57:43 +00:00
|
|
|
("unexpected protocol family %u", saidx->dst.sa.sa_family));
|
2002-10-16 02:10:08 +00:00
|
|
|
|
|
|
|
ahx = (struct auth_hash *) sav->tdb_authalgxform;
|
|
|
|
|
|
|
|
/* Check for crypto errors. */
|
|
|
|
if (crp->crp_etype) {
|
|
|
|
if (sav->tdb_cryptoid != 0)
|
|
|
|
sav->tdb_cryptoid = crp->crp_sid;
|
|
|
|
|
2006-03-23 23:26:34 +00:00
|
|
|
if (crp->crp_etype == EAGAIN) {
|
|
|
|
error = crypto_dispatch(crp);
|
|
|
|
return error;
|
|
|
|
}
|
2002-10-16 02:10:08 +00:00
|
|
|
|
Commit step 1 of the vimage project, (network stack)
virtualization work done by Marko Zec (zec@).
This is the first in a series of commits over the course
of the next few weeks.
Mark all uses of global variables to be virtualized
with a V_ prefix.
Use macros to map them back to their global names for
now, so this is a NOP change only.
We hope to have caught at least 85-90% of what is needed
so we do not invalidate a lot of outstanding patches again.
Obtained from: //depot/projects/vimage-commit2/...
Reviewed by: brooks, des, ed, mav, julian,
jamie, kris, rwatson, zec, ...
(various people I forgot, different versions)
md5 (with a bit of help)
Sponsored by: NLnet Foundation, The FreeBSD Foundation
X-MFC after: never
V_Commit_Message_Reviewed_By: more people than the patch
2008-08-17 23:27:27 +00:00
|
|
|
V_ahstat.ahs_noxform++;
|
2003-09-29 22:57:43 +00:00
|
|
|
DPRINTF(("%s: crypto error %d\n", __func__, crp->crp_etype));
|
2002-10-16 02:10:08 +00:00
|
|
|
error = crp->crp_etype;
|
|
|
|
goto bad;
|
|
|
|
} else {
|
Commit step 1 of the vimage project, (network stack)
virtualization work done by Marko Zec (zec@).
This is the first in a series of commits over the course
of the next few weeks.
Mark all uses of global variables to be virtualized
with a V_ prefix.
Use macros to map them back to their global names for
now, so this is a NOP change only.
We hope to have caught at least 85-90% of what is needed
so we do not invalidate a lot of outstanding patches again.
Obtained from: //depot/projects/vimage-commit2/...
Reviewed by: brooks, des, ed, mav, julian,
jamie, kris, rwatson, zec, ...
(various people I forgot, different versions)
md5 (with a bit of help)
Sponsored by: NLnet Foundation, The FreeBSD Foundation
X-MFC after: never
V_Commit_Message_Reviewed_By: more people than the patch
2008-08-17 23:27:27 +00:00
|
|
|
V_ahstat.ahs_hist[sav->alg_auth]++;
|
2002-10-16 02:10:08 +00:00
|
|
|
crypto_freereq(crp); /* No longer needed. */
|
|
|
|
crp = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Shouldn't happen... */
|
|
|
|
if (m == NULL) {
|
Commit step 1 of the vimage project, (network stack)
virtualization work done by Marko Zec (zec@).
This is the first in a series of commits over the course
of the next few weeks.
Mark all uses of global variables to be virtualized
with a V_ prefix.
Use macros to map them back to their global names for
now, so this is a NOP change only.
We hope to have caught at least 85-90% of what is needed
so we do not invalidate a lot of outstanding patches again.
Obtained from: //depot/projects/vimage-commit2/...
Reviewed by: brooks, des, ed, mav, julian,
jamie, kris, rwatson, zec, ...
(various people I forgot, different versions)
md5 (with a bit of help)
Sponsored by: NLnet Foundation, The FreeBSD Foundation
X-MFC after: never
V_Commit_Message_Reviewed_By: more people than the patch
2008-08-17 23:27:27 +00:00
|
|
|
V_ahstat.ahs_crypto++;
|
2003-09-29 22:57:43 +00:00
|
|
|
DPRINTF(("%s: bogus returned buffer from crypto\n", __func__));
|
2002-10-16 02:10:08 +00:00
|
|
|
error = EINVAL;
|
|
|
|
goto bad;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Figure out header size. */
|
|
|
|
rplen = HDRSIZE(sav);
|
|
|
|
authsize = AUTHSIZE(sav);
|
|
|
|
|
|
|
|
/* Copy authenticator off the packet. */
|
|
|
|
m_copydata(m, skip + rplen, authsize, calc);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* If we have an mtag, we don't need to verify the authenticator --
|
|
|
|
* it has been verified by an IPsec-aware NIC.
|
|
|
|
*/
|
|
|
|
if (mtag == NULL) {
|
|
|
|
ptr = (caddr_t) (tc + 1);
|
|
|
|
|
|
|
|
/* Verify authenticator. */
|
|
|
|
if (bcmp(ptr + skip + rplen, calc, authsize)) {
|
2003-09-29 22:57:43 +00:00
|
|
|
DPRINTF(("%s: authentication hash mismatch for packet "
|
|
|
|
"in SA %s/%08lx\n", __func__,
|
2002-10-16 02:10:08 +00:00
|
|
|
ipsec_address(&saidx->dst),
|
|
|
|
(u_long) ntohl(sav->spi)));
|
Commit step 1 of the vimage project, (network stack)
virtualization work done by Marko Zec (zec@).
This is the first in a series of commits over the course
of the next few weeks.
Mark all uses of global variables to be virtualized
with a V_ prefix.
Use macros to map them back to their global names for
now, so this is a NOP change only.
We hope to have caught at least 85-90% of what is needed
so we do not invalidate a lot of outstanding patches again.
Obtained from: //depot/projects/vimage-commit2/...
Reviewed by: brooks, des, ed, mav, julian,
jamie, kris, rwatson, zec, ...
(various people I forgot, different versions)
md5 (with a bit of help)
Sponsored by: NLnet Foundation, The FreeBSD Foundation
X-MFC after: never
V_Commit_Message_Reviewed_By: more people than the patch
2008-08-17 23:27:27 +00:00
|
|
|
V_ahstat.ahs_badauth++;
|
2002-10-16 02:10:08 +00:00
|
|
|
error = EACCES;
|
|
|
|
goto bad;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Fix the Next Protocol field. */
|
|
|
|
((u_int8_t *) ptr)[protoff] = nxt;
|
|
|
|
|
|
|
|
/* Copyback the saved (uncooked) network headers. */
|
|
|
|
m_copyback(m, 0, skip, ptr);
|
|
|
|
} else {
|
|
|
|
/* Fix the Next Protocol field. */
|
|
|
|
m_copyback(m, protoff, sizeof(u_int8_t), &nxt);
|
|
|
|
}
|
|
|
|
|
|
|
|
free(tc, M_XDATA), tc = NULL; /* No longer needed */
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Header is now authenticated.
|
|
|
|
*/
|
|
|
|
m->m_flags |= M_AUTHIPHDR|M_AUTHIPDGM;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Update replay sequence number, if appropriate.
|
|
|
|
*/
|
|
|
|
if (sav->replay) {
|
|
|
|
u_int32_t seq;
|
|
|
|
|
|
|
|
m_copydata(m, skip + offsetof(struct newah, ah_seq),
|
|
|
|
sizeof (seq), (caddr_t) &seq);
|
|
|
|
if (ipsec_updatereplay(ntohl(seq), sav)) {
|
Commit step 1 of the vimage project, (network stack)
virtualization work done by Marko Zec (zec@).
This is the first in a series of commits over the course
of the next few weeks.
Mark all uses of global variables to be virtualized
with a V_ prefix.
Use macros to map them back to their global names for
now, so this is a NOP change only.
We hope to have caught at least 85-90% of what is needed
so we do not invalidate a lot of outstanding patches again.
Obtained from: //depot/projects/vimage-commit2/...
Reviewed by: brooks, des, ed, mav, julian,
jamie, kris, rwatson, zec, ...
(various people I forgot, different versions)
md5 (with a bit of help)
Sponsored by: NLnet Foundation, The FreeBSD Foundation
X-MFC after: never
V_Commit_Message_Reviewed_By: more people than the patch
2008-08-17 23:27:27 +00:00
|
|
|
V_ahstat.ahs_replay++;
|
2002-10-16 02:10:08 +00:00
|
|
|
error = ENOBUFS; /*XXX as above*/
|
|
|
|
goto bad;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Remove the AH header and authenticator from the mbuf.
|
|
|
|
*/
|
|
|
|
error = m_striphdr(m, skip, rplen + authsize);
|
|
|
|
if (error) {
|
2003-09-29 22:57:43 +00:00
|
|
|
DPRINTF(("%s: mangled mbuf chain for SA %s/%08lx\n", __func__,
|
2002-10-16 02:10:08 +00:00
|
|
|
ipsec_address(&saidx->dst), (u_long) ntohl(sav->spi)));
|
|
|
|
|
Commit step 1 of the vimage project, (network stack)
virtualization work done by Marko Zec (zec@).
This is the first in a series of commits over the course
of the next few weeks.
Mark all uses of global variables to be virtualized
with a V_ prefix.
Use macros to map them back to their global names for
now, so this is a NOP change only.
We hope to have caught at least 85-90% of what is needed
so we do not invalidate a lot of outstanding patches again.
Obtained from: //depot/projects/vimage-commit2/...
Reviewed by: brooks, des, ed, mav, julian,
jamie, kris, rwatson, zec, ...
(various people I forgot, different versions)
md5 (with a bit of help)
Sponsored by: NLnet Foundation, The FreeBSD Foundation
X-MFC after: never
V_Commit_Message_Reviewed_By: more people than the patch
2008-08-17 23:27:27 +00:00
|
|
|
V_ahstat.ahs_hdrops++;
|
2002-10-16 02:10:08 +00:00
|
|
|
goto bad;
|
|
|
|
}
|
|
|
|
|
|
|
|
IPSEC_COMMON_INPUT_CB(m, sav, skip, protoff, mtag);
|
|
|
|
|
|
|
|
KEY_FREESAV(&sav);
|
|
|
|
return error;
|
|
|
|
bad:
|
|
|
|
if (sav)
|
|
|
|
KEY_FREESAV(&sav);
|
|
|
|
if (m != NULL)
|
|
|
|
m_freem(m);
|
|
|
|
if (tc != NULL)
|
|
|
|
free(tc, M_XDATA);
|
|
|
|
if (crp != NULL)
|
|
|
|
crypto_freereq(crp);
|
|
|
|
return error;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* AH output routine, called by ipsec[46]_process_packet().
|
|
|
|
*/
|
|
|
|
static int
|
|
|
|
ah_output(
|
|
|
|
struct mbuf *m,
|
|
|
|
struct ipsecrequest *isr,
|
|
|
|
struct mbuf **mp,
|
|
|
|
int skip,
|
|
|
|
int protoff)
|
|
|
|
{
|
Step 1.5 of importing the network stack virtualization infrastructure
from the vimage project, as per plan established at devsummit 08/08:
http://wiki.freebsd.org/Image/Notes200808DevSummit
Introduce INIT_VNET_*() initializer macros, VNET_FOREACH() iterator
macros, and CURVNET_SET() context setting macros, all currently
resolving to NOPs.
Prepare for virtualization of selected SYSCTL objects by introducing a
family of SYSCTL_V_*() macros, currently resolving to their global
counterparts, i.e. SYSCTL_V_INT() == SYSCTL_INT().
Move selected #defines from sys/sys/vimage.h to newly introduced header
files specific to virtualized subsystems (sys/net/vnet.h,
sys/netinet/vinet.h etc.).
All the changes are verified to have zero functional impact at this
point in time by doing MD5 comparision between pre- and post-change
object files(*).
(*) netipsec/keysock.c did not validate depending on compile time options.
Implemented by: julian, bz, brooks, zec
Reviewed by: julian, bz, brooks, kris, rwatson, ...
Approved by: julian (mentor)
Obtained from: //depot/projects/vimage-commit2/...
X-MFC after: never
Sponsored by: NLnet Foundation, The FreeBSD Foundation
2008-10-02 15:37:58 +00:00
|
|
|
INIT_VNET_IPSEC(curvnet);
|
2002-10-16 02:10:08 +00:00
|
|
|
struct secasvar *sav;
|
|
|
|
struct auth_hash *ahx;
|
|
|
|
struct cryptodesc *crda;
|
|
|
|
struct tdb_crypto *tc;
|
|
|
|
struct mbuf *mi;
|
|
|
|
struct cryptop *crp;
|
|
|
|
u_int16_t iplen;
|
|
|
|
int error, rplen, authsize, maxpacketsize, roff;
|
|
|
|
u_int8_t prot;
|
|
|
|
struct newah *ah;
|
|
|
|
|
|
|
|
sav = isr->sav;
|
2003-09-29 22:57:43 +00:00
|
|
|
IPSEC_ASSERT(sav != NULL, ("null SA"));
|
2002-10-16 02:10:08 +00:00
|
|
|
ahx = sav->tdb_authalgxform;
|
2003-09-29 22:57:43 +00:00
|
|
|
IPSEC_ASSERT(ahx != NULL, ("null authentication xform"));
|
2002-10-16 02:10:08 +00:00
|
|
|
|
Commit step 1 of the vimage project, (network stack)
virtualization work done by Marko Zec (zec@).
This is the first in a series of commits over the course
of the next few weeks.
Mark all uses of global variables to be virtualized
with a V_ prefix.
Use macros to map them back to their global names for
now, so this is a NOP change only.
We hope to have caught at least 85-90% of what is needed
so we do not invalidate a lot of outstanding patches again.
Obtained from: //depot/projects/vimage-commit2/...
Reviewed by: brooks, des, ed, mav, julian,
jamie, kris, rwatson, zec, ...
(various people I forgot, different versions)
md5 (with a bit of help)
Sponsored by: NLnet Foundation, The FreeBSD Foundation
X-MFC after: never
V_Commit_Message_Reviewed_By: more people than the patch
2008-08-17 23:27:27 +00:00
|
|
|
V_ahstat.ahs_output++;
|
2002-10-16 02:10:08 +00:00
|
|
|
|
|
|
|
/* Figure out header size. */
|
|
|
|
rplen = HDRSIZE(sav);
|
|
|
|
|
|
|
|
/* Check for maximum packet size violations. */
|
|
|
|
switch (sav->sah->saidx.dst.sa.sa_family) {
|
|
|
|
#ifdef INET
|
|
|
|
case AF_INET:
|
|
|
|
maxpacketsize = IP_MAXPACKET;
|
|
|
|
break;
|
|
|
|
#endif /* INET */
|
|
|
|
#ifdef INET6
|
|
|
|
case AF_INET6:
|
|
|
|
maxpacketsize = IPV6_MAXPACKET;
|
|
|
|
break;
|
|
|
|
#endif /* INET6 */
|
|
|
|
default:
|
2003-09-29 22:57:43 +00:00
|
|
|
DPRINTF(("%s: unknown/unsupported protocol family %u, "
|
|
|
|
"SA %s/%08lx\n", __func__,
|
2002-10-16 02:10:08 +00:00
|
|
|
sav->sah->saidx.dst.sa.sa_family,
|
|
|
|
ipsec_address(&sav->sah->saidx.dst),
|
|
|
|
(u_long) ntohl(sav->spi)));
|
Commit step 1 of the vimage project, (network stack)
virtualization work done by Marko Zec (zec@).
This is the first in a series of commits over the course
of the next few weeks.
Mark all uses of global variables to be virtualized
with a V_ prefix.
Use macros to map them back to their global names for
now, so this is a NOP change only.
We hope to have caught at least 85-90% of what is needed
so we do not invalidate a lot of outstanding patches again.
Obtained from: //depot/projects/vimage-commit2/...
Reviewed by: brooks, des, ed, mav, julian,
jamie, kris, rwatson, zec, ...
(various people I forgot, different versions)
md5 (with a bit of help)
Sponsored by: NLnet Foundation, The FreeBSD Foundation
X-MFC after: never
V_Commit_Message_Reviewed_By: more people than the patch
2008-08-17 23:27:27 +00:00
|
|
|
V_ahstat.ahs_nopf++;
|
2002-10-16 02:10:08 +00:00
|
|
|
error = EPFNOSUPPORT;
|
|
|
|
goto bad;
|
|
|
|
}
|
|
|
|
authsize = AUTHSIZE(sav);
|
|
|
|
if (rplen + authsize + m->m_pkthdr.len > maxpacketsize) {
|
2003-09-29 22:57:43 +00:00
|
|
|
DPRINTF(("%s: packet in SA %s/%08lx got too big "
|
|
|
|
"(len %u, max len %u)\n", __func__,
|
2002-10-16 02:10:08 +00:00
|
|
|
ipsec_address(&sav->sah->saidx.dst),
|
|
|
|
(u_long) ntohl(sav->spi),
|
|
|
|
rplen + authsize + m->m_pkthdr.len, maxpacketsize));
|
Commit step 1 of the vimage project, (network stack)
virtualization work done by Marko Zec (zec@).
This is the first in a series of commits over the course
of the next few weeks.
Mark all uses of global variables to be virtualized
with a V_ prefix.
Use macros to map them back to their global names for
now, so this is a NOP change only.
We hope to have caught at least 85-90% of what is needed
so we do not invalidate a lot of outstanding patches again.
Obtained from: //depot/projects/vimage-commit2/...
Reviewed by: brooks, des, ed, mav, julian,
jamie, kris, rwatson, zec, ...
(various people I forgot, different versions)
md5 (with a bit of help)
Sponsored by: NLnet Foundation, The FreeBSD Foundation
X-MFC after: never
V_Commit_Message_Reviewed_By: more people than the patch
2008-08-17 23:27:27 +00:00
|
|
|
V_ahstat.ahs_toobig++;
|
2002-10-16 02:10:08 +00:00
|
|
|
error = EMSGSIZE;
|
|
|
|
goto bad;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Update the counters. */
|
Commit step 1 of the vimage project, (network stack)
virtualization work done by Marko Zec (zec@).
This is the first in a series of commits over the course
of the next few weeks.
Mark all uses of global variables to be virtualized
with a V_ prefix.
Use macros to map them back to their global names for
now, so this is a NOP change only.
We hope to have caught at least 85-90% of what is needed
so we do not invalidate a lot of outstanding patches again.
Obtained from: //depot/projects/vimage-commit2/...
Reviewed by: brooks, des, ed, mav, julian,
jamie, kris, rwatson, zec, ...
(various people I forgot, different versions)
md5 (with a bit of help)
Sponsored by: NLnet Foundation, The FreeBSD Foundation
X-MFC after: never
V_Commit_Message_Reviewed_By: more people than the patch
2008-08-17 23:27:27 +00:00
|
|
|
V_ahstat.ahs_obytes += m->m_pkthdr.len - skip;
|
2002-10-16 02:10:08 +00:00
|
|
|
|
2006-03-15 21:11:11 +00:00
|
|
|
m = m_unshare(m, M_NOWAIT);
|
2002-10-16 02:10:08 +00:00
|
|
|
if (m == NULL) {
|
2003-09-29 22:57:43 +00:00
|
|
|
DPRINTF(("%s: cannot clone mbuf chain, SA %s/%08lx\n", __func__,
|
2002-10-16 02:10:08 +00:00
|
|
|
ipsec_address(&sav->sah->saidx.dst),
|
|
|
|
(u_long) ntohl(sav->spi)));
|
Commit step 1 of the vimage project, (network stack)
virtualization work done by Marko Zec (zec@).
This is the first in a series of commits over the course
of the next few weeks.
Mark all uses of global variables to be virtualized
with a V_ prefix.
Use macros to map them back to their global names for
now, so this is a NOP change only.
We hope to have caught at least 85-90% of what is needed
so we do not invalidate a lot of outstanding patches again.
Obtained from: //depot/projects/vimage-commit2/...
Reviewed by: brooks, des, ed, mav, julian,
jamie, kris, rwatson, zec, ...
(various people I forgot, different versions)
md5 (with a bit of help)
Sponsored by: NLnet Foundation, The FreeBSD Foundation
X-MFC after: never
V_Commit_Message_Reviewed_By: more people than the patch
2008-08-17 23:27:27 +00:00
|
|
|
V_ahstat.ahs_hdrops++;
|
2002-10-16 02:10:08 +00:00
|
|
|
error = ENOBUFS;
|
|
|
|
goto bad;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Inject AH header. */
|
|
|
|
mi = m_makespace(m, skip, rplen + authsize, &roff);
|
|
|
|
if (mi == NULL) {
|
2003-09-29 22:57:43 +00:00
|
|
|
DPRINTF(("%s: failed to inject %u byte AH header for SA "
|
|
|
|
"%s/%08lx\n", __func__,
|
2002-10-16 02:10:08 +00:00
|
|
|
rplen + authsize,
|
|
|
|
ipsec_address(&sav->sah->saidx.dst),
|
|
|
|
(u_long) ntohl(sav->spi)));
|
Commit step 1 of the vimage project, (network stack)
virtualization work done by Marko Zec (zec@).
This is the first in a series of commits over the course
of the next few weeks.
Mark all uses of global variables to be virtualized
with a V_ prefix.
Use macros to map them back to their global names for
now, so this is a NOP change only.
We hope to have caught at least 85-90% of what is needed
so we do not invalidate a lot of outstanding patches again.
Obtained from: //depot/projects/vimage-commit2/...
Reviewed by: brooks, des, ed, mav, julian,
jamie, kris, rwatson, zec, ...
(various people I forgot, different versions)
md5 (with a bit of help)
Sponsored by: NLnet Foundation, The FreeBSD Foundation
X-MFC after: never
V_Commit_Message_Reviewed_By: more people than the patch
2008-08-17 23:27:27 +00:00
|
|
|
V_ahstat.ahs_hdrops++; /*XXX differs from openbsd */
|
2002-10-16 02:10:08 +00:00
|
|
|
error = ENOBUFS;
|
|
|
|
goto bad;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* The AH header is guaranteed by m_makespace() to be in
|
|
|
|
* contiguous memory, at roff bytes offset into the returned mbuf.
|
|
|
|
*/
|
|
|
|
ah = (struct newah *)(mtod(mi, caddr_t) + roff);
|
|
|
|
|
|
|
|
/* Initialize the AH header. */
|
|
|
|
m_copydata(m, protoff, sizeof(u_int8_t), (caddr_t) &ah->ah_nxt);
|
|
|
|
ah->ah_len = (rplen + authsize - sizeof(struct ah)) / sizeof(u_int32_t);
|
|
|
|
ah->ah_reserve = 0;
|
|
|
|
ah->ah_spi = sav->spi;
|
|
|
|
|
|
|
|
/* Zeroize authenticator. */
|
|
|
|
m_copyback(m, skip + rplen, authsize, ipseczeroes);
|
|
|
|
|
|
|
|
/* Insert packet replay counter, as requested. */
|
|
|
|
if (sav->replay) {
|
|
|
|
if (sav->replay->count == ~0 &&
|
|
|
|
(sav->flags & SADB_X_EXT_CYCSEQ) == 0) {
|
2003-09-29 22:57:43 +00:00
|
|
|
DPRINTF(("%s: replay counter wrapped for SA %s/%08lx\n",
|
|
|
|
__func__,
|
2002-10-16 02:10:08 +00:00
|
|
|
ipsec_address(&sav->sah->saidx.dst),
|
|
|
|
(u_long) ntohl(sav->spi)));
|
Commit step 1 of the vimage project, (network stack)
virtualization work done by Marko Zec (zec@).
This is the first in a series of commits over the course
of the next few weeks.
Mark all uses of global variables to be virtualized
with a V_ prefix.
Use macros to map them back to their global names for
now, so this is a NOP change only.
We hope to have caught at least 85-90% of what is needed
so we do not invalidate a lot of outstanding patches again.
Obtained from: //depot/projects/vimage-commit2/...
Reviewed by: brooks, des, ed, mav, julian,
jamie, kris, rwatson, zec, ...
(various people I forgot, different versions)
md5 (with a bit of help)
Sponsored by: NLnet Foundation, The FreeBSD Foundation
X-MFC after: never
V_Commit_Message_Reviewed_By: more people than the patch
2008-08-17 23:27:27 +00:00
|
|
|
V_ahstat.ahs_wrap++;
|
2002-10-16 02:10:08 +00:00
|
|
|
error = EINVAL;
|
|
|
|
goto bad;
|
|
|
|
}
|
2006-04-10 15:04:36 +00:00
|
|
|
#ifdef REGRESSION
|
2006-04-09 19:11:45 +00:00
|
|
|
/* Emulate replay attack when ipsec_replay is TRUE. */
|
Commit step 1 of the vimage project, (network stack)
virtualization work done by Marko Zec (zec@).
This is the first in a series of commits over the course
of the next few weeks.
Mark all uses of global variables to be virtualized
with a V_ prefix.
Use macros to map them back to their global names for
now, so this is a NOP change only.
We hope to have caught at least 85-90% of what is needed
so we do not invalidate a lot of outstanding patches again.
Obtained from: //depot/projects/vimage-commit2/...
Reviewed by: brooks, des, ed, mav, julian,
jamie, kris, rwatson, zec, ...
(various people I forgot, different versions)
md5 (with a bit of help)
Sponsored by: NLnet Foundation, The FreeBSD Foundation
X-MFC after: never
V_Commit_Message_Reviewed_By: more people than the patch
2008-08-17 23:27:27 +00:00
|
|
|
if (!V_ipsec_replay)
|
2006-04-10 15:04:36 +00:00
|
|
|
#endif
|
2006-04-09 19:11:45 +00:00
|
|
|
sav->replay->count++;
|
2002-10-16 02:10:08 +00:00
|
|
|
ah->ah_seq = htonl(sav->replay->count);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Get crypto descriptors. */
|
|
|
|
crp = crypto_getreq(1);
|
|
|
|
if (crp == NULL) {
|
2003-09-29 22:57:43 +00:00
|
|
|
DPRINTF(("%s: failed to acquire crypto descriptors\n",
|
|
|
|
__func__));
|
Commit step 1 of the vimage project, (network stack)
virtualization work done by Marko Zec (zec@).
This is the first in a series of commits over the course
of the next few weeks.
Mark all uses of global variables to be virtualized
with a V_ prefix.
Use macros to map them back to their global names for
now, so this is a NOP change only.
We hope to have caught at least 85-90% of what is needed
so we do not invalidate a lot of outstanding patches again.
Obtained from: //depot/projects/vimage-commit2/...
Reviewed by: brooks, des, ed, mav, julian,
jamie, kris, rwatson, zec, ...
(various people I forgot, different versions)
md5 (with a bit of help)
Sponsored by: NLnet Foundation, The FreeBSD Foundation
X-MFC after: never
V_Commit_Message_Reviewed_By: more people than the patch
2008-08-17 23:27:27 +00:00
|
|
|
V_ahstat.ahs_crypto++;
|
2002-10-16 02:10:08 +00:00
|
|
|
error = ENOBUFS;
|
|
|
|
goto bad;
|
|
|
|
}
|
|
|
|
|
|
|
|
crda = crp->crp_desc;
|
|
|
|
|
|
|
|
crda->crd_skip = 0;
|
|
|
|
crda->crd_inject = skip + rplen;
|
|
|
|
crda->crd_len = m->m_pkthdr.len;
|
|
|
|
|
|
|
|
/* Authentication operation. */
|
|
|
|
crda->crd_alg = ahx->type;
|
2006-03-25 13:38:52 +00:00
|
|
|
crda->crd_key = sav->key_auth->key_data;
|
2002-10-16 02:10:08 +00:00
|
|
|
crda->crd_klen = _KEYBITS(sav->key_auth);
|
|
|
|
|
|
|
|
/* Allocate IPsec-specific opaque crypto info. */
|
|
|
|
tc = (struct tdb_crypto *) malloc(
|
|
|
|
sizeof(struct tdb_crypto) + skip, M_XDATA, M_NOWAIT|M_ZERO);
|
|
|
|
if (tc == NULL) {
|
|
|
|
crypto_freereq(crp);
|
2003-09-29 22:57:43 +00:00
|
|
|
DPRINTF(("%s: failed to allocate tdb_crypto\n", __func__));
|
Commit step 1 of the vimage project, (network stack)
virtualization work done by Marko Zec (zec@).
This is the first in a series of commits over the course
of the next few weeks.
Mark all uses of global variables to be virtualized
with a V_ prefix.
Use macros to map them back to their global names for
now, so this is a NOP change only.
We hope to have caught at least 85-90% of what is needed
so we do not invalidate a lot of outstanding patches again.
Obtained from: //depot/projects/vimage-commit2/...
Reviewed by: brooks, des, ed, mav, julian,
jamie, kris, rwatson, zec, ...
(various people I forgot, different versions)
md5 (with a bit of help)
Sponsored by: NLnet Foundation, The FreeBSD Foundation
X-MFC after: never
V_Commit_Message_Reviewed_By: more people than the patch
2008-08-17 23:27:27 +00:00
|
|
|
V_ahstat.ahs_crypto++;
|
2002-10-16 02:10:08 +00:00
|
|
|
error = ENOBUFS;
|
|
|
|
goto bad;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Save the skipped portion of the packet. */
|
|
|
|
m_copydata(m, 0, skip, (caddr_t) (tc + 1));
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Fix IP header length on the header used for
|
|
|
|
* authentication. We don't need to fix the original
|
|
|
|
* header length as it will be fixed by our caller.
|
|
|
|
*/
|
|
|
|
switch (sav->sah->saidx.dst.sa.sa_family) {
|
|
|
|
#ifdef INET
|
|
|
|
case AF_INET:
|
|
|
|
bcopy(((caddr_t)(tc + 1)) +
|
|
|
|
offsetof(struct ip, ip_len),
|
|
|
|
(caddr_t) &iplen, sizeof(u_int16_t));
|
|
|
|
iplen = htons(ntohs(iplen) + rplen + authsize);
|
|
|
|
m_copyback(m, offsetof(struct ip, ip_len),
|
|
|
|
sizeof(u_int16_t), (caddr_t) &iplen);
|
|
|
|
break;
|
|
|
|
#endif /* INET */
|
|
|
|
|
|
|
|
#ifdef INET6
|
|
|
|
case AF_INET6:
|
|
|
|
bcopy(((caddr_t)(tc + 1)) +
|
|
|
|
offsetof(struct ip6_hdr, ip6_plen),
|
|
|
|
(caddr_t) &iplen, sizeof(u_int16_t));
|
|
|
|
iplen = htons(ntohs(iplen) + rplen + authsize);
|
|
|
|
m_copyback(m, offsetof(struct ip6_hdr, ip6_plen),
|
|
|
|
sizeof(u_int16_t), (caddr_t) &iplen);
|
|
|
|
break;
|
|
|
|
#endif /* INET6 */
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Fix the Next Header field in saved header. */
|
|
|
|
((u_int8_t *) (tc + 1))[protoff] = IPPROTO_AH;
|
|
|
|
|
|
|
|
/* Update the Next Protocol field in the IP header. */
|
|
|
|
prot = IPPROTO_AH;
|
|
|
|
m_copyback(m, protoff, sizeof(u_int8_t), (caddr_t) &prot);
|
|
|
|
|
|
|
|
/* "Massage" the packet headers for crypto processing. */
|
|
|
|
error = ah_massage_headers(&m, sav->sah->saidx.dst.sa.sa_family,
|
|
|
|
skip, ahx->type, 1);
|
|
|
|
if (error != 0) {
|
|
|
|
m = NULL; /* mbuf was free'd by ah_massage_headers. */
|
|
|
|
free(tc, M_XDATA);
|
|
|
|
crypto_freereq(crp);
|
|
|
|
goto bad;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Crypto operation descriptor. */
|
|
|
|
crp->crp_ilen = m->m_pkthdr.len; /* Total input length. */
|
2003-06-30 05:09:32 +00:00
|
|
|
crp->crp_flags = CRYPTO_F_IMBUF | CRYPTO_F_CBIFSYNC;
|
2002-10-16 02:10:08 +00:00
|
|
|
crp->crp_buf = (caddr_t) m;
|
|
|
|
crp->crp_callback = ah_output_cb;
|
|
|
|
crp->crp_sid = sav->tdb_cryptoid;
|
|
|
|
crp->crp_opaque = (caddr_t) tc;
|
|
|
|
|
|
|
|
/* These are passed as-is to the callback. */
|
|
|
|
tc->tc_isr = isr;
|
|
|
|
tc->tc_spi = sav->spi;
|
|
|
|
tc->tc_dst = sav->sah->saidx.dst;
|
|
|
|
tc->tc_proto = sav->sah->saidx.proto;
|
|
|
|
tc->tc_skip = skip;
|
|
|
|
tc->tc_protoff = protoff;
|
|
|
|
|
|
|
|
return crypto_dispatch(crp);
|
|
|
|
bad:
|
|
|
|
if (m)
|
|
|
|
m_freem(m);
|
|
|
|
return (error);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* AH output callback from the crypto driver.
|
|
|
|
*/
|
|
|
|
static int
|
|
|
|
ah_output_cb(struct cryptop *crp)
|
|
|
|
{
|
Step 1.5 of importing the network stack virtualization infrastructure
from the vimage project, as per plan established at devsummit 08/08:
http://wiki.freebsd.org/Image/Notes200808DevSummit
Introduce INIT_VNET_*() initializer macros, VNET_FOREACH() iterator
macros, and CURVNET_SET() context setting macros, all currently
resolving to NOPs.
Prepare for virtualization of selected SYSCTL objects by introducing a
family of SYSCTL_V_*() macros, currently resolving to their global
counterparts, i.e. SYSCTL_V_INT() == SYSCTL_INT().
Move selected #defines from sys/sys/vimage.h to newly introduced header
files specific to virtualized subsystems (sys/net/vnet.h,
sys/netinet/vinet.h etc.).
All the changes are verified to have zero functional impact at this
point in time by doing MD5 comparision between pre- and post-change
object files(*).
(*) netipsec/keysock.c did not validate depending on compile time options.
Implemented by: julian, bz, brooks, zec
Reviewed by: julian, bz, brooks, kris, rwatson, ...
Approved by: julian (mentor)
Obtained from: //depot/projects/vimage-commit2/...
X-MFC after: never
Sponsored by: NLnet Foundation, The FreeBSD Foundation
2008-10-02 15:37:58 +00:00
|
|
|
INIT_VNET_IPSEC(curvnet);
|
2002-10-16 02:10:08 +00:00
|
|
|
int skip, protoff, error;
|
|
|
|
struct tdb_crypto *tc;
|
|
|
|
struct ipsecrequest *isr;
|
|
|
|
struct secasvar *sav;
|
|
|
|
struct mbuf *m;
|
|
|
|
caddr_t ptr;
|
2003-09-01 05:35:55 +00:00
|
|
|
int err;
|
2002-10-16 02:10:08 +00:00
|
|
|
|
|
|
|
tc = (struct tdb_crypto *) crp->crp_opaque;
|
2003-09-29 22:57:43 +00:00
|
|
|
IPSEC_ASSERT(tc != NULL, ("null opaque data area!"));
|
2002-10-16 02:10:08 +00:00
|
|
|
skip = tc->tc_skip;
|
|
|
|
protoff = tc->tc_protoff;
|
|
|
|
ptr = (caddr_t) (tc + 1);
|
|
|
|
m = (struct mbuf *) crp->crp_buf;
|
|
|
|
|
|
|
|
isr = tc->tc_isr;
|
2003-09-29 22:57:43 +00:00
|
|
|
IPSECREQUEST_LOCK(isr);
|
2002-10-16 02:10:08 +00:00
|
|
|
sav = KEY_ALLOCSA(&tc->tc_dst, tc->tc_proto, tc->tc_spi);
|
|
|
|
if (sav == NULL) {
|
Commit step 1 of the vimage project, (network stack)
virtualization work done by Marko Zec (zec@).
This is the first in a series of commits over the course
of the next few weeks.
Mark all uses of global variables to be virtualized
with a V_ prefix.
Use macros to map them back to their global names for
now, so this is a NOP change only.
We hope to have caught at least 85-90% of what is needed
so we do not invalidate a lot of outstanding patches again.
Obtained from: //depot/projects/vimage-commit2/...
Reviewed by: brooks, des, ed, mav, julian,
jamie, kris, rwatson, zec, ...
(various people I forgot, different versions)
md5 (with a bit of help)
Sponsored by: NLnet Foundation, The FreeBSD Foundation
X-MFC after: never
V_Commit_Message_Reviewed_By: more people than the patch
2008-08-17 23:27:27 +00:00
|
|
|
V_ahstat.ahs_notdb++;
|
2003-09-29 22:57:43 +00:00
|
|
|
DPRINTF(("%s: SA expired while in crypto\n", __func__));
|
2002-10-16 02:10:08 +00:00
|
|
|
error = ENOBUFS; /*XXX*/
|
|
|
|
goto bad;
|
|
|
|
}
|
2003-09-29 22:57:43 +00:00
|
|
|
IPSEC_ASSERT(isr->sav == sav, ("SA changed\n"));
|
2002-10-16 02:10:08 +00:00
|
|
|
|
|
|
|
/* Check for crypto errors. */
|
|
|
|
if (crp->crp_etype) {
|
|
|
|
if (sav->tdb_cryptoid != 0)
|
|
|
|
sav->tdb_cryptoid = crp->crp_sid;
|
|
|
|
|
|
|
|
if (crp->crp_etype == EAGAIN) {
|
|
|
|
KEY_FREESAV(&sav);
|
2003-09-29 22:57:43 +00:00
|
|
|
IPSECREQUEST_UNLOCK(isr);
|
2006-03-23 23:26:34 +00:00
|
|
|
error = crypto_dispatch(crp);
|
|
|
|
return error;
|
2002-10-16 02:10:08 +00:00
|
|
|
}
|
|
|
|
|
Commit step 1 of the vimage project, (network stack)
virtualization work done by Marko Zec (zec@).
This is the first in a series of commits over the course
of the next few weeks.
Mark all uses of global variables to be virtualized
with a V_ prefix.
Use macros to map them back to their global names for
now, so this is a NOP change only.
We hope to have caught at least 85-90% of what is needed
so we do not invalidate a lot of outstanding patches again.
Obtained from: //depot/projects/vimage-commit2/...
Reviewed by: brooks, des, ed, mav, julian,
jamie, kris, rwatson, zec, ...
(various people I forgot, different versions)
md5 (with a bit of help)
Sponsored by: NLnet Foundation, The FreeBSD Foundation
X-MFC after: never
V_Commit_Message_Reviewed_By: more people than the patch
2008-08-17 23:27:27 +00:00
|
|
|
V_ahstat.ahs_noxform++;
|
2003-09-29 22:57:43 +00:00
|
|
|
DPRINTF(("%s: crypto error %d\n", __func__, crp->crp_etype));
|
2002-10-16 02:10:08 +00:00
|
|
|
error = crp->crp_etype;
|
|
|
|
goto bad;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Shouldn't happen... */
|
|
|
|
if (m == NULL) {
|
Commit step 1 of the vimage project, (network stack)
virtualization work done by Marko Zec (zec@).
This is the first in a series of commits over the course
of the next few weeks.
Mark all uses of global variables to be virtualized
with a V_ prefix.
Use macros to map them back to their global names for
now, so this is a NOP change only.
We hope to have caught at least 85-90% of what is needed
so we do not invalidate a lot of outstanding patches again.
Obtained from: //depot/projects/vimage-commit2/...
Reviewed by: brooks, des, ed, mav, julian,
jamie, kris, rwatson, zec, ...
(various people I forgot, different versions)
md5 (with a bit of help)
Sponsored by: NLnet Foundation, The FreeBSD Foundation
X-MFC after: never
V_Commit_Message_Reviewed_By: more people than the patch
2008-08-17 23:27:27 +00:00
|
|
|
V_ahstat.ahs_crypto++;
|
2003-09-29 22:57:43 +00:00
|
|
|
DPRINTF(("%s: bogus returned buffer from crypto\n", __func__));
|
2002-10-16 02:10:08 +00:00
|
|
|
error = EINVAL;
|
|
|
|
goto bad;
|
|
|
|
}
|
Commit step 1 of the vimage project, (network stack)
virtualization work done by Marko Zec (zec@).
This is the first in a series of commits over the course
of the next few weeks.
Mark all uses of global variables to be virtualized
with a V_ prefix.
Use macros to map them back to their global names for
now, so this is a NOP change only.
We hope to have caught at least 85-90% of what is needed
so we do not invalidate a lot of outstanding patches again.
Obtained from: //depot/projects/vimage-commit2/...
Reviewed by: brooks, des, ed, mav, julian,
jamie, kris, rwatson, zec, ...
(various people I forgot, different versions)
md5 (with a bit of help)
Sponsored by: NLnet Foundation, The FreeBSD Foundation
X-MFC after: never
V_Commit_Message_Reviewed_By: more people than the patch
2008-08-17 23:27:27 +00:00
|
|
|
V_ahstat.ahs_hist[sav->alg_auth]++;
|
2002-10-16 02:10:08 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Copy original headers (with the new protocol number) back
|
|
|
|
* in place.
|
|
|
|
*/
|
|
|
|
m_copyback(m, 0, skip, ptr);
|
|
|
|
|
|
|
|
/* No longer needed. */
|
|
|
|
free(tc, M_XDATA);
|
|
|
|
crypto_freereq(crp);
|
|
|
|
|
2006-04-10 15:04:36 +00:00
|
|
|
#ifdef REGRESSION
|
2006-04-09 19:11:45 +00:00
|
|
|
/* Emulate man-in-the-middle attack when ipsec_integrity is TRUE. */
|
Commit step 1 of the vimage project, (network stack)
virtualization work done by Marko Zec (zec@).
This is the first in a series of commits over the course
of the next few weeks.
Mark all uses of global variables to be virtualized
with a V_ prefix.
Use macros to map them back to their global names for
now, so this is a NOP change only.
We hope to have caught at least 85-90% of what is needed
so we do not invalidate a lot of outstanding patches again.
Obtained from: //depot/projects/vimage-commit2/...
Reviewed by: brooks, des, ed, mav, julian,
jamie, kris, rwatson, zec, ...
(various people I forgot, different versions)
md5 (with a bit of help)
Sponsored by: NLnet Foundation, The FreeBSD Foundation
X-MFC after: never
V_Commit_Message_Reviewed_By: more people than the patch
2008-08-17 23:27:27 +00:00
|
|
|
if (V_ipsec_integrity) {
|
2006-04-09 19:11:45 +00:00
|
|
|
int alen;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Corrupt HMAC if we want to test integrity verification of
|
|
|
|
* the other side.
|
|
|
|
*/
|
|
|
|
alen = AUTHSIZE(sav);
|
|
|
|
m_copyback(m, m->m_pkthdr.len - alen, alen, ipseczeroes);
|
|
|
|
}
|
2006-04-10 15:04:36 +00:00
|
|
|
#endif
|
2006-04-09 19:11:45 +00:00
|
|
|
|
2002-10-16 02:10:08 +00:00
|
|
|
/* NB: m is reclaimed by ipsec_process_done. */
|
|
|
|
err = ipsec_process_done(m, isr);
|
|
|
|
KEY_FREESAV(&sav);
|
2003-09-29 22:57:43 +00:00
|
|
|
IPSECREQUEST_UNLOCK(isr);
|
2002-10-16 02:10:08 +00:00
|
|
|
return err;
|
|
|
|
bad:
|
|
|
|
if (sav)
|
|
|
|
KEY_FREESAV(&sav);
|
2003-09-29 22:57:43 +00:00
|
|
|
IPSECREQUEST_UNLOCK(isr);
|
2002-10-16 02:10:08 +00:00
|
|
|
if (m)
|
|
|
|
m_freem(m);
|
|
|
|
free(tc, M_XDATA);
|
|
|
|
crypto_freereq(crp);
|
|
|
|
return error;
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct xformsw ah_xformsw = {
|
|
|
|
XF_AH, XFT_AUTH, "IPsec AH",
|
|
|
|
ah_init, ah_zeroize, ah_input, ah_output,
|
|
|
|
};
|
|
|
|
|
|
|
|
static void
|
|
|
|
ah_attach(void)
|
|
|
|
{
|
|
|
|
xform_register(&ah_xformsw);
|
|
|
|
}
|
|
|
|
SYSINIT(ah_xform_init, SI_SUB_PROTO_DOMAIN, SI_ORDER_MIDDLE, ah_attach, NULL);
|