diff options
author | George V. Neville-Neil <gnn@FreeBSD.org> | 2006-03-25 13:38:52 +0000 |
---|---|---|
committer | George V. Neville-Neil <gnn@FreeBSD.org> | 2006-03-25 13:38:52 +0000 |
commit | a0196c3c891ccf2ee88854f9798fd8e44d0e9f16 (patch) | |
tree | 2b149a120744f65bc133e9267addbdcd67b8b9cd /sys/netipsec/xform_ah.c | |
parent | 90d1d883e9bc2fda7a740176e14220e08a705d0e (diff) | |
download | src-a0196c3c891ccf2ee88854f9798fd8e44d0e9f16.tar.gz src-a0196c3c891ccf2ee88854f9798fd8e44d0e9f16.zip |
First steps towards IPSec cleanup.
Make the kernel side of FAST_IPSEC not depend on the shared
structures defined in /usr/include/net/pfkeyv2.h The kernel now
defines all the necessary in kernel structures in sys/netipsec/keydb.h
and does the proper massaging when moving messages around.
Sponsored By: Secure Computing
Notes
Notes:
svn path=/head/; revision=157123
Diffstat (limited to 'sys/netipsec/xform_ah.c')
-rw-r--r-- | sys/netipsec/xform_ah.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/netipsec/xform_ah.c b/sys/netipsec/xform_ah.c index 862134f78fa2..e3da57883465 100644 --- a/sys/netipsec/xform_ah.c +++ b/sys/netipsec/xform_ah.c @@ -201,7 +201,7 @@ ah_init0(struct secasvar *sav, struct xformsw *xsp, struct cryptoini *cria) bzero(cria, sizeof (*cria)); cria->cri_alg = sav->tdb_authalgxform->type; cria->cri_klen = _KEYBITS(sav->key_auth); - cria->cri_key = _KEYBUF(sav->key_auth); + cria->cri_key = sav->key_auth->key_data; return 0; } @@ -231,7 +231,7 @@ ah_zeroize(struct secasvar *sav) int err; if (sav->key_auth) - bzero(_KEYBUF(sav->key_auth), _KEYLEN(sav->key_auth)); + bzero(sav->key_auth->key_data, _KEYLEN(sav->key_auth)); err = crypto_freesession(sav->tdb_cryptoid); sav->tdb_cryptoid = 0; @@ -622,8 +622,8 @@ ah_input(struct mbuf *m, struct secasvar *sav, int skip, int protoff) /* Authentication operation. */ crda->crd_alg = ahx->type; - crda->crd_key = _KEYBUF(sav->key_auth); crda->crd_klen = _KEYBITS(sav->key_auth); + crda->crd_key = sav->key_auth->key_data; /* Find out if we've already done crypto. */ for (mtag = m_tag_find(m, PACKET_TAG_IPSEC_IN_CRYPTO_DONE, NULL); @@ -1020,7 +1020,7 @@ ah_output( /* Authentication operation. */ crda->crd_alg = ahx->type; - crda->crd_key = _KEYBUF(sav->key_auth); + crda->crd_key = sav->key_auth->key_data; crda->crd_klen = _KEYBITS(sav->key_auth); /* Allocate IPsec-specific opaque crypto info. */ |