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