diff options
| author | Angelos D. Keromytis <angelos@cvs.openbsd.org> | 2000-01-27 08:09:13 +0000 |
|---|---|---|
| committer | Angelos D. Keromytis <angelos@cvs.openbsd.org> | 2000-01-27 08:09:13 +0000 |
| commit | 98f40bbc84e70cdf4b25f5ee817c6eebe3d46a3d (patch) | |
| tree | d43e5507a833c1b2d60fea7c9e4363d15715be06 /sys/netinet/ip_xform.c | |
| parent | 95d6b976dfe454179868d92f7eab5c4bcdd4ab5a (diff) | |
Merge "old" and "new" ESP and AH in two files (one for each).
Fix a couple of buglets with ingress flow deletion.
tcpdump on enc0 should now show all outgoing packets *before* being
processed, and all incoming packets *after* being processed.
Good to be in Canada (land of the free commits).
Diffstat (limited to 'sys/netinet/ip_xform.c')
| -rw-r--r-- | sys/netinet/ip_xform.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/netinet/ip_xform.c b/sys/netinet/ip_xform.c index ef678278e62..066992e2eb6 100644 --- a/sys/netinet/ip_xform.c +++ b/sys/netinet/ip_xform.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_xform.c,v 1.4 1999/10/29 05:20:46 angelos Exp $ */ +/* $OpenBSD: ip_xform.c,v 1.5 2000/01/27 08:09:12 angelos Exp $ */ /* * The authors of this code are John Ioannidis (ji@tla.org), @@ -297,7 +297,7 @@ struct enc_xform enc_xform_skipjack = { struct auth_hash auth_hash_hmac_md5_96 = { SADB_AALG_MD5HMAC96, "HMAC-MD5-96", - MD5HMAC96_KEYSIZE, AH_MD5_ALEN, + MD5HMAC96_KEYSIZE, AH_MD5_ALEN, AH_HMAC_HASHLEN, sizeof(MD5_CTX), (void (*) (void *)) MD5Init, (void (*) (void *, u_int8_t *, u_int16_t)) MD5Update, @@ -306,7 +306,7 @@ struct auth_hash auth_hash_hmac_md5_96 = { struct auth_hash auth_hash_hmac_sha1_96 = { SADB_AALG_SHA1HMAC96, "HMAC-SHA1-96", - SHA1HMAC96_KEYSIZE, AH_SHA1_ALEN, + SHA1HMAC96_KEYSIZE, AH_SHA1_ALEN, AH_HMAC_HASHLEN, sizeof(SHA1_CTX), (void (*) (void *)) SHA1Init, (void (*) (void *, u_int8_t *, u_int16_t)) SHA1Update, @@ -315,7 +315,7 @@ struct auth_hash auth_hash_hmac_sha1_96 = { struct auth_hash auth_hash_hmac_ripemd_160_96 = { SADB_X_AALG_RIPEMD160HMAC96, "HMAC-RIPEMD-160-96", - RIPEMD160HMAC96_KEYSIZE, AH_RMD160_ALEN, + RIPEMD160HMAC96_KEYSIZE, AH_RMD160_ALEN, AH_HMAC_HASHLEN, sizeof(RMD160_CTX), (void (*)(void *)) RMD160Init, (void (*)(void *, u_int8_t *, u_int16_t)) RMD160Update, @@ -324,7 +324,7 @@ struct auth_hash auth_hash_hmac_ripemd_160_96 = { struct auth_hash auth_hash_key_md5 = { SADB_X_AALG_MD5, "Keyed MD5", - 0, AH_MD5_ALEN, + 0, AH_MD5_ALEN, AH_MD5_ALEN, sizeof(MD5_CTX), (void (*)(void *))MD5Init, (void (*)(void *, u_int8_t *, u_int16_t))MD5Update, @@ -333,7 +333,7 @@ struct auth_hash auth_hash_key_md5 = { struct auth_hash auth_hash_key_sha1 = { SADB_X_AALG_SHA1, "Keyed SHA1", - 0, AH_SHA1_ALEN, + 0, AH_SHA1_ALEN, AH_SHA1_ALEN, sizeof(SHA1_CTX), (void (*)(void *))SHA1Init, (void (*)(void *, u_int8_t *, u_int16_t))SHA1Update, |