1 // SPDX-License-Identifier: GPL-2.0-only 1 // SPDX-License-Identifier: GPL-2.0-only
2 /* 2 /*
3 * pcrypt - Parallel crypto wrapper. 3 * pcrypt - Parallel crypto wrapper.
4 * 4 *
5 * Copyright (C) 2009 secunet Security Network 5 * Copyright (C) 2009 secunet Security Networks AG
6 * Copyright (C) 2009 Steffen Klassert <steffe 6 * Copyright (C) 2009 Steffen Klassert <steffen.klassert@secunet.com>
7 */ 7 */
8 8
9 #include <crypto/algapi.h> 9 #include <crypto/algapi.h>
10 #include <crypto/internal/aead.h> 10 #include <crypto/internal/aead.h>
11 #include <linux/atomic.h> 11 #include <linux/atomic.h>
12 #include <linux/err.h> 12 #include <linux/err.h>
13 #include <linux/init.h> 13 #include <linux/init.h>
14 #include <linux/module.h> 14 #include <linux/module.h>
15 #include <linux/slab.h> 15 #include <linux/slab.h>
>> 16 #include <linux/notifier.h>
16 #include <linux/kobject.h> 17 #include <linux/kobject.h>
17 #include <linux/cpu.h> 18 #include <linux/cpu.h>
18 #include <crypto/pcrypt.h> 19 #include <crypto/pcrypt.h>
19 20
20 static struct padata_instance *pencrypt; 21 static struct padata_instance *pencrypt;
21 static struct padata_instance *pdecrypt; 22 static struct padata_instance *pdecrypt;
22 static struct kset *pcrypt_kset; 23 static struct kset *pcrypt_kset;
23 24
24 struct pcrypt_instance_ctx { 25 struct pcrypt_instance_ctx {
25 struct crypto_aead_spawn spawn; 26 struct crypto_aead_spawn spawn;
26 struct padata_shell *psenc; 27 struct padata_shell *psenc;
27 struct padata_shell *psdec; 28 struct padata_shell *psdec;
28 atomic_t tfm_count; 29 atomic_t tfm_count;
29 }; 30 };
30 31
31 struct pcrypt_aead_ctx { 32 struct pcrypt_aead_ctx {
32 struct crypto_aead *child; 33 struct crypto_aead *child;
33 unsigned int cb_cpu; 34 unsigned int cb_cpu;
34 }; 35 };
35 36
36 static inline struct pcrypt_instance_ctx *pcry 37 static inline struct pcrypt_instance_ctx *pcrypt_tfm_ictx(
37 struct crypto_aead *tfm) 38 struct crypto_aead *tfm)
38 { 39 {
39 return aead_instance_ctx(aead_alg_inst 40 return aead_instance_ctx(aead_alg_instance(tfm));
40 } 41 }
41 42
42 static int pcrypt_aead_setkey(struct crypto_ae 43 static int pcrypt_aead_setkey(struct crypto_aead *parent,
43 const u8 *key, u 44 const u8 *key, unsigned int keylen)
44 { 45 {
45 struct pcrypt_aead_ctx *ctx = crypto_a 46 struct pcrypt_aead_ctx *ctx = crypto_aead_ctx(parent);
46 47
47 return crypto_aead_setkey(ctx->child, 48 return crypto_aead_setkey(ctx->child, key, keylen);
48 } 49 }
49 50
50 static int pcrypt_aead_setauthsize(struct cryp 51 static int pcrypt_aead_setauthsize(struct crypto_aead *parent,
51 unsigned in 52 unsigned int authsize)
52 { 53 {
53 struct pcrypt_aead_ctx *ctx = crypto_a 54 struct pcrypt_aead_ctx *ctx = crypto_aead_ctx(parent);
54 55
55 return crypto_aead_setauthsize(ctx->ch 56 return crypto_aead_setauthsize(ctx->child, authsize);
56 } 57 }
57 58
58 static void pcrypt_aead_serial(struct padata_p 59 static void pcrypt_aead_serial(struct padata_priv *padata)
59 { 60 {
60 struct pcrypt_request *preq = pcrypt_p 61 struct pcrypt_request *preq = pcrypt_padata_request(padata);
61 struct aead_request *req = pcrypt_requ 62 struct aead_request *req = pcrypt_request_ctx(preq);
62 63
63 aead_request_complete(req->base.data, 64 aead_request_complete(req->base.data, padata->info);
64 } 65 }
65 66
66 static void pcrypt_aead_done(void *data, int e !! 67 static void pcrypt_aead_done(struct crypto_async_request *areq, int err)
67 { 68 {
68 struct aead_request *req = data; !! 69 struct aead_request *req = areq->data;
69 struct pcrypt_request *preq = aead_req 70 struct pcrypt_request *preq = aead_request_ctx(req);
70 struct padata_priv *padata = pcrypt_re 71 struct padata_priv *padata = pcrypt_request_padata(preq);
71 72
72 padata->info = err; 73 padata->info = err;
73 74
74 padata_do_serial(padata); 75 padata_do_serial(padata);
75 } 76 }
76 77
77 static void pcrypt_aead_enc(struct padata_priv 78 static void pcrypt_aead_enc(struct padata_priv *padata)
78 { 79 {
79 struct pcrypt_request *preq = pcrypt_p 80 struct pcrypt_request *preq = pcrypt_padata_request(padata);
80 struct aead_request *req = pcrypt_requ 81 struct aead_request *req = pcrypt_request_ctx(preq);
81 int ret; 82 int ret;
82 83
83 ret = crypto_aead_encrypt(req); 84 ret = crypto_aead_encrypt(req);
84 85
85 if (ret == -EINPROGRESS) 86 if (ret == -EINPROGRESS)
86 return; 87 return;
87 88
88 padata->info = ret; 89 padata->info = ret;
89 padata_do_serial(padata); 90 padata_do_serial(padata);
90 } 91 }
91 92
92 static int pcrypt_aead_encrypt(struct aead_req 93 static int pcrypt_aead_encrypt(struct aead_request *req)
93 { 94 {
94 int err; 95 int err;
95 struct pcrypt_request *preq = aead_req 96 struct pcrypt_request *preq = aead_request_ctx(req);
96 struct aead_request *creq = pcrypt_req 97 struct aead_request *creq = pcrypt_request_ctx(preq);
97 struct padata_priv *padata = pcrypt_re 98 struct padata_priv *padata = pcrypt_request_padata(preq);
98 struct crypto_aead *aead = crypto_aead 99 struct crypto_aead *aead = crypto_aead_reqtfm(req);
99 struct pcrypt_aead_ctx *ctx = crypto_a 100 struct pcrypt_aead_ctx *ctx = crypto_aead_ctx(aead);
100 u32 flags = aead_request_flags(req); 101 u32 flags = aead_request_flags(req);
101 struct pcrypt_instance_ctx *ictx; 102 struct pcrypt_instance_ctx *ictx;
102 103
103 ictx = pcrypt_tfm_ictx(aead); 104 ictx = pcrypt_tfm_ictx(aead);
104 105
105 memset(padata, 0, sizeof(struct padata 106 memset(padata, 0, sizeof(struct padata_priv));
106 107
107 padata->parallel = pcrypt_aead_enc; 108 padata->parallel = pcrypt_aead_enc;
108 padata->serial = pcrypt_aead_serial; 109 padata->serial = pcrypt_aead_serial;
109 110
110 aead_request_set_tfm(creq, ctx->child) 111 aead_request_set_tfm(creq, ctx->child);
111 aead_request_set_callback(creq, flags 112 aead_request_set_callback(creq, flags & ~CRYPTO_TFM_REQ_MAY_SLEEP,
112 pcrypt_aead_ 113 pcrypt_aead_done, req);
113 aead_request_set_crypt(creq, req->src, 114 aead_request_set_crypt(creq, req->src, req->dst,
114 req->cryptlen, 115 req->cryptlen, req->iv);
115 aead_request_set_ad(creq, req->assocle 116 aead_request_set_ad(creq, req->assoclen);
116 117
117 err = padata_do_parallel(ictx->psenc, 118 err = padata_do_parallel(ictx->psenc, padata, &ctx->cb_cpu);
118 if (!err) 119 if (!err)
119 return -EINPROGRESS; 120 return -EINPROGRESS;
120 if (err == -EBUSY) 121 if (err == -EBUSY)
121 return -EAGAIN; 122 return -EAGAIN;
122 123
123 return err; 124 return err;
124 } 125 }
125 126
126 static void pcrypt_aead_dec(struct padata_priv 127 static void pcrypt_aead_dec(struct padata_priv *padata)
127 { 128 {
128 struct pcrypt_request *preq = pcrypt_p 129 struct pcrypt_request *preq = pcrypt_padata_request(padata);
129 struct aead_request *req = pcrypt_requ 130 struct aead_request *req = pcrypt_request_ctx(preq);
130 int ret; 131 int ret;
131 132
132 ret = crypto_aead_decrypt(req); 133 ret = crypto_aead_decrypt(req);
133 134
134 if (ret == -EINPROGRESS) 135 if (ret == -EINPROGRESS)
135 return; 136 return;
136 137
137 padata->info = ret; 138 padata->info = ret;
138 padata_do_serial(padata); 139 padata_do_serial(padata);
139 } 140 }
140 141
141 static int pcrypt_aead_decrypt(struct aead_req 142 static int pcrypt_aead_decrypt(struct aead_request *req)
142 { 143 {
143 int err; 144 int err;
144 struct pcrypt_request *preq = aead_req 145 struct pcrypt_request *preq = aead_request_ctx(req);
145 struct aead_request *creq = pcrypt_req 146 struct aead_request *creq = pcrypt_request_ctx(preq);
146 struct padata_priv *padata = pcrypt_re 147 struct padata_priv *padata = pcrypt_request_padata(preq);
147 struct crypto_aead *aead = crypto_aead 148 struct crypto_aead *aead = crypto_aead_reqtfm(req);
148 struct pcrypt_aead_ctx *ctx = crypto_a 149 struct pcrypt_aead_ctx *ctx = crypto_aead_ctx(aead);
149 u32 flags = aead_request_flags(req); 150 u32 flags = aead_request_flags(req);
150 struct pcrypt_instance_ctx *ictx; 151 struct pcrypt_instance_ctx *ictx;
151 152
152 ictx = pcrypt_tfm_ictx(aead); 153 ictx = pcrypt_tfm_ictx(aead);
153 154
154 memset(padata, 0, sizeof(struct padata 155 memset(padata, 0, sizeof(struct padata_priv));
155 156
156 padata->parallel = pcrypt_aead_dec; 157 padata->parallel = pcrypt_aead_dec;
157 padata->serial = pcrypt_aead_serial; 158 padata->serial = pcrypt_aead_serial;
158 159
159 aead_request_set_tfm(creq, ctx->child) 160 aead_request_set_tfm(creq, ctx->child);
160 aead_request_set_callback(creq, flags 161 aead_request_set_callback(creq, flags & ~CRYPTO_TFM_REQ_MAY_SLEEP,
161 pcrypt_aead_ 162 pcrypt_aead_done, req);
162 aead_request_set_crypt(creq, req->src, 163 aead_request_set_crypt(creq, req->src, req->dst,
163 req->cryptlen, 164 req->cryptlen, req->iv);
164 aead_request_set_ad(creq, req->assocle 165 aead_request_set_ad(creq, req->assoclen);
165 166
166 err = padata_do_parallel(ictx->psdec, 167 err = padata_do_parallel(ictx->psdec, padata, &ctx->cb_cpu);
167 if (!err) 168 if (!err)
168 return -EINPROGRESS; 169 return -EINPROGRESS;
169 if (err == -EBUSY) 170 if (err == -EBUSY)
170 return -EAGAIN; 171 return -EAGAIN;
171 172
172 return err; 173 return err;
173 } 174 }
174 175
175 static int pcrypt_aead_init_tfm(struct crypto_ 176 static int pcrypt_aead_init_tfm(struct crypto_aead *tfm)
176 { 177 {
177 int cpu, cpu_index; 178 int cpu, cpu_index;
178 struct aead_instance *inst = aead_alg_ 179 struct aead_instance *inst = aead_alg_instance(tfm);
179 struct pcrypt_instance_ctx *ictx = aea 180 struct pcrypt_instance_ctx *ictx = aead_instance_ctx(inst);
180 struct pcrypt_aead_ctx *ctx = crypto_a 181 struct pcrypt_aead_ctx *ctx = crypto_aead_ctx(tfm);
181 struct crypto_aead *cipher; 182 struct crypto_aead *cipher;
182 183
183 cpu_index = (unsigned int)atomic_inc_r 184 cpu_index = (unsigned int)atomic_inc_return(&ictx->tfm_count) %
184 cpumask_weight(cpu_online_ 185 cpumask_weight(cpu_online_mask);
185 186
186 ctx->cb_cpu = cpumask_first(cpu_online 187 ctx->cb_cpu = cpumask_first(cpu_online_mask);
187 for (cpu = 0; cpu < cpu_index; cpu++) 188 for (cpu = 0; cpu < cpu_index; cpu++)
188 ctx->cb_cpu = cpumask_next(ctx 189 ctx->cb_cpu = cpumask_next(ctx->cb_cpu, cpu_online_mask);
189 190
190 cipher = crypto_spawn_aead(&ictx->spaw 191 cipher = crypto_spawn_aead(&ictx->spawn);
191 192
192 if (IS_ERR(cipher)) 193 if (IS_ERR(cipher))
193 return PTR_ERR(cipher); 194 return PTR_ERR(cipher);
194 195
195 ctx->child = cipher; 196 ctx->child = cipher;
196 crypto_aead_set_reqsize(tfm, sizeof(st 197 crypto_aead_set_reqsize(tfm, sizeof(struct pcrypt_request) +
197 sizeof(st 198 sizeof(struct aead_request) +
198 crypto_ae 199 crypto_aead_reqsize(cipher));
199 200
200 return 0; 201 return 0;
201 } 202 }
202 203
203 static void pcrypt_aead_exit_tfm(struct crypto 204 static void pcrypt_aead_exit_tfm(struct crypto_aead *tfm)
204 { 205 {
205 struct pcrypt_aead_ctx *ctx = crypto_a 206 struct pcrypt_aead_ctx *ctx = crypto_aead_ctx(tfm);
206 207
207 crypto_free_aead(ctx->child); 208 crypto_free_aead(ctx->child);
208 } 209 }
209 210
210 static void pcrypt_free(struct aead_instance * 211 static void pcrypt_free(struct aead_instance *inst)
211 { 212 {
212 struct pcrypt_instance_ctx *ctx = aead 213 struct pcrypt_instance_ctx *ctx = aead_instance_ctx(inst);
213 214
214 crypto_drop_aead(&ctx->spawn); 215 crypto_drop_aead(&ctx->spawn);
215 padata_free_shell(ctx->psdec); 216 padata_free_shell(ctx->psdec);
216 padata_free_shell(ctx->psenc); 217 padata_free_shell(ctx->psenc);
217 kfree(inst); 218 kfree(inst);
218 } 219 }
219 220
220 static int pcrypt_init_instance(struct crypto_ 221 static int pcrypt_init_instance(struct crypto_instance *inst,
221 struct crypto_ 222 struct crypto_alg *alg)
222 { 223 {
223 if (snprintf(inst->alg.cra_driver_name 224 if (snprintf(inst->alg.cra_driver_name, CRYPTO_MAX_ALG_NAME,
224 "pcrypt(%s)", alg->cra_dr 225 "pcrypt(%s)", alg->cra_driver_name) >= CRYPTO_MAX_ALG_NAME)
225 return -ENAMETOOLONG; 226 return -ENAMETOOLONG;
226 227
227 memcpy(inst->alg.cra_name, alg->cra_na 228 memcpy(inst->alg.cra_name, alg->cra_name, CRYPTO_MAX_ALG_NAME);
228 229
229 inst->alg.cra_priority = alg->cra_prio 230 inst->alg.cra_priority = alg->cra_priority + 100;
230 inst->alg.cra_blocksize = alg->cra_blo 231 inst->alg.cra_blocksize = alg->cra_blocksize;
231 inst->alg.cra_alignmask = alg->cra_ali 232 inst->alg.cra_alignmask = alg->cra_alignmask;
232 233
233 return 0; 234 return 0;
234 } 235 }
235 236
236 static int pcrypt_create_aead(struct crypto_te 237 static int pcrypt_create_aead(struct crypto_template *tmpl, struct rtattr **tb,
237 struct crypto_at !! 238 u32 type, u32 mask)
238 { 239 {
239 struct pcrypt_instance_ctx *ctx; 240 struct pcrypt_instance_ctx *ctx;
>> 241 struct crypto_attr_type *algt;
240 struct aead_instance *inst; 242 struct aead_instance *inst;
241 struct aead_alg *alg; 243 struct aead_alg *alg;
242 u32 mask = crypto_algt_inherited_mask( !! 244 const char *name;
243 int err; 245 int err;
244 246
>> 247 algt = crypto_get_attr_type(tb);
>> 248 if (IS_ERR(algt))
>> 249 return PTR_ERR(algt);
>> 250
>> 251 name = crypto_attr_alg_name(tb[1]);
>> 252 if (IS_ERR(name))
>> 253 return PTR_ERR(name);
>> 254
245 inst = kzalloc(sizeof(*inst) + sizeof( 255 inst = kzalloc(sizeof(*inst) + sizeof(*ctx), GFP_KERNEL);
246 if (!inst) 256 if (!inst)
247 return -ENOMEM; 257 return -ENOMEM;
248 258
249 err = -ENOMEM; 259 err = -ENOMEM;
250 260
251 ctx = aead_instance_ctx(inst); 261 ctx = aead_instance_ctx(inst);
252 ctx->psenc = padata_alloc_shell(pencry 262 ctx->psenc = padata_alloc_shell(pencrypt);
253 if (!ctx->psenc) 263 if (!ctx->psenc)
254 goto err_free_inst; !! 264 goto out_free_inst;
255 265
256 ctx->psdec = padata_alloc_shell(pdecry 266 ctx->psdec = padata_alloc_shell(pdecrypt);
257 if (!ctx->psdec) 267 if (!ctx->psdec)
258 goto err_free_inst; !! 268 goto out_free_psenc;
>> 269
>> 270 crypto_set_aead_spawn(&ctx->spawn, aead_crypto_instance(inst));
259 271
260 err = crypto_grab_aead(&ctx->spawn, ae !! 272 err = crypto_grab_aead(&ctx->spawn, name, 0, 0);
261 crypto_attr_alg <<
262 if (err) 273 if (err)
263 goto err_free_inst; !! 274 goto out_free_psdec;
264 275
265 alg = crypto_spawn_aead_alg(&ctx->spaw 276 alg = crypto_spawn_aead_alg(&ctx->spawn);
266 err = pcrypt_init_instance(aead_crypto 277 err = pcrypt_init_instance(aead_crypto_instance(inst), &alg->base);
267 if (err) 278 if (err)
268 goto err_free_inst; !! 279 goto out_drop_aead;
269 280
270 inst->alg.base.cra_flags |= CRYPTO_ALG !! 281 inst->alg.base.cra_flags = CRYPTO_ALG_ASYNC;
271 282
272 inst->alg.ivsize = crypto_aead_alg_ivs 283 inst->alg.ivsize = crypto_aead_alg_ivsize(alg);
273 inst->alg.maxauthsize = crypto_aead_al 284 inst->alg.maxauthsize = crypto_aead_alg_maxauthsize(alg);
274 285
275 inst->alg.base.cra_ctxsize = sizeof(st 286 inst->alg.base.cra_ctxsize = sizeof(struct pcrypt_aead_ctx);
276 287
277 inst->alg.init = pcrypt_aead_init_tfm; 288 inst->alg.init = pcrypt_aead_init_tfm;
278 inst->alg.exit = pcrypt_aead_exit_tfm; 289 inst->alg.exit = pcrypt_aead_exit_tfm;
279 290
280 inst->alg.setkey = pcrypt_aead_setkey; 291 inst->alg.setkey = pcrypt_aead_setkey;
281 inst->alg.setauthsize = pcrypt_aead_se 292 inst->alg.setauthsize = pcrypt_aead_setauthsize;
282 inst->alg.encrypt = pcrypt_aead_encryp 293 inst->alg.encrypt = pcrypt_aead_encrypt;
283 inst->alg.decrypt = pcrypt_aead_decryp 294 inst->alg.decrypt = pcrypt_aead_decrypt;
284 295
285 inst->free = pcrypt_free; 296 inst->free = pcrypt_free;
286 297
287 err = aead_register_instance(tmpl, ins 298 err = aead_register_instance(tmpl, inst);
288 if (err) { !! 299 if (err)
289 err_free_inst: !! 300 goto out_drop_aead;
290 pcrypt_free(inst); !! 301
291 } !! 302 out:
292 return err; 303 return err;
>> 304
>> 305 out_drop_aead:
>> 306 crypto_drop_aead(&ctx->spawn);
>> 307 out_free_psdec:
>> 308 padata_free_shell(ctx->psdec);
>> 309 out_free_psenc:
>> 310 padata_free_shell(ctx->psenc);
>> 311 out_free_inst:
>> 312 kfree(inst);
>> 313 goto out;
293 } 314 }
294 315
295 static int pcrypt_create(struct crypto_templat 316 static int pcrypt_create(struct crypto_template *tmpl, struct rtattr **tb)
296 { 317 {
297 struct crypto_attr_type *algt; 318 struct crypto_attr_type *algt;
298 319
299 algt = crypto_get_attr_type(tb); 320 algt = crypto_get_attr_type(tb);
300 if (IS_ERR(algt)) 321 if (IS_ERR(algt))
301 return PTR_ERR(algt); 322 return PTR_ERR(algt);
302 323
303 switch (algt->type & algt->mask & CRYP 324 switch (algt->type & algt->mask & CRYPTO_ALG_TYPE_MASK) {
304 case CRYPTO_ALG_TYPE_AEAD: 325 case CRYPTO_ALG_TYPE_AEAD:
305 return pcrypt_create_aead(tmpl !! 326 return pcrypt_create_aead(tmpl, tb, algt->type, algt->mask);
306 } 327 }
307 328
308 return -EINVAL; 329 return -EINVAL;
309 } 330 }
310 331
311 static int pcrypt_sysfs_add(struct padata_inst 332 static int pcrypt_sysfs_add(struct padata_instance *pinst, const char *name)
312 { 333 {
313 int ret; 334 int ret;
314 335
315 pinst->kobj.kset = pcrypt_kset; 336 pinst->kobj.kset = pcrypt_kset;
316 ret = kobject_add(&pinst->kobj, NULL, 337 ret = kobject_add(&pinst->kobj, NULL, "%s", name);
317 if (!ret) 338 if (!ret)
318 kobject_uevent(&pinst->kobj, K 339 kobject_uevent(&pinst->kobj, KOBJ_ADD);
319 340
320 return ret; 341 return ret;
321 } 342 }
322 343
323 static int pcrypt_init_padata(struct padata_in 344 static int pcrypt_init_padata(struct padata_instance **pinst, const char *name)
324 { 345 {
325 int ret = -ENOMEM; 346 int ret = -ENOMEM;
326 347
327 *pinst = padata_alloc(name); !! 348 *pinst = padata_alloc_possible(name);
328 if (!*pinst) 349 if (!*pinst)
329 return ret; 350 return ret;
330 351
331 ret = pcrypt_sysfs_add(*pinst, name); 352 ret = pcrypt_sysfs_add(*pinst, name);
332 if (ret) 353 if (ret)
333 padata_free(*pinst); 354 padata_free(*pinst);
334 355
335 return ret; 356 return ret;
336 } 357 }
337 358
>> 359 static void pcrypt_fini_padata(struct padata_instance *pinst)
>> 360 {
>> 361 padata_stop(pinst);
>> 362 padata_free(pinst);
>> 363 }
>> 364
338 static struct crypto_template pcrypt_tmpl = { 365 static struct crypto_template pcrypt_tmpl = {
339 .name = "pcrypt", 366 .name = "pcrypt",
340 .create = pcrypt_create, 367 .create = pcrypt_create,
341 .module = THIS_MODULE, 368 .module = THIS_MODULE,
342 }; 369 };
343 370
344 static int __init pcrypt_init(void) 371 static int __init pcrypt_init(void)
345 { 372 {
346 int err = -ENOMEM; 373 int err = -ENOMEM;
347 374
348 pcrypt_kset = kset_create_and_add("pcr 375 pcrypt_kset = kset_create_and_add("pcrypt", NULL, kernel_kobj);
349 if (!pcrypt_kset) 376 if (!pcrypt_kset)
350 goto err; 377 goto err;
351 378
352 err = pcrypt_init_padata(&pencrypt, "p 379 err = pcrypt_init_padata(&pencrypt, "pencrypt");
353 if (err) 380 if (err)
354 goto err_unreg_kset; 381 goto err_unreg_kset;
355 382
356 err = pcrypt_init_padata(&pdecrypt, "p 383 err = pcrypt_init_padata(&pdecrypt, "pdecrypt");
357 if (err) 384 if (err)
358 goto err_deinit_pencrypt; 385 goto err_deinit_pencrypt;
359 386
>> 387 padata_start(pencrypt);
>> 388 padata_start(pdecrypt);
>> 389
360 return crypto_register_template(&pcryp 390 return crypto_register_template(&pcrypt_tmpl);
361 391
362 err_deinit_pencrypt: 392 err_deinit_pencrypt:
363 padata_free(pencrypt); !! 393 pcrypt_fini_padata(pencrypt);
364 err_unreg_kset: 394 err_unreg_kset:
365 kset_unregister(pcrypt_kset); 395 kset_unregister(pcrypt_kset);
366 err: 396 err:
367 return err; 397 return err;
368 } 398 }
369 399
370 static void __exit pcrypt_exit(void) 400 static void __exit pcrypt_exit(void)
371 { 401 {
372 crypto_unregister_template(&pcrypt_tmp 402 crypto_unregister_template(&pcrypt_tmpl);
373 403
374 padata_free(pencrypt); !! 404 pcrypt_fini_padata(pencrypt);
375 padata_free(pdecrypt); !! 405 pcrypt_fini_padata(pdecrypt);
376 406
377 kset_unregister(pcrypt_kset); 407 kset_unregister(pcrypt_kset);
378 } 408 }
379 409
380 subsys_initcall(pcrypt_init); 410 subsys_initcall(pcrypt_init);
381 module_exit(pcrypt_exit); 411 module_exit(pcrypt_exit);
382 412
383 MODULE_LICENSE("GPL"); 413 MODULE_LICENSE("GPL");
384 MODULE_AUTHOR("Steffen Klassert <steffen.klass 414 MODULE_AUTHOR("Steffen Klassert <steffen.klassert@secunet.com>");
385 MODULE_DESCRIPTION("Parallel crypto wrapper"); 415 MODULE_DESCRIPTION("Parallel crypto wrapper");
386 MODULE_ALIAS_CRYPTO("pcrypt"); 416 MODULE_ALIAS_CRYPTO("pcrypt");
387 417
Linux® is a registered trademark of Linus Torvalds in the United States and other countries.
TOMOYO® is a registered trademark of NTT DATA CORPORATION.