projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'filelock-v5.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton...
[linux-2.6-microblaze.git]
/
drivers
/
crypto
/
padlock-aes.c
diff --git
a/drivers/crypto/padlock-aes.c
b/drivers/crypto/padlock-aes.c
index
ad02013
..
8a06612
100644
(file)
--- a/
drivers/crypto/padlock-aes.c
+++ b/
drivers/crypto/padlock-aes.c
@@
-145,7
+145,7
@@
static int aes_set_key(struct crypto_tfm *tfm, const u8 *in_key,
ctx->cword.encrypt.keygen = 1;
ctx->cword.decrypt.keygen = 1;
ctx->cword.encrypt.keygen = 1;
ctx->cword.decrypt.keygen = 1;
- if (
crypto_aes_expand_
key(&gen_aes, in_key, key_len)) {
+ if (
aes_expand
key(&gen_aes, in_key, key_len)) {
*flags |= CRYPTO_TFM_RES_BAD_KEY_LEN;
return -EINVAL;
}
*flags |= CRYPTO_TFM_RES_BAD_KEY_LEN;
return -EINVAL;
}
@@
-300,7
+300,7
@@
static inline u8 *padlock_xcrypt_cbc(const u8 *input, u8 *output, void *key,
return iv;
}
return iv;
}
-static void aes_encrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in)
+static void
padlock_
aes_encrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in)
{
struct aes_ctx *ctx = aes_ctx(tfm);
{
struct aes_ctx *ctx = aes_ctx(tfm);
@@
-309,7
+309,7
@@
static void aes_encrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in)
padlock_store_cword(&ctx->cword.encrypt);
}
padlock_store_cword(&ctx->cword.encrypt);
}
-static void aes_decrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in)
+static void
padlock_
aes_decrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in)
{
struct aes_ctx *ctx = aes_ctx(tfm);
{
struct aes_ctx *ctx = aes_ctx(tfm);
@@
-332,8
+332,8
@@
static struct crypto_alg aes_alg = {
.cia_min_keysize = AES_MIN_KEY_SIZE,
.cia_max_keysize = AES_MAX_KEY_SIZE,
.cia_setkey = aes_set_key,
.cia_min_keysize = AES_MIN_KEY_SIZE,
.cia_max_keysize = AES_MAX_KEY_SIZE,
.cia_setkey = aes_set_key,
- .cia_encrypt = aes_encrypt,
- .cia_decrypt = aes_decrypt,
+ .cia_encrypt =
padlock_
aes_encrypt,
+ .cia_decrypt =
padlock_
aes_decrypt,
}
}
};
}
}
};