From: Steffen Klassert <steffen.klassert@secunet•com>
To: David Miller <davem@davemloft•net>,
Herbert Xu <herbert@gondor•apana.org.au>
Cc: netdev@vger•kernel.org
Subject: [PATCH 4/5] ah: Remove obsolete code
Date: Thu, 8 Oct 2009 10:49:57 +0200 [thread overview]
Message-ID: <20091008084957.GN15653@secunet.com> (raw)
In-Reply-To: <20091008084631.GJ15653@secunet.com>
ah4 and ah6 are converted to ahash now, so we can remove the
code for the obsolete hash algorithm.
Signed-off-by: Steffen Klassert <steffen.klassert@secunet•com>
---
include/net/ah.h | 29 +++--------------------------
1 files changed, 3 insertions(+), 26 deletions(-)
diff --git a/include/net/ah.h b/include/net/ah.h
index 7ac5221..7573a71 100644
--- a/include/net/ah.h
+++ b/include/net/ah.h
@@ -1,44 +1,21 @@
#ifndef _NET_AH_H
#define _NET_AH_H
-#include <linux/crypto.h>
-#include <net/xfrm.h>
+#include <linux/skbuff.h>
/* This is the maximum truncated ICV length that we know of. */
#define MAX_AH_AUTH_LEN 12
+struct crypto_ahash;
+
struct ah_data
{
- u8 *work_icv;
int icv_full_len;
int icv_trunc_len;
- struct crypto_hash *tfm;
struct crypto_ahash *ahash;
};
-static inline int ah_mac_digest(struct ah_data *ahp, struct sk_buff *skb,
- u8 *auth_data)
-{
- struct hash_desc desc;
- int err;
-
- desc.tfm = ahp->tfm;
- desc.flags = 0;
-
- memset(auth_data, 0, ahp->icv_trunc_len);
- err = crypto_hash_init(&desc);
- if (unlikely(err))
- goto out;
- err = skb_icv_walk(skb, &desc, 0, skb->len, crypto_hash_update);
- if (unlikely(err))
- goto out;
- err = crypto_hash_final(&desc, ahp->work_icv);
-
-out:
- return err;
-}
-
struct ip_auth_hdr;
static inline struct ip_auth_hdr *ip_auth_hdr(const struct sk_buff *skb)
--
1.5.4.2
next prev parent reply other threads:[~2009-10-08 8:50 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-10-08 8:46 [PATCH 0/5] IPsec: convert to ahash Steffen Klassert
2009-10-08 8:47 ` [PATCH 1/5] ah: Add struct crypto_ahash to ah_data Steffen Klassert
2009-10-08 8:48 ` [PATCH 2/5] ah4: convert to ahash Steffen Klassert
2009-10-08 8:49 ` [PATCH 3/5] ah6: " Steffen Klassert
2009-10-08 8:49 ` Steffen Klassert [this message]
2009-10-08 8:50 ` [PATCH 5/5] xfrm: remove skb_icv_walk Steffen Klassert
2009-10-19 4:34 ` [PATCH 0/5] IPsec: convert to ahash David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20091008084957.GN15653@secunet.com \
--to=steffen.klassert@secunet$(echo .)com \
--cc=davem@davemloft$(echo .)net \
--cc=herbert@gondor$(echo .)apana.org.au \
--cc=netdev@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox