Merge tag 'kgdb-5.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/danielt...

[linux-2.6-microblaze.git] / crypto / cipher.c

diff --git a/crypto/cipher.c b/crypto/cipher.c
index 1084270..fd78150 100644 (file)
--- a/crypto/cipher.c
+++ b/crypto/cipher.c
@@ -2,7 +2,7 @@
 /*
  * Cryptographic API.
  *
- * Cipher operations.
+ * Single-block cipher operations.
  *
  * Copyright (c) 2002 James Morris <jmorris@intercode.com.au>
  * Copyright (c) 2005 Herbert Xu <herbert@gondor.apana.org.au>
@@ -16,11 +16,11 @@
 #include <linux/string.h>
 #include "internal.h"
 
-static int setkey_unaligned(struct crypto_tfm *tfm, const u8 *key,
+static int setkey_unaligned(struct crypto_cipher *tfm, const u8 *key,
                            unsigned int keylen)
 {
-       struct cipher_alg *cia = &tfm->__crt_alg->cra_cipher;
-       unsigned long alignmask = crypto_tfm_alg_alignmask(tfm);
+       struct cipher_alg *cia = crypto_cipher_alg(tfm);
+       unsigned long alignmask = crypto_cipher_alignmask(tfm);
        int ret;
        u8 *buffer, *alignbuffer;
        unsigned long absize;
@@ -32,83 +32,60 @@ static int setkey_unaligned(struct crypto_tfm *tfm, const u8 *key,
 
        alignbuffer = (u8 *)ALIGN((unsigned long)buffer, alignmask + 1);
        memcpy(alignbuffer, key, keylen);
-       ret = cia->cia_setkey(tfm, alignbuffer, keylen);
+       ret = cia->cia_setkey(crypto_cipher_tfm(tfm), alignbuffer, keylen);
        memset(alignbuffer, 0, keylen);
        kfree(buffer);
        return ret;
 
 }
 
-static int setkey(struct crypto_tfm *tfm, const u8 *key, unsigned int keylen)
+int crypto_cipher_setkey(struct crypto_cipher *tfm,
+                        const u8 *key, unsigned int keylen)
 {
-       struct cipher_alg *cia = &tfm->__crt_alg->cra_cipher;
-       unsigned long alignmask = crypto_tfm_alg_alignmask(tfm);
+       struct cipher_alg *cia = crypto_cipher_alg(tfm);
+       unsigned long alignmask = crypto_cipher_alignmask(tfm);
 
-       tfm->crt_flags &= ~CRYPTO_TFM_RES_MASK;
-       if (keylen < cia->cia_min_keysize || keylen > cia->cia_max_keysize) {
-               tfm->crt_flags |= CRYPTO_TFM_RES_BAD_KEY_LEN;
+       if (keylen < cia->cia_min_keysize || keylen > cia->cia_max_keysize)
                return -EINVAL;
-       }
 
        if ((unsigned long)key & alignmask)
                return setkey_unaligned(tfm, key, keylen);
 
-       return cia->cia_setkey(tfm, key, keylen);
-}
-
-static void cipher_crypt_unaligned(void (*fn)(struct crypto_tfm *, u8 *,
-                                             const u8 *),
-                                  struct crypto_tfm *tfm,
-                                  u8 *dst, const u8 *src)
-{
-       unsigned long alignmask = crypto_tfm_alg_alignmask(tfm);
-       unsigned int size = crypto_tfm_alg_blocksize(tfm);
-       u8 buffer[MAX_CIPHER_BLOCKSIZE + MAX_CIPHER_ALIGNMASK];
-       u8 *tmp = (u8 *)ALIGN((unsigned long)buffer, alignmask + 1);
-
-       memcpy(tmp, src, size);
-       fn(tfm, tmp, tmp);
-       memcpy(dst, tmp, size);
+       return cia->cia_setkey(crypto_cipher_tfm(tfm), key, keylen);
 }
+EXPORT_SYMBOL_GPL(crypto_cipher_setkey);
 
-static void cipher_encrypt_unaligned(struct crypto_tfm *tfm,
-                                    u8 *dst, const u8 *src)
+static inline void cipher_crypt_one(struct crypto_cipher *tfm,
+                                   u8 *dst, const u8 *src, bool enc)
 {
-       unsigned long alignmask = crypto_tfm_alg_alignmask(tfm);
-       struct cipher_alg *cipher = &tfm->__crt_alg->cra_cipher;
+       unsigned long alignmask = crypto_cipher_alignmask(tfm);
+       struct cipher_alg *cia = crypto_cipher_alg(tfm);
+       void (*fn)(struct crypto_tfm *, u8 *, const u8 *) =
+               enc ? cia->cia_encrypt : cia->cia_decrypt;
 
        if (unlikely(((unsigned long)dst | (unsigned long)src) & alignmask)) {
-               cipher_crypt_unaligned(cipher->cia_encrypt, tfm, dst, src);
-               return;
+               unsigned int bs = crypto_cipher_blocksize(tfm);
+               u8 buffer[MAX_CIPHER_BLOCKSIZE + MAX_CIPHER_ALIGNMASK];
+               u8 *tmp = (u8 *)ALIGN((unsigned long)buffer, alignmask + 1);
+
+               memcpy(tmp, src, bs);
+               fn(crypto_cipher_tfm(tfm), tmp, tmp);
+               memcpy(dst, tmp, bs);
+       } else {
+               fn(crypto_cipher_tfm(tfm), dst, src);
        }
-
-       cipher->cia_encrypt(tfm, dst, src);
 }
 
-static void cipher_decrypt_unaligned(struct crypto_tfm *tfm,
-                                    u8 *dst, const u8 *src)
+void crypto_cipher_encrypt_one(struct crypto_cipher *tfm,
+                              u8 *dst, const u8 *src)
 {
-       unsigned long alignmask = crypto_tfm_alg_alignmask(tfm);
-       struct cipher_alg *cipher = &tfm->__crt_alg->cra_cipher;
-
-       if (unlikely(((unsigned long)dst | (unsigned long)src) & alignmask)) {
-               cipher_crypt_unaligned(cipher->cia_decrypt, tfm, dst, src);
-               return;
-       }
-
-       cipher->cia_decrypt(tfm, dst, src);
+       cipher_crypt_one(tfm, dst, src, true);
 }
+EXPORT_SYMBOL_GPL(crypto_cipher_encrypt_one);
 
-int crypto_init_cipher_ops(struct crypto_tfm *tfm)
+void crypto_cipher_decrypt_one(struct crypto_cipher *tfm,
+                              u8 *dst, const u8 *src)
 {
-       struct cipher_tfm *ops = &tfm->crt_cipher;
-       struct cipher_alg *cipher = &tfm->__crt_alg->cra_cipher;
-
-       ops->cit_setkey = setkey;
-       ops->cit_encrypt_one = crypto_tfm_alg_alignmask(tfm) ?
-               cipher_encrypt_unaligned : cipher->cia_encrypt;
-       ops->cit_decrypt_one = crypto_tfm_alg_alignmask(tfm) ?
-               cipher_decrypt_unaligned : cipher->cia_decrypt;
-
-       return 0;
+       cipher_crypt_one(tfm, dst, src, false);
 }
+EXPORT_SYMBOL_GPL(crypto_cipher_decrypt_one);