diff options
| -rw-r--r-- | crypto/authenc.c | 3 | ||||
| -rw-r--r-- | crypto/blkcipher.c | 2 | ||||
| -rw-r--r-- | crypto/digest.c | 3 | ||||
| -rw-r--r-- | crypto/gcm.c | 3 | ||||
| -rw-r--r-- | crypto/internal.h | 29 | ||||
| -rw-r--r-- | crypto/scatterwalk.c | 5 | ||||
| -rw-r--r-- | crypto/xcbc.c | 2 | ||||
| -rw-r--r-- | include/crypto/scatterwalk.h (renamed from crypto/scatterwalk.h) | 36 |
8 files changed, 42 insertions, 41 deletions
diff --git a/crypto/authenc.c b/crypto/authenc.c index 6c9104ebf2f..fbbc2b505a2 100644 --- a/crypto/authenc.c +++ b/crypto/authenc.c @@ -12,6 +12,7 @@ #include <crypto/algapi.h> #include <crypto/authenc.h> +#include <crypto/scatterwalk.h> #include <linux/err.h> #include <linux/init.h> #include <linux/kernel.h> @@ -20,8 +21,6 @@ #include <linux/slab.h> #include <linux/spinlock.h> -#include "scatterwalk.h" - struct authenc_instance_ctx { struct crypto_spawn auth; struct crypto_spawn enc; diff --git a/crypto/blkcipher.c b/crypto/blkcipher.c index 180d9145147..7939504dfd8 100644 --- a/crypto/blkcipher.c +++ b/crypto/blkcipher.c @@ -14,6 +14,7 @@ * */ +#include <crypto/scatterwalk.h> #include <linux/crypto.h> #include <linux/errno.h> #include <linux/hardirq.h> @@ -25,7 +26,6 @@ #include <linux/string.h> #include "internal.h" -#include "scatterwalk.h" enum { BLKCIPHER_WALK_PHYS = 1 << 0, diff --git a/crypto/digest.c b/crypto/digest.c index d3e827a141f..52845f53f8e 100644 --- a/crypto/digest.c +++ b/crypto/digest.c @@ -12,6 +12,7 @@ * */ +#include <crypto/scatterwalk.h> #include <linux/mm.h> #include <linux/errno.h> #include <linux/hardirq.h> @@ -20,8 +21,6 @@ #include <linux/module.h> #include <linux/scatterlist.h> -#include "internal.h" - static int init(struct hash_desc *desc) { struct crypto_tfm *tfm = crypto_hash_tfm(desc->tfm); diff --git a/crypto/gcm.c b/crypto/gcm.c index d60c340b0b9..27483f361e8 100644 --- a/crypto/gcm.c +++ b/crypto/gcm.c @@ -10,13 +10,14 @@ #include <crypto/algapi.h> #include <crypto/gf128mul.h> +#include <crypto/scatterwalk.h> #include <linux/err.h> #include <linux/init.h> #include <linux/kernel.h> #include <linux/module.h> #include <linux/slab.h> -#include "scatterwalk.h" +#include "internal.h" struct gcm_instance_ctx { struct crypto_spawn ctr; diff --git a/crypto/internal.h b/crypto/internal.h index abb01f71f81..cb13952f82b 100644 --- a/crypto/internal.h +++ b/crypto/internal.h @@ -25,7 +25,6 @@ #include <linux/notifier.h> #include <linux/rwsem.h> #include <linux/slab.h> -#include <asm/kmap_types.h> /* Crypto notification events. */ enum { @@ -50,34 +49,6 @@ extern struct list_head crypto_alg_list; extern struct rw_semaphore crypto_alg_sem; extern struct blocking_notifier_head crypto_chain; -static inline enum km_type crypto_kmap_type(int out) -{ - enum km_type type; - - if (in_softirq()) - type = out * (KM_SOFTIRQ1 - KM_SOFTIRQ0) + KM_SOFTIRQ0; - else - type = out * (KM_USER1 - KM_USER0) + KM_USER0; - - return type; -} - -static inline void *crypto_kmap(struct page *page, int out) -{ - return kmap_atomic(page, crypto_kmap_type(out)); -} - -static inline void crypto_kunmap(void *vaddr, int out) -{ - kunmap_atomic(vaddr, crypto_kmap_type(out)); -} - -static inline void crypto_yield(u32 flags) -{ - if (flags & CRYPTO_TFM_REQ_MAY_SLEEP) - cond_resched(); -} - #ifdef CONFIG_PROC_FS void __init crypto_init_proc(void); void __exit crypto_exit_proc(void); diff --git a/crypto/scatterwalk.c b/crypto/scatterwalk.c index 206c39a97e5..12d19019e17 100644 --- a/crypto/scatterwalk.c +++ b/crypto/scatterwalk.c @@ -13,6 +13,8 @@ * any later version. * */ + +#include <crypto/scatterwalk.h> #include <linux/kernel.h> #include <linux/mm.h> #include <linux/module.h> @@ -20,9 +22,6 @@ #include <linux/highmem.h> #include <linux/scatterlist.h> -#include "internal.h" -#include "scatterwalk.h" - static inline void memcpy_dir(void *buf, void *sgdata, size_t nbytes, int out) { void *src = out ? buf : sgdata; diff --git a/crypto/xcbc.c b/crypto/xcbc.c index ac68f3b62fd..789cdeee6b7 100644 --- a/crypto/xcbc.c +++ b/crypto/xcbc.c @@ -19,6 +19,7 @@ * Kazunori Miyazawa <miyazawa@linux-ipv6.org> */ +#include <crypto/scatterwalk.h> #include <linux/crypto.h> #include <linux/err.h> #include <linux/hardirq.h> @@ -27,7 +28,6 @@ #include <linux/rtnetlink.h> #include <linux/slab.h> #include <linux/scatterlist.h> -#include "internal.h" static u_int32_t ks[12] = {0x01010101, 0x01010101, 0x01010101, 0x01010101, 0x02020202, 0x02020202, 0x02020202, 0x02020202, diff --git a/crypto/scatterwalk.h b/include/crypto/scatterwalk.h index fd5517d2a7a..07b6f17122d 100644 --- a/crypto/scatterwalk.h +++ b/include/crypto/scatterwalk.h @@ -1,9 +1,10 @@ /* - * Cryptographic API. + * Cryptographic scatter and gather helpers. * * Copyright (c) 2002 James Morris <jmorris@intercode.com.au> * Copyright (c) 2002 Adam J. Richter <adam@yggdrasil.com> * Copyright (c) 2004 Jean-Luc Cooke <jlcooke@certainkey.com> + * Copyright (c) 2007 Herbert Xu <herbert@gondor.apana.org.au> * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the Free @@ -15,10 +16,41 @@ #ifndef _CRYPTO_SCATTERWALK_H #define _CRYPTO_SCATTERWALK_H +#include <asm/kmap_types.h> +#include <crypto/algapi.h> +#include <linux/hardirq.h> +#include <linux/highmem.h> +#include <linux/kernel.h> #include <linux/mm.h> #include <linux/scatterlist.h> -#include "internal.h" +static inline enum km_type crypto_kmap_type(int out) +{ + enum km_type type; + + if (in_softirq()) + type = out * (KM_SOFTIRQ1 - KM_SOFTIRQ0) + KM_SOFTIRQ0; + else + type = out * (KM_USER1 - KM_USER0) + KM_USER0; + + return type; +} + +static inline void *crypto_kmap(struct page *page, int out) +{ + return kmap_atomic(page, crypto_kmap_type(out)); +} + +static inline void crypto_kunmap(void *vaddr, int out) +{ + kunmap_atomic(vaddr, crypto_kmap_type(out)); +} + +static inline void crypto_yield(u32 flags) +{ + if (flags & CRYPTO_TFM_REQ_MAY_SLEEP) + cond_resched(); +} static inline unsigned long scatterwalk_samebuf(struct scatter_walk *walk_in, struct scatter_walk *walk_out) |