Patched in Tegra support.

16 files changed, 25 insertions, 305 deletions

diff --git a/include/crypto/algapi.h b/include/crypto/algapi.h
index 418d270e180..59c3e5bd2c0 100644
--- a/include/crypto/algapi.h
+++ b/include/crypto/algapi.h
@@ -15,7 +15,6 @@
 #include <linux/crypto.h>
 #include <linux/list.h>
 #include <linux/kernel.h>
-#include <linux/skbuff.h>
 
 struct module;
 struct rtattr;
@@ -27,7 +26,6 @@ struct crypto_type {
         int (*init)(struct crypto_tfm *tfm, u32 type, u32 mask);
         int (*init_tfm)(struct crypto_tfm *tfm);
         void (*show)(struct seq_file *m, struct crypto_alg *alg);
-        int (*report)(struct sk_buff *skb, struct crypto_alg *alg);
         struct crypto_alg *(*lookup)(const char *name, u32 type, u32 mask);
 
         unsigned int type;
@@ -134,7 +132,6 @@ struct crypto_template *crypto_lookup_template(const char *name);
 
 int crypto_register_instance(struct crypto_template *tmpl,
                              struct crypto_instance *inst);
-int crypto_unregister_instance(struct crypto_alg *alg);
 
 int crypto_init_spawn(struct crypto_spawn *spawn, struct crypto_alg *alg,
                       struct crypto_instance *inst, u32 mask);
diff --git a/include/crypto/blowfish.h b/include/crypto/blowfish.h
deleted file mode 100644
index 1450d4a2798..00000000000
--- a/include/crypto/blowfish.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Common values for blowfish algorithms
- */
-
-#ifndef _CRYPTO_BLOWFISH_H
-#define _CRYPTO_BLOWFISH_H
-
-#include <linux/types.h>
-#include <linux/crypto.h>
-
-#define BF_BLOCK_SIZE 8
-#define BF_MIN_KEY_SIZE 4
-#define BF_MAX_KEY_SIZE 56
-
-struct bf_ctx {
-        u32 p[18];
-        u32 s[1024];
-};
-
-int blowfish_setkey(struct crypto_tfm *tfm, const u8 *key,
-                    unsigned int key_len);
-
-#endif
diff --git a/include/crypto/cast5.h b/include/crypto/cast5.h
deleted file mode 100644
index 14fbf39d638..00000000000
--- a/include/crypto/cast5.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#ifndef _CRYPTO_CAST5_H
-#define _CRYPTO_CAST5_H
-
-#include <linux/types.h>
-#include <linux/crypto.h>
-#include <crypto/cast_common.h>
-
-#define CAST5_BLOCK_SIZE 8
-#define CAST5_MIN_KEY_SIZE 5
-#define CAST5_MAX_KEY_SIZE 16
-
-struct cast5_ctx {
-        u32 Km[16];
-        u8 Kr[16];
-        int rr; /* rr ? rounds = 12 : rounds = 16; (rfc 2144) */
-};
-
-int cast5_setkey(struct crypto_tfm *tfm, const u8 *key, unsigned int keylen);
-
-void __cast5_encrypt(struct cast5_ctx *ctx, u8 *dst, const u8 *src);
-void __cast5_decrypt(struct cast5_ctx *ctx, u8 *dst, const u8 *src);
-
-#endif
diff --git a/include/crypto/cast6.h b/include/crypto/cast6.h
deleted file mode 100644
index 32b60eb8bd2..00000000000
--- a/include/crypto/cast6.h
+++ /dev/null
@@ -1,24 +0,0 @@
-#ifndef _CRYPTO_CAST6_H
-#define _CRYPTO_CAST6_H
-
-#include <linux/types.h>
-#include <linux/crypto.h>
-#include <crypto/cast_common.h>
-
-#define CAST6_BLOCK_SIZE 16
-#define CAST6_MIN_KEY_SIZE 16
-#define CAST6_MAX_KEY_SIZE 32
-
-struct cast6_ctx {
-        u32 Km[12][4];
-        u8 Kr[12][4];
-};
-
-int __cast6_setkey(struct cast6_ctx *ctx, const u8 *key,
-                   unsigned int keylen, u32 *flags);
-int cast6_setkey(struct crypto_tfm *tfm, const u8 *key, unsigned int keylen);
-
-void __cast6_encrypt(struct cast6_ctx *ctx, u8 *dst, const u8 *src);
-void __cast6_decrypt(struct cast6_ctx *ctx, u8 *dst, const u8 *src);
-
-#endif
diff --git a/include/crypto/cast_common.h b/include/crypto/cast_common.h
deleted file mode 100644
index b7df35cd9f0..00000000000
--- a/include/crypto/cast_common.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef _CRYPTO_CAST_COMMON_H
-#define _CRYPTO_CAST_COMMON_H
-
-extern const u32 cast_s1[256];
-extern const u32 cast_s2[256];
-extern const u32 cast_s3[256];
-extern const u32 cast_s4[256];
-
-#endif
diff --git a/include/crypto/internal/aead.h b/include/crypto/internal/aead.h
index 2eba340230a..d838c945575 100644
--- a/include/crypto/internal/aead.h
+++ b/include/crypto/internal/aead.h
@@ -31,8 +31,6 @@ static inline void crypto_set_aead_spawn(
         crypto_set_spawn(&spawn->base, inst);
 }
 
-struct crypto_alg *crypto_lookup_aead(const char *name, u32 type, u32 mask);
-
 int crypto_grab_aead(struct crypto_aead_spawn *spawn, const char *name,
                      u32 type, u32 mask);
 
diff --git a/include/crypto/internal/hash.h b/include/crypto/internal/hash.h
index 821eae8cbd8..5bfad8c8059 100644
--- a/include/crypto/internal/hash.h
+++ b/include/crypto/internal/hash.h
@@ -83,8 +83,6 @@ struct hash_alg_common *ahash_attr_alg(struct rtattr *rta, u32 type, u32 mask);
 
 int crypto_register_shash(struct shash_alg *alg);
 int crypto_unregister_shash(struct shash_alg *alg);
-int crypto_register_shashes(struct shash_alg *algs, int count);
-int crypto_unregister_shashes(struct shash_alg *algs, int count);
 int shash_register_instance(struct crypto_template *tmpl,
                             struct shash_instance *inst);
 void shash_free_instance(struct crypto_instance *inst);
diff --git a/include/crypto/internal/skcipher.h b/include/crypto/internal/skcipher.h
index 06e8b32d541..3a748a6bf77 100644
--- a/include/crypto/internal/skcipher.h
+++ b/include/crypto/internal/skcipher.h
@@ -34,8 +34,6 @@ static inline void crypto_set_skcipher_spawn(
 int crypto_grab_skcipher(struct crypto_skcipher_spawn *spawn, const char *name,
                          u32 type, u32 mask);
 
-struct crypto_alg *crypto_lookup_skcipher(const char *name, u32 type, u32 mask);
-
 static inline void crypto_drop_skcipher(struct crypto_skcipher_spawn *spawn)
 {
         crypto_drop_spawn(&spawn->base);
diff --git a/include/crypto/lrw.h b/include/crypto/lrw.h
deleted file mode 100644
index 25a2c871637..00000000000
--- a/include/crypto/lrw.h
+++ /dev/null
@@ -1,43 +0,0 @@
-#ifndef _CRYPTO_LRW_H
-#define _CRYPTO_LRW_H
-
-#include <crypto/b128ops.h>
-
-struct scatterlist;
-struct gf128mul_64k;
-struct blkcipher_desc;
-
-#define LRW_BLOCK_SIZE 16
-
-struct lrw_table_ctx {
-        /* optimizes multiplying a random (non incrementing, as at the
-         * start of a new sector) value with key2, we could also have
-         * used 4k optimization tables or no optimization at all. In the
-         * latter case we would have to store key2 here */
-        struct gf128mul_64k *table;
-        /* stores:
-         *  key2*{ 0,0,...0,0,0,0,1 }, key2*{ 0,0,...0,0,0,1,1 },
-         *  key2*{ 0,0,...0,0,1,1,1 }, key2*{ 0,0,...0,1,1,1,1 }
-         *  key2*{ 0,0,...1,1,1,1,1 }, etc
-         * needed for optimized multiplication of incrementing values
-         * with key2 */
-        be128 mulinc[128];
-};
-
-int lrw_init_table(struct lrw_table_ctx *ctx, const u8 *tweak);
-void lrw_free_table(struct lrw_table_ctx *ctx);
-
-struct lrw_crypt_req {
-        be128 *tbuf;
-        unsigned int tbuflen;
-
-        struct lrw_table_ctx *table_ctx;
-        void *crypt_ctx;
-        void (*crypt_fn)(void *ctx, u8 *blks, unsigned int nbytes);
-};
-
-int lrw_crypt(struct blkcipher_desc *desc, struct scatterlist *dst,
-              struct scatterlist *src, unsigned int nbytes,
-              struct lrw_crypt_req *req);
-
-#endif  /* _CRYPTO_LRW_H */
diff --git a/include/crypto/public_key.h b/include/crypto/public_key.h
deleted file mode 100644
index f5b0224c996..00000000000
--- a/include/crypto/public_key.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/* Asymmetric public-key algorithm definitions
- *
- * See Documentation/crypto/asymmetric-keys.txt
- *
- * Copyright (C) 2012 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public Licence
- * as published by the Free Software Foundation; either version
- * 2 of the Licence, or (at your option) any later version.
- */
-
-#ifndef _LINUX_PUBLIC_KEY_H
-#define _LINUX_PUBLIC_KEY_H
-
-#include <linux/mpi.h>
-
-enum pkey_algo {
-        PKEY_ALGO_DSA,
-        PKEY_ALGO_RSA,
-        PKEY_ALGO__LAST
-};
-
-extern const char *const pkey_algo[PKEY_ALGO__LAST];
-
-enum pkey_hash_algo {
-        PKEY_HASH_MD4,
-        PKEY_HASH_MD5,
-        PKEY_HASH_SHA1,
-        PKEY_HASH_RIPE_MD_160,
-        PKEY_HASH_SHA256,
-        PKEY_HASH_SHA384,
-        PKEY_HASH_SHA512,
-        PKEY_HASH_SHA224,
-        PKEY_HASH__LAST
-};
-
-extern const char *const pkey_hash_algo[PKEY_HASH__LAST];
-
-enum pkey_id_type {
-        PKEY_ID_PGP,            /* OpenPGP generated key ID */
-        PKEY_ID_X509,           /* X.509 arbitrary subjectKeyIdentifier */
-        PKEY_ID_TYPE__LAST
-};
-
-extern const char *const pkey_id_type[PKEY_ID_TYPE__LAST];
-
-/*
- * Cryptographic data for the public-key subtype of the asymmetric key type.
- *
- * Note that this may include private part of the key as well as the public
- * part.
- */
-struct public_key {
-        const struct public_key_algorithm *algo;
-        u8      capabilities;
-#define PKEY_CAN_ENCRYPT        0x01
-#define PKEY_CAN_DECRYPT        0x02
-#define PKEY_CAN_SIGN           0x04
-#define PKEY_CAN_VERIFY         0x08
-        enum pkey_id_type id_type : 8;
-        union {
-                MPI     mpi[5];
-                struct {
-                        MPI     p;      /* DSA prime */
-                        MPI     q;      /* DSA group order */
-                        MPI     g;      /* DSA group generator */
-                        MPI     y;      /* DSA public-key value = g^x mod p */
-                        MPI     x;      /* DSA secret exponent (if present) */
-                } dsa;
-                struct {
-                        MPI     n;      /* RSA public modulus */
-                        MPI     e;      /* RSA public encryption exponent */
-                        MPI     d;      /* RSA secret encryption exponent (if present) */
-                        MPI     p;      /* RSA secret prime (if present) */
-                        MPI     q;      /* RSA secret prime (if present) */
-                } rsa;
-        };
-};
-
-extern void public_key_destroy(void *payload);
-
-/*
- * Public key cryptography signature data
- */
-struct public_key_signature {
-        u8 *digest;
-        u8 digest_size;                 /* Number of bytes in digest */
-        u8 nr_mpi;                      /* Occupancy of mpi[] */
-        enum pkey_hash_algo pkey_hash_algo : 8;
-        union {
-                MPI mpi[2];
-                struct {
-                        MPI s;          /* m^d mod n */
-                } rsa;
-                struct {
-                        MPI r;
-                        MPI s;
-                } dsa;
-        };
-};
-
-struct key;
-extern int verify_signature(const struct key *key,
-                            const struct public_key_signature *sig);
-
-#endif /* _LINUX_PUBLIC_KEY_H */
diff --git a/include/crypto/scatterwalk.h b/include/crypto/scatterwalk.h
index 3744d2a642d..4fd95a323be 100644
--- a/include/crypto/scatterwalk.h
+++ b/include/crypto/scatterwalk.h
@@ -25,6 +25,28 @@
 #include <linux/scatterlist.h>
 #include <linux/sched.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)
@@ -99,15 +121,15 @@ static inline struct page *scatterwalk_page(struct scatter_walk *walk)
         return sg_page(walk->sg) + (walk->offset >> PAGE_SHIFT);
 }
 
-static inline void scatterwalk_unmap(void *vaddr)
+static inline void scatterwalk_unmap(void *vaddr, int out)
 {
-        kunmap_atomic(vaddr);
+        crypto_kunmap(vaddr, out);
 }
 
 void scatterwalk_start(struct scatter_walk *walk, struct scatterlist *sg);
 void scatterwalk_copychunks(void *buf, struct scatter_walk *walk,
                             size_t nbytes, int out);
-void *scatterwalk_map(struct scatter_walk *walk);
+void *scatterwalk_map(struct scatter_walk *walk, int out);
 void scatterwalk_done(struct scatter_walk *walk, int out, int more);
 
 void scatterwalk_map_and_copy(void *buf, struct scatterlist *sg,
diff --git a/include/crypto/serpent.h b/include/crypto/serpent.h
deleted file mode 100644
index b7e0941eb6f..00000000000
--- a/include/crypto/serpent.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Common values for serpent algorithms
- */
-
-#ifndef _CRYPTO_SERPENT_H
-#define _CRYPTO_SERPENT_H
-
-#include <linux/types.h>
-#include <linux/crypto.h>
-
-#define SERPENT_MIN_KEY_SIZE              0
-#define SERPENT_MAX_KEY_SIZE             32
-#define SERPENT_EXPKEY_WORDS            132
-#define SERPENT_BLOCK_SIZE               16
-
-struct serpent_ctx {
-        u32 expkey[SERPENT_EXPKEY_WORDS];
-};
-
-int __serpent_setkey(struct serpent_ctx *ctx, const u8 *key,
-                     unsigned int keylen);
-int serpent_setkey(struct crypto_tfm *tfm, const u8 *key, unsigned int keylen);
-
-void __serpent_encrypt(struct serpent_ctx *ctx, u8 *dst, const u8 *src);
-void __serpent_decrypt(struct serpent_ctx *ctx, u8 *dst, const u8 *src);
-
-#endif
diff --git a/include/crypto/sha.h b/include/crypto/sha.h
index c6c9c1fe460..069e85ba97e 100644
--- a/include/crypto/sha.h
+++ b/include/crypto/sha.h
@@ -82,9 +82,4 @@ struct sha512_state {
         u8 buf[SHA512_BLOCK_SIZE];
 };
 
-struct shash_desc;
-
-extern int crypto_sha1_update(struct shash_desc *desc, const u8 *data,
-                              unsigned int len);
-
 #endif
diff --git a/include/crypto/twofish.h b/include/crypto/twofish.h
index 095c901a8af..c408522595c 100644
--- a/include/crypto/twofish.h
+++ b/include/crypto/twofish.h
@@ -17,8 +17,6 @@ struct twofish_ctx {
         u32 s[4][256], w[8], k[32];
 };
 
-int __twofish_setkey(struct twofish_ctx *ctx, const u8 *key,
-                     unsigned int key_len, u32 *flags);
 int twofish_setkey(struct crypto_tfm *tfm, const u8 *key, unsigned int key_len);
 
 #endif
diff --git a/include/crypto/vmac.h b/include/crypto/vmac.h
index 6b700c7b2fe..c4467c55df1 100644
--- a/include/crypto/vmac.h
+++ b/include/crypto/vmac.h
@@ -56,8 +56,6 @@ typedef u64 vmac_t;
 struct vmac_ctx_t {
         struct crypto_cipher *child;
         struct vmac_ctx __vmac_ctx;
-        u8 partial[VMAC_NHBYTES];       /* partial block */
-        int partial_size;               /* size of the partial block */
 };
 
 #endif /* __CRYPTO_VMAC_H */
diff --git a/include/crypto/xts.h b/include/crypto/xts.h
deleted file mode 100644
index 72c09eb5643..00000000000
--- a/include/crypto/xts.h
+++ /dev/null
@@ -1,27 +0,0 @@
-#ifndef _CRYPTO_XTS_H
-#define _CRYPTO_XTS_H
-
-#include <crypto/b128ops.h>
-
-struct scatterlist;
-struct blkcipher_desc;
-
-#define XTS_BLOCK_SIZE 16
-
-struct xts_crypt_req {
-        be128 *tbuf;
-        unsigned int tbuflen;
-
-        void *tweak_ctx;
-        void (*tweak_fn)(void *ctx, u8* dst, const u8* src);
-        void *crypt_ctx;
-        void (*crypt_fn)(void *ctx, u8 *blks, unsigned int nbytes);
-};
-
-#define XTS_TWEAK_CAST(x) ((void (*)(void *, u8*, const u8*))(x))
-
-int xts_crypt(struct blkcipher_desc *desc, struct scatterlist *dst,
-              struct scatterlist *src, unsigned int nbytes,
-              struct xts_crypt_req *req);
-
-#endif  /* _CRYPTO_XTS_H */