projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
x86: use _ASM_EXTABLE macro in include/asm-x86/msr.h
[powerpc.git]
/
crypto
/
xcbc.c
diff --git
a/crypto/xcbc.c
b/crypto/xcbc.c
index
53e8ccb
..
a82959d
100644
(file)
--- a/
crypto/xcbc.c
+++ b/
crypto/xcbc.c
@@
-19,6
+19,7
@@
* Kazunori Miyazawa <miyazawa@linux-ipv6.org>
*/
* Kazunori Miyazawa <miyazawa@linux-ipv6.org>
*/
+#include <crypto/scatterwalk.h>
#include <linux/crypto.h>
#include <linux/err.h>
#include <linux/hardirq.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 <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,
static u_int32_t ks[12] = {0x01010101, 0x01010101, 0x01010101, 0x01010101,
0x02020202, 0x02020202, 0x02020202, 0x02020202,
@@
-120,7
+120,7
@@
static int crypto_xcbc_digest_update2(struct hash_desc *pdesc,
do {
do {
- struct page *pg = sg
[i].page
;
+ struct page *pg = sg
_page(&sg[i])
;
unsigned int offset = sg[i].offset;
unsigned int slen = sg[i].length;
unsigned int offset = sg[i].offset;
unsigned int slen = sg[i].length;
@@
-288,12
+288,18
@@
static void xcbc_exit_tfm(struct crypto_tfm *tfm)
crypto_free_cipher(ctx->child);
}
crypto_free_cipher(ctx->child);
}
-static struct crypto_instance *xcbc_alloc(
void *param, unsigned int len
)
+static struct crypto_instance *xcbc_alloc(
struct rtattr **tb
)
{
struct crypto_instance *inst;
struct crypto_alg *alg;
{
struct crypto_instance *inst;
struct crypto_alg *alg;
- alg = crypto_get_attr_alg(param, len, CRYPTO_ALG_TYPE_CIPHER,
- CRYPTO_ALG_TYPE_HASH_MASK | CRYPTO_ALG_ASYNC);
+ int err;
+
+ err = crypto_check_attr_type(tb, CRYPTO_ALG_TYPE_HASH);
+ if (err)
+ return ERR_PTR(err);
+
+ alg = crypto_get_attr_alg(tb, CRYPTO_ALG_TYPE_CIPHER,
+ CRYPTO_ALG_TYPE_MASK);
if (IS_ERR(alg))
return ERR_PTR(PTR_ERR(alg));
if (IS_ERR(alg))
return ERR_PTR(PTR_ERR(alg));
@@
-301,7
+307,8
@@
static struct crypto_instance *xcbc_alloc(void *param, unsigned int len)
case 16:
break;
default:
case 16:
break;
default:
- return ERR_PTR(PTR_ERR(alg));
+ inst = ERR_PTR(-EINVAL);
+ goto out_put_alg;
}
inst = crypto_alloc_instance("xcbc", alg);
}
inst = crypto_alloc_instance("xcbc", alg);
@@
-314,10
+321,7
@@
static struct crypto_instance *xcbc_alloc(void *param, unsigned int len)
inst->alg.cra_alignmask = alg->cra_alignmask;
inst->alg.cra_type = &crypto_hash_type;
inst->alg.cra_alignmask = alg->cra_alignmask;
inst->alg.cra_type = &crypto_hash_type;
- inst->alg.cra_hash.digestsize =
- (alg->cra_flags & CRYPTO_ALG_TYPE_MASK) ==
- CRYPTO_ALG_TYPE_HASH ? alg->cra_hash.digestsize :
- alg->cra_blocksize;
+ inst->alg.cra_hash.digestsize = alg->cra_blocksize;
inst->alg.cra_ctxsize = sizeof(struct crypto_xcbc_ctx) +
ALIGN(inst->alg.cra_blocksize * 3, sizeof(void *));
inst->alg.cra_init = xcbc_init_tfm;
inst->alg.cra_ctxsize = sizeof(struct crypto_xcbc_ctx) +
ALIGN(inst->alg.cra_blocksize * 3, sizeof(void *));
inst->alg.cra_init = xcbc_init_tfm;