From 33c0ec5439317f6a4ba98e84b91ffdb78e859171 Mon Sep 17 00:00:00 2001 From: Steffen Klassert Date: Wed, 7 Oct 2009 22:49:57 +0000 Subject: [PATCH] --- yaml --- r: 170736 b: refs/heads/master c: 2ad9afbf5ca27482aa275de517261d56fd1e7ba0 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/net/ah.h | 29 +++-------------------------- 2 files changed, 4 insertions(+), 27 deletions(-) diff --git a/[refs] b/[refs] index 75ac73160287..9c4363850e35 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8631e9bdfea189b2e5efe3b03825cc24ebb6cfb7 +refs/heads/master: 2ad9afbf5ca27482aa275de517261d56fd1e7ba0 diff --git a/trunk/include/net/ah.h b/trunk/include/net/ah.h index 7ac52214ba0f..7573a7152a72 100644 --- a/trunk/include/net/ah.h +++ b/trunk/include/net/ah.h @@ -1,44 +1,21 @@ #ifndef _NET_AH_H #define _NET_AH_H -#include -#include +#include /* 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)