| Message ID | 1441494029-6765-1-git-send-email-andrew.zaborowski@intel.com (mailing list archive) |
|---|---|
| State | RFC |
| Delegated to: | Herbert Xu |
| Headers | show |
Am Sonntag, 6. September 2015, 01:00:29 schrieb Andrew Zaborowski: Hi Andrew, Tadeusz, > This patch adds PKCS#1 v1.5 standard RSA padding as a separate template. > This way an RSA cipher with padding can be obtained by instantiating > "pkcs1pad(rsa-generic)". The reason for adding this is that RSA is almost > never used without this padding (or OAEP) so it will be needed for > either certificate work in the kernel or the userspace, and also I hear > that it is likely implemented by hardware RSA. > > From the generic code I could not figure out why the crypto_type.init and > .ctxsize functions are needed for a template but not for a standalone > algorithm but I see the word "compat" in their implementations for > shash or blkcipher. If they are to be added for akcipher it should > probably be a separate patch. > > Signed-off-by: Andrew Zaborowski <andrew.zaborowski@intel.com> > --- > crypto/Makefile | 1 + > crypto/akcipher.c | 16 +- > crypto/rsa-padding.c | 438 > ++++++++++++++++++++++++++++++++++++++++++ crypto/rsa.c | > 16 +- > include/crypto/akcipher.h | 4 +- > include/crypto/algapi.h | 1 + > include/crypto/internal/rsa.h | 2 + > 7 files changed, 474 insertions(+), 4 deletions(-) > create mode 100644 crypto/rsa-padding.c > > diff --git a/crypto/Makefile b/crypto/Makefile > index a16a7e7..b548a27 100644 > --- a/crypto/Makefile > +++ b/crypto/Makefile > @@ -36,6 +36,7 @@ clean-files += rsakey-asn1.c rsakey-asn1.h > rsa_generic-y := rsakey-asn1.o > rsa_generic-y += rsa.o > rsa_generic-y += rsa_helper.o > +rsa_generic-y += rsa-padding.o > obj-$(CONFIG_CRYPTO_RSA) += rsa_generic.o > > cryptomgr-y := algboss.o testmgr.o > diff --git a/crypto/akcipher.c b/crypto/akcipher.c > index 528ae6a..7f82ee8 100644 > --- a/crypto/akcipher.c > +++ b/crypto/akcipher.c > @@ -54,6 +54,11 @@ static void crypto_akcipher_show(struct seq_file *m, > struct crypto_alg *alg) seq_puts(m, "type : akcipher\n"); > } > > +static int crypto_akcipher_init(struct crypto_tfm *tfm, u32 type, u32 mask) > +{ > + return 0; > +} > + > static void crypto_akcipher_exit_tfm(struct crypto_tfm *tfm) > { > struct crypto_akcipher *akcipher = __crypto_akcipher_tfm(tfm); > @@ -76,8 +81,16 @@ static int crypto_akcipher_init_tfm(struct crypto_tfm > *tfm) return 0; > } > > -static const struct crypto_type crypto_akcipher_type = { > +static unsigned int crypto_akcipher_ctxsize(struct crypto_alg *alg, u32 > type, + u32 mask) > +{ > + return alg->cra_ctxsize; > +} > + > +const struct crypto_type crypto_akcipher_type = { > + .ctxsize = crypto_akcipher_ctxsize, > .extsize = crypto_alg_extsize, > + .init = crypto_akcipher_init, > .init_tfm = crypto_akcipher_init_tfm, > #ifdef CONFIG_PROC_FS > .show = crypto_akcipher_show, > @@ -88,6 +101,7 @@ static const struct crypto_type crypto_akcipher_type = { > .type = CRYPTO_ALG_TYPE_AKCIPHER, > .tfmsize = offsetof(struct crypto_akcipher, base), > }; > +EXPORT_SYMBOL_GPL(crypto_akcipher_type); > > struct crypto_akcipher *crypto_alloc_akcipher(const char *alg_name, u32 > type, u32 mask) > diff --git a/crypto/rsa-padding.c b/crypto/rsa-padding.c > new file mode 100644 > index 0000000..106ce62 > --- /dev/null > +++ b/crypto/rsa-padding.c > @@ -0,0 +1,438 @@ > +/* > + * RSA padding templates. > + * > + * Copyright (c) 2015 Intel Corporation > + * > + * This program is free software; you can redistribute it and/or modify it > + * under the terms of the GNU General Public License as published by the > Free + * Software Foundation; either version 2 of the License, or (at your > option) + * any later version. > + */ > + > +#include <crypto/algapi.h> > +#include <crypto/akcipher.h> > +#include <crypto/internal/akcipher.h> > +#include <linux/err.h> > +#include <linux/init.h> > +#include <linux/kernel.h> > +#include <linux/module.h> > +#include <linux/random.h> > + > +struct pkcs1pad_ctx { > + struct crypto_akcipher *child; > + > + unsigned int key_size; > +}; > + > +static int pkcs1pad_setkey(struct crypto_akcipher *tfm, const void *key, > + unsigned int keylen) Albeit I have nothing to say against the code, but shouldn't we first get the split of the setkey function implemented? The conversion work will increase more and more we merge code that uses that API that was decided to be revamped. Tadeusz, what do you think? > +{ > + struct pkcs1pad_ctx *ctx = akcipher_tfm_ctx(tfm); > + struct akcipher_request *req; > + int err; > + > + err = crypto_akcipher_setkey(ctx->child, key, keylen); > + > + if (!err) { > + /* Find out new modulus size from rsa implementation */ > + req = akcipher_request_alloc(ctx->child, GFP_KERNEL); > + if (IS_ERR(req)) > + return PTR_ERR(req); > + > + akcipher_request_set_crypt(req, NULL, NULL, 0, 0); > + if (crypto_akcipher_encrypt(req) != -EOVERFLOW) > + err = -EINVAL; I had a chat with Tadesusz already on this code which I need for the algif_akcipher code too (and there I need this check more often as user space may simply change the key under my feet). I feel that it is a waste of CPU cycles to set up a fake encryption request just to get the data length which is based on the used key. The value we obtain here is simply a check of the key length. Thus, I would think that we should have a separate akcipher API call for this instead of requiring the caller to allocate a fake request context. Tadeusz, are you working on that code or shall I have a look? > + > + ctx->key_size = req->dst_len; > + akcipher_request_free(req); > + } > + > + return err; > +} > + > +static int pkcs1pad_encrypt_sign_complete(struct akcipher_request *req, int > err) +{ > + struct akcipher_request *child_req = akcipher_request_ctx(req); > + > + kfree(child_req->src); kzfree? > + req->dst_len = child_req->dst_len; > + return err; > +} > + > +static void pkcs1pad_encrypt_sign_complete_cb( > + struct crypto_async_request *child_async_req, int err) > +{ > + struct akcipher_request *req = child_async_req->data; > + struct crypto_async_request async_req; > + > + if (err == -EINPROGRESS) > + return; > + > + async_req.data = req->base.data; > + async_req.tfm = crypto_akcipher_tfm(crypto_akcipher_reqtfm(req)); > + async_req.flags = child_async_req->flags; > + req->base.complete(&async_req, > + pkcs1pad_encrypt_sign_complete(req, err)); > +} > + > +static int pkcs1pad_encrypt(struct akcipher_request *req) > +{ > + struct crypto_akcipher *tfm = crypto_akcipher_reqtfm(req); > + struct pkcs1pad_ctx *ctx = akcipher_tfm_ctx(tfm); > + struct akcipher_request *child_req = akcipher_request_ctx(req); > + int err, i, ps_len; i and ps_len should be unsigned int > + uint8_t *src; > + > + if (!ctx->key_size) > + return -EINVAL; > + > + if (req->src_len > ctx->key_size - 11) > + return -EOVERFLOW; > + > + src = kmalloc(ctx->key_size, > + (req->base.flags & CRYPTO_TFM_REQ_MAY_SLEEP) ? > + GFP_KERNEL : GFP_ATOMIC); > + if (!src) > + return -ENOMEM; > + > + /* Reuse output buffer, add padding in the input */ > + child_req->src = src; > + child_req->src_len = ctx->key_size; > + child_req->dst = req->dst; > + child_req->dst_len = req->dst_len; > + > + ps_len = ctx->key_size - req->src_len - 3; > + src[0] = 0x00; > + src[1] = 0x02; > + for (i = 0; i < ps_len; i++) > + src[2 + i] = 1 + prandom_u32_max(255); To save some CPU cycles, why not run from i = 2 to ctx->key_size - req- >src_len - 1? This should eliminate the addition. > + src[ps_len + 2] = 0x00; > + memcpy(src + ps_len + 3, req->src, req->src_len); > + > + akcipher_request_set_tfm(child_req, ctx->child); > + akcipher_request_set_callback(child_req, req->base.flags, > + pkcs1pad_encrypt_sign_complete_cb, req); > + > + err = crypto_akcipher_encrypt(child_req); > + if (err != -EINPROGRESS && err != -EBUSY) > + return pkcs1pad_encrypt_sign_complete(req, err); > + > + return err; > +} > + > +static int pkcs1pad_decrypt_complete(struct akcipher_request *req, int err) > +{ > + struct akcipher_request *child_req = akcipher_request_ctx(req); > + int pos; unsigned int, just to be save? Note, this code is intended to be exposed to user space. > + uint8_t *dst = child_req->dst; > + > + BUG_ON(err == -EOVERFLOW); Why is the BUG needed here? Again, I am worrying about user space. > + > + if (err) > + goto done; > + > + if (dst[0] != 0x00) { > + err = -EINVAL; > + goto done; > + } > + if (dst[1] != 0x02) { > + err = -EINVAL; > + goto done; > + } > + for (pos = 2; pos < child_req->dst_len; pos++) > + if (dst[pos] == 0x00) > + break; What happens if the padding has a 0x00 in its pseudo random data? > + if (pos < 10 || pos == child_req->dst_len) { > + err = -EINVAL; > + goto done; > + } > + pos++; > + > + if (req->dst_len < child_req->dst_len - pos) > + err = -EOVERFLOW; > + req->dst_len = child_req->dst_len - pos; > + > + if (!err) > + memcpy(req->dst, dst + pos, req->dst_len); > + > +done: > + kfree(dst); kzfree? > + return err; > +} > + > +static void pkcs1pad_decrypt_complete_cb( > + struct crypto_async_request *child_async_req, int err) > +{ > + struct akcipher_request *req = child_async_req->data; > + struct crypto_async_request async_req; > + > + if (err == -EINPROGRESS) > + return; > + > + async_req.data = req->base.data; > + async_req.tfm = crypto_akcipher_tfm(crypto_akcipher_reqtfm(req)); > + async_req.flags = child_async_req->flags; > + req->base.complete(&async_req, pkcs1pad_decrypt_complete(req, err)); > +} > + > +static int pkcs1pad_decrypt(struct akcipher_request *req) > +{ > + struct crypto_akcipher *tfm = crypto_akcipher_reqtfm(req); > + struct pkcs1pad_ctx *ctx = akcipher_tfm_ctx(tfm); > + struct akcipher_request *child_req = akcipher_request_ctx(req); > + int err; > + uint8_t *dst; > + > + if (!ctx->key_size) > + return -EINVAL; > + > + dst = kmalloc(ctx->key_size, > + (req->base.flags & CRYPTO_TFM_REQ_MAY_SLEEP) ? > + GFP_KERNEL : GFP_ATOMIC); > + if (!dst) > + return -ENOMEM; > + > + /* Reuse input buffer, strip padding from the output */ > + child_req->src = req->src; > + child_req->src_len = req->src_len; > + child_req->dst = dst; > + child_req->dst_len = ctx->key_size; > + > + akcipher_request_set_tfm(child_req, ctx->child); > + akcipher_request_set_callback(child_req, req->base.flags, > + pkcs1pad_decrypt_complete_cb, req); > + > + err = crypto_akcipher_decrypt(child_req); > + if (err != -EINPROGRESS && err != -EBUSY) > + return pkcs1pad_decrypt_complete(req, err); > + > + return err; > +} > + > +static int pkcs1pad_sign(struct akcipher_request *req) > +{ > + struct crypto_akcipher *tfm = crypto_akcipher_reqtfm(req); > + struct pkcs1pad_ctx *ctx = akcipher_tfm_ctx(tfm); > + struct akcipher_request *child_req = akcipher_request_ctx(req); > + int err, i, ps_len; i and ps_len should be unsigned int > + uint8_t *src; > + > + if (!ctx->key_size) > + return -EINVAL; > + > + if (req->src_len > ctx->key_size - 11) > + return -EOVERFLOW; > + > + src = kmalloc(ctx->key_size, > + (req->base.flags & CRYPTO_TFM_REQ_MAY_SLEEP) ? > + GFP_KERNEL : GFP_ATOMIC); > + if (!src) > + return -ENOMEM; > + > + /* Reuse output buffer, add padding in the input */ > + child_req->src = src; > + child_req->src_len = ctx->key_size; > + child_req->dst = req->dst; > + child_req->dst_len = req->dst_len; > + > + ps_len = ctx->key_size - req->src_len - 3; > + src[0] = 0x00; > + src[1] = 0x01; > + for (i = 0; i < ps_len; i++) > + src[2 + i] = 0xff; See above: let us avoid the addition here? > + src[ps_len + 2] = 0x00; > + memcpy(src + ps_len + 3, req->src, req->src_len); > + > + akcipher_request_set_tfm(child_req, ctx->child); > + akcipher_request_set_callback(child_req, req->base.flags, > + pkcs1pad_encrypt_sign_complete_cb, req); > + > + err = crypto_akcipher_sign(child_req); > + if (err != -EINPROGRESS && err != -EBUSY) > + return pkcs1pad_encrypt_sign_complete(req, err); > + > + return err; > +} > + > +static int pkcs1pad_verify_complete(struct akcipher_request *req, int err) > +{ > + struct akcipher_request *child_req = akcipher_request_ctx(req); > + int pos; Again, unsigned int? > + uint8_t *dst = child_req->dst; > + > + BUG_ON(err == -EOVERFLOW); Again, why BUG? > + > + if (err) > + goto done; > + > + if (dst[0] != 0x00) { > + err = -EINVAL; > + goto done; > + } > + if (dst[1] != 0x01) { > + err = -EINVAL; > + goto done; > + } > + for (pos = 2; pos < child_req->dst_len; pos++) > + if (dst[pos] != 0xff) > + break; > + if (pos < 10 || pos == child_req->dst_len || dst[pos] != 0x00) { > + err = -EINVAL; > + goto done; > + } > + pos++; > + > + if (req->dst_len < child_req->dst_len - pos) > + err = -EOVERFLOW; > + req->dst_len = child_req->dst_len - pos; > + > + if (!err) > + memcpy(req->dst, dst + pos, req->dst_len); > + > +done: > + kfree(dst); kzfree? > + return err; > +} > + > +static void pkcs1pad_verify_complete_cb( > + struct crypto_async_request *child_async_req, int err) > +{ > + struct akcipher_request *req = child_async_req->data; > + struct crypto_async_request async_req; > + > + if (err == -EINPROGRESS) > + return; > + > + async_req.data = req->base.data; > + async_req.tfm = crypto_akcipher_tfm(crypto_akcipher_reqtfm(req)); > + async_req.flags = child_async_req->flags; > + req->base.complete(&async_req, pkcs1pad_verify_complete(req, err)); > +} > + > +static int pkcs1pad_verify(struct akcipher_request *req) > +{ > + struct crypto_akcipher *tfm = crypto_akcipher_reqtfm(req); > + struct pkcs1pad_ctx *ctx = akcipher_tfm_ctx(tfm); > + struct akcipher_request *child_req = akcipher_request_ctx(req); > + int err; > + uint8_t *dst; > + > + if (!ctx->key_size) > + return -EINVAL; > + > + dst = kmalloc(ctx->key_size, > + (req->base.flags & CRYPTO_TFM_REQ_MAY_SLEEP) ? > + GFP_KERNEL : GFP_ATOMIC); > + if (!dst) > + return -ENOMEM; > + > + /* Reuse input buffer, strip padding from the output */ > + child_req->src = req->src; > + child_req->src_len = req->src_len; > + child_req->dst = dst; > + child_req->dst_len = ctx->key_size; > + > + akcipher_request_set_tfm(child_req, ctx->child); > + akcipher_request_set_callback(child_req, req->base.flags, > + pkcs1pad_verify_complete_cb, req); > + > + err = crypto_akcipher_verify(child_req); > + if (err != -EINPROGRESS && err != -EBUSY) > + return pkcs1pad_verify_complete(req, err); > + > + return err; > +} > + > +static int pkcs1pad_init_tfm(struct crypto_tfm *tfm) > +{ > + struct crypto_instance *inst = (void *) tfm->__crt_alg; > + struct pkcs1pad_ctx *ctx = crypto_tfm_ctx(tfm); > + struct crypto_tfm *new_tfm; > + > + new_tfm = crypto_spawn_tfm(crypto_instance_ctx(inst), > + CRYPTO_ALG_TYPE_AKCIPHER, CRYPTO_ALG_TYPE_MASK); > + if (IS_ERR(new_tfm)) > + return PTR_ERR(new_tfm); > + > + ctx->child = __crypto_akcipher_tfm(new_tfm); > + > + return 0; > +} > + > +static void pkcs1pad_exit_tfm(struct crypto_tfm *tfm) > +{ > + struct pkcs1pad_ctx *ctx = crypto_tfm_ctx(tfm); > + > + crypto_free_akcipher(ctx->child); > +} > + > +static struct crypto_instance *pkcs1pad_alloc(struct rtattr **tb) > +{ > + struct crypto_instance *inst = NULL; > + struct crypto_alg *alg; > + struct akcipher_alg *akalg; > + int err; > + > + err = crypto_check_attr_type(tb, CRYPTO_ALG_TYPE_AKCIPHER); > + if (err) > + return ERR_PTR(err); > + > + alg = crypto_get_attr_alg(tb, CRYPTO_ALG_TYPE_AKCIPHER, > + CRYPTO_ALG_TYPE_MASK); > + if (IS_ERR(alg)) > + return ERR_CAST(alg); > + > + akalg = crypto_alloc_instance2("pkcs1pad", alg, > + crypto_akcipher_type.tfmsize); > + if (IS_ERR(akalg)) { > + inst = ERR_CAST(akalg); > + goto out_put_alg; > + } > + > + inst = container_of(&akalg->base, struct crypto_instance, alg); > + > + err = crypto_init_spawn2(crypto_instance_ctx(inst), alg, inst, > + &crypto_akcipher_type); > + if (err) { > + inst = ERR_PTR(err); > + kfree(akalg); > + > + goto out_put_alg; > + } > + > + inst->alg.cra_flags = CRYPTO_ALG_TYPE_AKCIPHER; > + inst->alg.cra_priority = alg->cra_priority; > + inst->alg.cra_type = alg->cra_type; > + > + inst->alg.cra_ctxsize = sizeof(struct pkcs1pad_ctx); > + > + inst->alg.cra_init = pkcs1pad_init_tfm; > + inst->alg.cra_exit = pkcs1pad_exit_tfm; > + > + akalg->encrypt = pkcs1pad_encrypt; > + akalg->decrypt = pkcs1pad_decrypt; > + akalg->sign = pkcs1pad_sign; > + akalg->verify = pkcs1pad_verify; > + akalg->setkey = pkcs1pad_setkey; > + akalg->reqsize = sizeof(struct akcipher_request) + > + __crypto_akcipher_alg(alg)->reqsize; > + > +out_put_alg: > + crypto_mod_put(alg); > + return inst; > +} > + > +static void pkcs1pad_free(struct crypto_instance *inst) > +{ > + struct akcipher_alg *akalg = __crypto_akcipher_alg(&inst->alg); > + > + crypto_drop_spawn(crypto_instance_ctx(inst)); > + kfree(akalg); > +} > + > +struct crypto_template rsa_pkcs1pad_tmpl = { > + .name = "pkcs1pad", > + .alloc = pkcs1pad_alloc, > + .free = pkcs1pad_free, > + .module = THIS_MODULE, > +}; > diff --git a/crypto/rsa.c b/crypto/rsa.c > index 752af06..1f030fa 100644 > --- a/crypto/rsa.c > +++ b/crypto/rsa.c > @@ -13,6 +13,7 @@ > #include <crypto/internal/rsa.h> > #include <crypto/internal/akcipher.h> > #include <crypto/akcipher.h> > +#include <crypto/algapi.h> > > /* > * RSAEP function [RFC3447 sec 5.1.1] > @@ -300,11 +301,24 @@ static struct akcipher_alg rsa = { > > static int rsa_init(void) > { > - return crypto_register_akcipher(&rsa); > + int err; > + > + err = crypto_register_akcipher(&rsa); > + if (err) > + return err; > + > + err = crypto_register_template(&rsa_pkcs1pad_tmpl); > + if (err) { > + crypto_unregister_akcipher(&rsa); > + return err; > + } > + > + return 0; > } > > static void rsa_exit(void) > { > + crypto_unregister_template(&rsa_pkcs1pad_tmpl); > crypto_unregister_akcipher(&rsa); > } > > diff --git a/include/crypto/akcipher.h b/include/crypto/akcipher.h > index 69d163e..6ab7a7f 100644 > --- a/include/crypto/akcipher.h > +++ b/include/crypto/akcipher.h > @@ -330,8 +330,8 @@ static inline int crypto_akcipher_verify(struct > akcipher_request *req) * > * Return: zero on success; error code in case of error > */ > -static inline int crypto_akcipher_setkey(struct crypto_akcipher *tfm, void > *key, - unsigned int keylen) > +static inline int crypto_akcipher_setkey(struct crypto_akcipher *tfm, > + const void *key, unsigned int keylen) > { > struct akcipher_alg *alg = crypto_akcipher_alg(tfm); > > diff --git a/include/crypto/algapi.h b/include/crypto/algapi.h > index d4ebf6e..b48ed67 100644 > --- a/include/crypto/algapi.h > +++ b/include/crypto/algapi.h > @@ -128,6 +128,7 @@ struct ablkcipher_walk { > > extern const struct crypto_type crypto_ablkcipher_type; > extern const struct crypto_type crypto_blkcipher_type; > +extern const struct crypto_type crypto_akcipher_type; > > void crypto_mod_put(struct crypto_alg *alg); > > diff --git a/include/crypto/internal/rsa.h b/include/crypto/internal/rsa.h > index a8c8636..162baf9 100644 > --- a/include/crypto/internal/rsa.h > +++ b/include/crypto/internal/rsa.h > @@ -24,4 +24,6 @@ int rsa_parse_key(struct rsa_key *rsa_key, const void > *key, unsigned int key_len); > > void rsa_free_key(struct rsa_key *rsa_key); > + > +extern struct crypto_template rsa_pkcs1pad_tmpl; > #endif
Hi Stephan, On 6 September 2015 at 10:34, Stephan Mueller <smueller@chronox.de> wrote: > Am Sonntag, 6. September 2015, 01:00:29 schrieb Andrew Zaborowski: > Albeit I have nothing to say against the code, but shouldn't we first get the > split of the setkey function implemented? The conversion work will increase > more and more we merge code that uses that API that was decided to be > revamped. Probably yes, I also read about the decision to use iov buffers, this will have a bigger effect on code. I posted the patch nevertheless to judge if this functionality is wanted, whether it should be a separate template like I propose (because that's admittedly more code than I expected for something that simple) and to get a reality check on how the template is created/instantiated/registered/... > > Tadeusz, what do you think? >> +{ >> + struct pkcs1pad_ctx *ctx = akcipher_tfm_ctx(tfm); >> + struct akcipher_request *req; >> + int err; >> + >> + err = crypto_akcipher_setkey(ctx->child, key, keylen); >> + >> + if (!err) { >> + /* Find out new modulus size from rsa implementation */ >> + req = akcipher_request_alloc(ctx->child, GFP_KERNEL); >> + if (IS_ERR(req)) >> + return PTR_ERR(req); >> + >> + akcipher_request_set_crypt(req, NULL, NULL, 0, 0); >> + if (crypto_akcipher_encrypt(req) != -EOVERFLOW) >> + err = -EINVAL; > > I had a chat with Tadesusz already on this code which I need for the > algif_akcipher code too (and there I need this check more often as user space > may simply change the key under my feet). I feel that it is a waste of CPU > cycles to set up a fake encryption request just to get the data length which > is based on the used key. > > The value we obtain here is simply a check of the key length. Thus, I would > think that we should have a separate akcipher API call for this instead of > requiring the caller to allocate a fake request context. I agree this isn't the ideal way to query the modulus size. It may be acceptable as a temporary thing though, where the long term solution would be to better integrate with the keys subsystem as argued by Marcel Holtmann in another thread. > > Tadeusz, are you working on that code or shall I have a look? >> + >> + ctx->key_size = req->dst_len; >> + akcipher_request_free(req); >> + } >> + >> + return err; >> +} >> + >> +static int pkcs1pad_encrypt_sign_complete(struct akcipher_request *req, int >> err) +{ >> + struct akcipher_request *child_req = akcipher_request_ctx(req); >> + >> + kfree(child_req->src); > > kzfree? > >> + req->dst_len = child_req->dst_len; >> + return err; >> +} >> + >> +static void pkcs1pad_encrypt_sign_complete_cb( >> + struct crypto_async_request *child_async_req, int err) >> +{ >> + struct akcipher_request *req = child_async_req->data; >> + struct crypto_async_request async_req; >> + >> + if (err == -EINPROGRESS) >> + return; >> + >> + async_req.data = req->base.data; >> + async_req.tfm = crypto_akcipher_tfm(crypto_akcipher_reqtfm(req)); >> + async_req.flags = child_async_req->flags; >> + req->base.complete(&async_req, >> + pkcs1pad_encrypt_sign_complete(req, err)); >> +} >> + >> +static int pkcs1pad_encrypt(struct akcipher_request *req) >> +{ >> + struct crypto_akcipher *tfm = crypto_akcipher_reqtfm(req); >> + struct pkcs1pad_ctx *ctx = akcipher_tfm_ctx(tfm); >> + struct akcipher_request *child_req = akcipher_request_ctx(req); >> + int err, i, ps_len; > > i and ps_len should be unsigned int > >> + uint8_t *src; >> + >> + if (!ctx->key_size) >> + return -EINVAL; >> + >> + if (req->src_len > ctx->key_size - 11) >> + return -EOVERFLOW; >> + >> + src = kmalloc(ctx->key_size, >> + (req->base.flags & CRYPTO_TFM_REQ_MAY_SLEEP) ? >> + GFP_KERNEL : GFP_ATOMIC); >> + if (!src) >> + return -ENOMEM; >> + >> + /* Reuse output buffer, add padding in the input */ >> + child_req->src = src; >> + child_req->src_len = ctx->key_size; >> + child_req->dst = req->dst; >> + child_req->dst_len = req->dst_len; >> + >> + ps_len = ctx->key_size - req->src_len - 3; >> + src[0] = 0x00; >> + src[1] = 0x02; >> + for (i = 0; i < ps_len; i++) >> + src[2 + i] = 1 + prandom_u32_max(255); > > To save some CPU cycles, why not run from i = 2 to ctx->key_size - req- >>src_len - 1? This should eliminate the addition. > >> + src[ps_len + 2] = 0x00; >> + memcpy(src + ps_len + 3, req->src, req->src_len); >> + >> + akcipher_request_set_tfm(child_req, ctx->child); >> + akcipher_request_set_callback(child_req, req->base.flags, >> + pkcs1pad_encrypt_sign_complete_cb, req); >> + >> + err = crypto_akcipher_encrypt(child_req); >> + if (err != -EINPROGRESS && err != -EBUSY) >> + return pkcs1pad_encrypt_sign_complete(req, err); >> + >> + return err; >> +} >> + >> +static int pkcs1pad_decrypt_complete(struct akcipher_request *req, int err) >> +{ >> + struct akcipher_request *child_req = akcipher_request_ctx(req); >> + int pos; > > unsigned int, just to be save? > > Note, this code is intended to be exposed to user space. > >> + uint8_t *dst = child_req->dst; >> + >> + BUG_ON(err == -EOVERFLOW); > > Why is the BUG needed here? Again, I am worrying about user space. it's not really "needed" but we should never receive an EOVERFLOW because we are locally allocating the reg->dst buffer ot be exactly the size of the rsa modulus so if this is too small we have a bug somewhere. >> + >> + if (err) >> + goto done; >> + >> + if (dst[0] != 0x00) { >> + err = -EINVAL; >> + goto done; >> + } >> + if (dst[1] != 0x02) { >> + err = -EINVAL; >> + goto done; >> + } >> + for (pos = 2; pos < child_req->dst_len; pos++) >> + if (dst[pos] == 0x00) >> + break; > > What happens if the padding has a 0x00 in its pseudo random data? The pseudo random bytes must all be non-zero for the padding to be unambiguous (RFC3447 iirc). If there's a 0x00 in the first 8 bytes that's invalid input, if it's after the 8th random byte it represents a different plaintext. Thanks for your review, I'll change the code according to your other comments. Cheers -- To unsubscribe from this list: send the line "unsubscribe linux-crypto" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Am Sonntag, 6. September 2015, 16:33:26 schrieb Andrzej Zaborowski: Hi Andrzej, >>> + for (pos = 2; pos < child_req->dst_len; pos++) >>> + if (dst[pos] == 0x00) >>> + break; >> >> What happens if the padding has a 0x00 in its pseudo random data? > >The pseudo random bytes must all be non-zero for the padding to be >unambiguous (RFC3447 iirc). If there's a 0x00 in the first 8 bytes I see, I did not know that detail. Now, you use prandom_u32_max to generate the padding in case of encryption/signing. I do not see any code that filters out any 0x00 that may be generated by this call. How would it prevented that this code does not generate 0x00? Ciao Stephan -- To unsubscribe from this list: send the line "unsubscribe linux-crypto" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Andrew, On 09/05/2015 04:00 PM, Andrew Zaborowski wrote: > +static int crypto_akcipher_init(struct crypto_tfm *tfm, u32 type, u32 mask) > +{ > + return 0; > +} > + This is not needed I think. > > +static int pkcs1pad_decrypt_complete(struct akcipher_request *req, int err) > +{ > + struct akcipher_request *child_req = akcipher_request_ctx(req); > + int pos; > + uint8_t *dst = child_req->dst; > + > + BUG_ON(err == -EOVERFLOW); > + > + if (err) > + goto done; > + > + if (dst[0] != 0x00) { > + err = -EINVAL; > + goto done; > + } This won't work I'm afraid, because MPI strips all leading zeors. > + if (dst[1] != 0x02) { > + err = -EINVAL; > + goto done; > + } > > +static int pkcs1pad_verify_complete(struct akcipher_request *req, int err) > +{ > + struct akcipher_request *child_req = akcipher_request_ctx(req); > + int pos; > + uint8_t *dst = child_req->dst; > + > + BUG_ON(err == -EOVERFLOW); > + > + if (err) > + goto done; > + > + if (dst[0] != 0x00) { > + err = -EINVAL; > + goto done; > + } same here the zero will be stripped off. -- To unsubscribe from this list: send the line "unsubscribe linux-crypto" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 09/06/2015 01:34 AM, Stephan Mueller wrote: >> +static int pkcs1pad_setkey(struct crypto_akcipher *tfm, const void *key, >> > + unsigned int keylen) > Albeit I have nothing to say against the code, but shouldn't we first get the > split of the setkey function implemented? The conversion work will increase > more and more we merge code that uses that API that was decided to be > revamped. > > Tadeusz, what do you think? It would make it easier for me if this could wait until the split is done. >> + akcipher_request_set_crypt(req, NULL, NULL, 0, 0); >> > + if (crypto_akcipher_encrypt(req) != -EOVERFLOW) >> > + err = -EINVAL; > I had a chat with Tadesusz already on this code which I need for the > algif_akcipher code too (and there I need this check more often as user space > may simply change the key under my feet). I feel that it is a waste of CPU > cycles to set up a fake encryption request just to get the data length which > is based on the used key. > > The value we obtain here is simply a check of the key length. Thus, I would > think that we should have a separate akcipher API call for this instead of > requiring the caller to allocate a fake request context. > > Tadeusz, are you working on that code or shall I have a look? I wasn't planning to add this, but yes, I think it's a good idea. I'll add it. -- To unsubscribe from this list: send the line "unsubscribe linux-crypto" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 09/06/2015 07:33 AM, Andrzej Zaborowski wrote: > Probably yes, I also read about the decision to use iov buffers, this > will have a bigger effect on code. The more I think about the sgl support the more it looks to me like it wasn't a good idea. It will be copied into a flat buffer somewhere along the way anyway. Like in the example below. I have that conversion already done, and for SW it looks like the data is copied 4 times for a single operation: 1 - from sgl to flat buffer, because MPI doesn't take sgls, (if the src has more ents) 2 - from buff to MPI, then, after operation 3 - export from MPI to a buff and 4 - from buff to sgl (if is the output sg it also fragmented). I can see now that with all these padding schemes there will be more buffer copied on top of this, so I wonder if it still make sense. Herbert? > > + src = kmalloc(ctx->key_size, >>> + (req->base.flags & CRYPTO_TFM_REQ_MAY_SLEEP) ? >>> + GFP_KERNEL : GFP_ATOMIC); >>> + if (!src) >>> + return -ENOMEM; >>> + >>> + /* Reuse output buffer, add padding in the input */ >>> + child_req->src = src; >>> + child_req->src_len = ctx->key_size; >>> + child_req->dst = req->dst; >>> + child_req->dst_len = req->dst_len; -- To unsubscribe from this list: send the line "unsubscribe linux-crypto" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Tadeusz, On 7 September 2015 at 16:06, Tadeusz Struk <tadeusz.struk@intel.com> wrote: > Hi Andrew, > On 09/05/2015 04:00 PM, Andrew Zaborowski wrote: >> +static int crypto_akcipher_init(struct crypto_tfm *tfm, u32 type, u32 mask) >> +{ >> + return 0; >> +} >> + > > This is not needed I think. To create the padding transform I needed to use crypto_spawn_tfm which then calls -> __crypto_alloc_tfm -> crypto_init_ops resulting in a call to crypto_akcipher_type.init(). > >> >> +static int pkcs1pad_decrypt_complete(struct akcipher_request *req, int err) >> +{ >> + struct akcipher_request *child_req = akcipher_request_ctx(req); >> + int pos; >> + uint8_t *dst = child_req->dst; >> + >> + BUG_ON(err == -EOVERFLOW); >> + >> + if (err) >> + goto done; >> + >> + if (dst[0] != 0x00) { >> + err = -EINVAL; >> + goto done; >> + } > > This won't work I'm afraid, because MPI strips all leading zeors. Good point, I have been testing against a version from before your change to mpi_read_buffer which strips the leading zeros. I'll retest and update the patch after your other akcipher work is submitted. Best regards -- To unsubscribe from this list: send the line "unsubscribe linux-crypto" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 6 September 2015 at 23:17, Stephan Mueller <smueller@chronox.de> wrote: > Am Sonntag, 6. September 2015, 16:33:26 schrieb Andrzej Zaborowski: > > Hi Andrzej, > >>>> + for (pos = 2; pos < child_req->dst_len; pos++) >>>> + if (dst[pos] == 0x00) >>>> + break; >>> >>> What happens if the padding has a 0x00 in its pseudo random data? >> >>The pseudo random bytes must all be non-zero for the padding to be >>unambiguous (RFC3447 iirc). If there's a 0x00 in the first 8 bytes > > I see, I did not know that detail. Now, you use prandom_u32_max to generate > the padding in case of encryption/signing. I do not see any code that filters > out any 0x00 that may be generated by this call. Specifically I use 1 + prandom_u32_max(255) which should give me numbers > 0 although it can't be perfectly uniform. Best regards -- To unsubscribe from this list: send the line "unsubscribe linux-crypto" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Am Montag, 7. September 2015, 07:11:24 schrieb Tadeusz Struk: Hi Tadeusz, >On 09/06/2015 01:34 AM, Stephan Mueller wrote: >>> +static int pkcs1pad_setkey(struct crypto_akcipher *tfm, const void *key, >>> >>> > + unsigned int keylen) >> >> Albeit I have nothing to say against the code, but shouldn't we first get >> the split of the setkey function implemented? The conversion work will >> increase more and more we merge code that uses that API that was decided >> to be revamped. >> >> Tadeusz, what do you think? > >It would make it easier for me if this could wait until the split is done. Sure, I will wait with posting of my new version of AF_ALG until that dust settled. > >>> + akcipher_request_set_crypt(req, NULL, NULL, 0, 0); >>> >>> > + if (crypto_akcipher_encrypt(req) != -EOVERFLOW) >>> > + err = -EINVAL; >> >> I had a chat with Tadesusz already on this code which I need for the >> algif_akcipher code too (and there I need this check more often as user >> space may simply change the key under my feet). I feel that it is a waste >> of CPU cycles to set up a fake encryption request just to get the data >> length which is based on the used key. >> >> The value we obtain here is simply a check of the key length. Thus, I would >> think that we should have a separate akcipher API call for this instead of >> requiring the caller to allocate a fake request context. >> >> Tadeusz, are you working on that code or shall I have a look? > >I wasn't planning to add this, but yes, I think it's a good idea. >I'll add it. Thanks a lot. I would think that the API call really is just a one-liner returning the size of the key. Ciao Stephan -- To unsubscribe from this list: send the line "unsubscribe linux-crypto" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Am Montag, 7. September 2015, 16:42:42 schrieb Andrzej Zaborowski: Hi Andrzej, > >Specifically I use 1 + prandom_u32_max(255) which should give me >numbers > 0 although it can't be perfectly uniform. Oh, now I see. Thanks for the clarification. And yes, per definition the values cannot be uniform (not just because of the +1 but also since prandom is not a cryptographic RNG). Ciao Stephan -- To unsubscribe from this list: send the line "unsubscribe linux-crypto" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Am Montag, 7. September 2015, 07:31:56 schrieb Tadeusz Struk: Hi Tadeusz, >On 09/06/2015 07:33 AM, Andrzej Zaborowski wrote: >> Probably yes, I also read about the decision to use iov buffers, this >> will have a bigger effect on code. > >The more I think about the sgl support the more it looks to me like it wasn't >a good idea. It will be copied into a flat buffer somewhere along the way >anyway. Like in the example below. > >I have that conversion already done, and for SW it looks like the data is >copied 4 times for a single operation: >1 - from sgl to flat buffer, because MPI doesn't take sgls, (if the src has >more ents) 2 - from buff to MPI, then, after operation >3 - export from MPI to a buff and >4 - from buff to sgl (if is the output sg it also fragmented). > >I can see now that with all these padding schemes there will be more buffer >copied on top of this, so I wonder if it still make sense. >Herbert? When the padding stuff comes into play, I think the SGL approach avoids memcpy() invocations. For example, Andrzej's approach currently is to copy the *entire* source data into a buffer where the padding is added. With SGLs, Andrzej only needs a buffer with the padding (which I would think could even reside on the stack, provided some bounds checks are done), and modify the SGL by preprending the padding buffer to the SGL with the source data. > >> + src = kmalloc(ctx->key_size, >> >>>> + (req->base.flags & CRYPTO_TFM_REQ_MAY_SLEEP) ? >>>> + GFP_KERNEL : GFP_ATOMIC); >>>> + if (!src) >>>> + return -ENOMEM; >>>> + >>>> + /* Reuse output buffer, add padding in the input */ >>>> + child_req->src = src; >>>> + child_req->src_len = ctx->key_size; >>>> + child_req->dst = req->dst; >>>> + child_req->dst_len = req->dst_len; > >-- >To unsubscribe from this list: send the line "unsubscribe linux-crypto" in >the body of a message to majordomo@vger.kernel.org >More majordomo info at http://vger.kernel.org/majordomo-info.html Ciao Stephan -- To unsubscribe from this list: send the line "unsubscribe linux-crypto" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Tadeusz Struk <tadeusz.struk@intel.com> wrote: > > The more I think about the sgl support the more it looks to me like it wasn't > a good idea. It will be copied into a flat buffer somewhere along the way anyway. > Like in the example below. > > I have that conversion already done, and for SW it looks like the data is copied 4 times > for a single operation: > 1 - from sgl to flat buffer, because MPI doesn't take sgls, (if the src has more ents) > 2 - from buff to MPI, then, after operation > 3 - export from MPI to a buff and > 4 - from buff to sgl (if is the output sg it also fragmented). > > I can see now that with all these padding schemes there will be more buffer copied > on top of this, so I wonder if it still make sense. > Herbert? I think it makes sense. Because to implement algif_akcipher someone will need to do the linearisation anyway. Moreover there is hardware out there that handles this transparently and we should not cripple them. We should add MPI helpers to read/write SG lists which can then be used by those implementations that need the capability. For the sake of simplicity you can simply start with a copy but later we can optimise it to be smarter. You can always have a fast-path for the case where the SG list is a single entry. Cheers,
Hi Stephan, On 7 September 2015 at 19:54, Stephan Mueller <smueller@chronox.de> wrote: > Am Montag, 7. September 2015, 07:31:56 schrieb Tadeusz Struk: >>I can see now that with all these padding schemes there will be more buffer >>copied on top of this, so I wonder if it still make sense. >>Herbert? > > When the padding stuff comes into play, I think the SGL approach avoids > memcpy() invocations. > > For example, Andrzej's approach currently is to copy the *entire* source data > into a buffer where the padding is added. > > With SGLs, Andrzej only needs a buffer with the padding (which I would think > could even reside on the stack, provided some bounds checks are done), and > modify the SGL by preprending the padding buffer to the SGL with the source > data. Yes, in the case of the padding schemes, using sgl's would actually save a memcpy both on encrypt/sign and decrypt/verify. Whether it'd actually help I'm not sure -- the number of pointers you need to touch, etc. may add up to around 128/256 bytes of memory access anyway. You couldn't use buffers on stack though unless you only support synchronous underlying RSA implementations. What you could do, for example in sign(), is use a static buffer pre-filled with the pad bytes of specific length. Best regards -- To unsubscribe from this list: send the line "unsubscribe linux-crypto" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Andrzej, >>> I can see now that with all these padding schemes there will be more buffer >>> copied on top of this, so I wonder if it still make sense. >>> Herbert? >> >> When the padding stuff comes into play, I think the SGL approach avoids >> memcpy() invocations. >> >> For example, Andrzej's approach currently is to copy the *entire* source data >> into a buffer where the padding is added. >> >> With SGLs, Andrzej only needs a buffer with the padding (which I would think >> could even reside on the stack, provided some bounds checks are done), and >> modify the SGL by preprending the padding buffer to the SGL with the source >> data. > > Yes, in the case of the padding schemes, using sgl's would actually > save a memcpy both on encrypt/sign and decrypt/verify. Whether it'd > actually help I'm not sure -- the number of pointers you need to > touch, etc. may add up to around 128/256 bytes of memory access > anyway. I think we have akcipher patches using sgl now. Would it make sense to update this patch against them. Regards Marcel -- To unsubscribe from this list: send the line "unsubscribe linux-crypto" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/crypto/Makefile b/crypto/Makefile index a16a7e7..b548a27 100644 --- a/crypto/Makefile +++ b/crypto/Makefile @@ -36,6 +36,7 @@ clean-files += rsakey-asn1.c rsakey-asn1.h rsa_generic-y := rsakey-asn1.o rsa_generic-y += rsa.o rsa_generic-y += rsa_helper.o +rsa_generic-y += rsa-padding.o obj-$(CONFIG_CRYPTO_RSA) += rsa_generic.o cryptomgr-y := algboss.o testmgr.o diff --git a/crypto/akcipher.c b/crypto/akcipher.c index 528ae6a..7f82ee8 100644 --- a/crypto/akcipher.c +++ b/crypto/akcipher.c @@ -54,6 +54,11 @@ static void crypto_akcipher_show(struct seq_file *m, struct crypto_alg *alg) seq_puts(m, "type : akcipher\n"); } +static int crypto_akcipher_init(struct crypto_tfm *tfm, u32 type, u32 mask) +{ + return 0; +} + static void crypto_akcipher_exit_tfm(struct crypto_tfm *tfm) { struct crypto_akcipher *akcipher = __crypto_akcipher_tfm(tfm); @@ -76,8 +81,16 @@ static int crypto_akcipher_init_tfm(struct crypto_tfm *tfm) return 0; } -static const struct crypto_type crypto_akcipher_type = { +static unsigned int crypto_akcipher_ctxsize(struct crypto_alg *alg, u32 type, + u32 mask) +{ + return alg->cra_ctxsize; +} + +const struct crypto_type crypto_akcipher_type = { + .ctxsize = crypto_akcipher_ctxsize, .extsize = crypto_alg_extsize, + .init = crypto_akcipher_init, .init_tfm = crypto_akcipher_init_tfm, #ifdef CONFIG_PROC_FS .show = crypto_akcipher_show, @@ -88,6 +101,7 @@ static const struct crypto_type crypto_akcipher_type = { .type = CRYPTO_ALG_TYPE_AKCIPHER, .tfmsize = offsetof(struct crypto_akcipher, base), }; +EXPORT_SYMBOL_GPL(crypto_akcipher_type); struct crypto_akcipher *crypto_alloc_akcipher(const char *alg_name, u32 type, u32 mask) diff --git a/crypto/rsa-padding.c b/crypto/rsa-padding.c new file mode 100644 index 0000000..106ce62 --- /dev/null +++ b/crypto/rsa-padding.c @@ -0,0 +1,438 @@ +/* + * RSA padding templates. + * + * Copyright (c) 2015 Intel Corporation + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the Free + * Software Foundation; either version 2 of the License, or (at your option) + * any later version. + */ + +#include <crypto/algapi.h> +#include <crypto/akcipher.h> +#include <crypto/internal/akcipher.h> +#include <linux/err.h> +#include <linux/init.h> +#include <linux/kernel.h> +#include <linux/module.h> +#include <linux/random.h> + +struct pkcs1pad_ctx { + struct crypto_akcipher *child; + + unsigned int key_size; +}; + +static int pkcs1pad_setkey(struct crypto_akcipher *tfm, const void *key, + unsigned int keylen) +{ + struct pkcs1pad_ctx *ctx = akcipher_tfm_ctx(tfm); + struct akcipher_request *req; + int err; + + err = crypto_akcipher_setkey(ctx->child, key, keylen); + + if (!err) { + /* Find out new modulus size from rsa implementation */ + req = akcipher_request_alloc(ctx->child, GFP_KERNEL); + if (IS_ERR(req)) + return PTR_ERR(req); + + akcipher_request_set_crypt(req, NULL, NULL, 0, 0); + if (crypto_akcipher_encrypt(req) != -EOVERFLOW) + err = -EINVAL; + + ctx->key_size = req->dst_len; + akcipher_request_free(req); + } + + return err; +} + +static int pkcs1pad_encrypt_sign_complete(struct akcipher_request *req, int err) +{ + struct akcipher_request *child_req = akcipher_request_ctx(req); + + kfree(child_req->src); + req->dst_len = child_req->dst_len; + return err; +} + +static void pkcs1pad_encrypt_sign_complete_cb( + struct crypto_async_request *child_async_req, int err) +{ + struct akcipher_request *req = child_async_req->data; + struct crypto_async_request async_req; + + if (err == -EINPROGRESS) + return; + + async_req.data = req->base.data; + async_req.tfm = crypto_akcipher_tfm(crypto_akcipher_reqtfm(req)); + async_req.flags = child_async_req->flags; + req->base.complete(&async_req, + pkcs1pad_encrypt_sign_complete(req, err)); +} + +static int pkcs1pad_encrypt(struct akcipher_request *req) +{ + struct crypto_akcipher *tfm = crypto_akcipher_reqtfm(req); + struct pkcs1pad_ctx *ctx = akcipher_tfm_ctx(tfm); + struct akcipher_request *child_req = akcipher_request_ctx(req); + int err, i, ps_len; + uint8_t *src; + + if (!ctx->key_size) + return -EINVAL; + + if (req->src_len > ctx->key_size - 11) + return -EOVERFLOW; + + src = kmalloc(ctx->key_size, + (req->base.flags & CRYPTO_TFM_REQ_MAY_SLEEP) ? + GFP_KERNEL : GFP_ATOMIC); + if (!src) + return -ENOMEM; + + /* Reuse output buffer, add padding in the input */ + child_req->src = src; + child_req->src_len = ctx->key_size; + child_req->dst = req->dst; + child_req->dst_len = req->dst_len; + + ps_len = ctx->key_size - req->src_len - 3; + src[0] = 0x00; + src[1] = 0x02; + for (i = 0; i < ps_len; i++) + src[2 + i] = 1 + prandom_u32_max(255); + src[ps_len + 2] = 0x00; + memcpy(src + ps_len + 3, req->src, req->src_len); + + akcipher_request_set_tfm(child_req, ctx->child); + akcipher_request_set_callback(child_req, req->base.flags, + pkcs1pad_encrypt_sign_complete_cb, req); + + err = crypto_akcipher_encrypt(child_req); + if (err != -EINPROGRESS && err != -EBUSY) + return pkcs1pad_encrypt_sign_complete(req, err); + + return err; +} + +static int pkcs1pad_decrypt_complete(struct akcipher_request *req, int err) +{ + struct akcipher_request *child_req = akcipher_request_ctx(req); + int pos; + uint8_t *dst = child_req->dst; + + BUG_ON(err == -EOVERFLOW); + + if (err) + goto done; + + if (dst[0] != 0x00) { + err = -EINVAL; + goto done; + } + if (dst[1] != 0x02) { + err = -EINVAL; + goto done; + } + for (pos = 2; pos < child_req->dst_len; pos++) + if (dst[pos] == 0x00) + break; + if (pos < 10 || pos == child_req->dst_len) { + err = -EINVAL; + goto done; + } + pos++; + + if (req->dst_len < child_req->dst_len - pos) + err = -EOVERFLOW; + req->dst_len = child_req->dst_len - pos; + + if (!err) + memcpy(req->dst, dst + pos, req->dst_len); + +done: + kfree(dst); + return err; +} + +static void pkcs1pad_decrypt_complete_cb( + struct crypto_async_request *child_async_req, int err) +{ + struct akcipher_request *req = child_async_req->data; + struct crypto_async_request async_req; + + if (err == -EINPROGRESS) + return; + + async_req.data = req->base.data; + async_req.tfm = crypto_akcipher_tfm(crypto_akcipher_reqtfm(req)); + async_req.flags = child_async_req->flags; + req->base.complete(&async_req, pkcs1pad_decrypt_complete(req, err)); +} + +static int pkcs1pad_decrypt(struct akcipher_request *req) +{ + struct crypto_akcipher *tfm = crypto_akcipher_reqtfm(req); + struct pkcs1pad_ctx *ctx = akcipher_tfm_ctx(tfm); + struct akcipher_request *child_req = akcipher_request_ctx(req); + int err; + uint8_t *dst; + + if (!ctx->key_size) + return -EINVAL; + + dst = kmalloc(ctx->key_size, + (req->base.flags & CRYPTO_TFM_REQ_MAY_SLEEP) ? + GFP_KERNEL : GFP_ATOMIC); + if (!dst) + return -ENOMEM; + + /* Reuse input buffer, strip padding from the output */ + child_req->src = req->src; + child_req->src_len = req->src_len; + child_req->dst = dst; + child_req->dst_len = ctx->key_size; + + akcipher_request_set_tfm(child_req, ctx->child); + akcipher_request_set_callback(child_req, req->base.flags, + pkcs1pad_decrypt_complete_cb, req); + + err = crypto_akcipher_decrypt(child_req); + if (err != -EINPROGRESS && err != -EBUSY) + return pkcs1pad_decrypt_complete(req, err); + + return err; +} + +static int pkcs1pad_sign(struct akcipher_request *req) +{ + struct crypto_akcipher *tfm = crypto_akcipher_reqtfm(req); + struct pkcs1pad_ctx *ctx = akcipher_tfm_ctx(tfm); + struct akcipher_request *child_req = akcipher_request_ctx(req); + int err, i, ps_len; + uint8_t *src; + + if (!ctx->key_size) + return -EINVAL; + + if (req->src_len > ctx->key_size - 11) + return -EOVERFLOW; + + src = kmalloc(ctx->key_size, + (req->base.flags & CRYPTO_TFM_REQ_MAY_SLEEP) ? + GFP_KERNEL : GFP_ATOMIC); + if (!src) + return -ENOMEM; + + /* Reuse output buffer, add padding in the input */ + child_req->src = src; + child_req->src_len = ctx->key_size; + child_req->dst = req->dst; + child_req->dst_len = req->dst_len; + + ps_len = ctx->key_size - req->src_len - 3; + src[0] = 0x00; + src[1] = 0x01; + for (i = 0; i < ps_len; i++) + src[2 + i] = 0xff; + src[ps_len + 2] = 0x00; + memcpy(src + ps_len + 3, req->src, req->src_len); + + akcipher_request_set_tfm(child_req, ctx->child); + akcipher_request_set_callback(child_req, req->base.flags, + pkcs1pad_encrypt_sign_complete_cb, req); + + err = crypto_akcipher_sign(child_req); + if (err != -EINPROGRESS && err != -EBUSY) + return pkcs1pad_encrypt_sign_complete(req, err); + + return err; +} + +static int pkcs1pad_verify_complete(struct akcipher_request *req, int err) +{ + struct akcipher_request *child_req = akcipher_request_ctx(req); + int pos; + uint8_t *dst = child_req->dst; + + BUG_ON(err == -EOVERFLOW); + + if (err) + goto done; + + if (dst[0] != 0x00) { + err = -EINVAL; + goto done; + } + if (dst[1] != 0x01) { + err = -EINVAL; + goto done; + } + for (pos = 2; pos < child_req->dst_len; pos++) + if (dst[pos] != 0xff) + break; + if (pos < 10 || pos == child_req->dst_len || dst[pos] != 0x00) { + err = -EINVAL; + goto done; + } + pos++; + + if (req->dst_len < child_req->dst_len - pos) + err = -EOVERFLOW; + req->dst_len = child_req->dst_len - pos; + + if (!err) + memcpy(req->dst, dst + pos, req->dst_len); + +done: + kfree(dst); + return err; +} + +static void pkcs1pad_verify_complete_cb( + struct crypto_async_request *child_async_req, int err) +{ + struct akcipher_request *req = child_async_req->data; + struct crypto_async_request async_req; + + if (err == -EINPROGRESS) + return; + + async_req.data = req->base.data; + async_req.tfm = crypto_akcipher_tfm(crypto_akcipher_reqtfm(req)); + async_req.flags = child_async_req->flags; + req->base.complete(&async_req, pkcs1pad_verify_complete(req, err)); +} + +static int pkcs1pad_verify(struct akcipher_request *req) +{ + struct crypto_akcipher *tfm = crypto_akcipher_reqtfm(req); + struct pkcs1pad_ctx *ctx = akcipher_tfm_ctx(tfm); + struct akcipher_request *child_req = akcipher_request_ctx(req); + int err; + uint8_t *dst; + + if (!ctx->key_size) + return -EINVAL; + + dst = kmalloc(ctx->key_size, + (req->base.flags & CRYPTO_TFM_REQ_MAY_SLEEP) ? + GFP_KERNEL : GFP_ATOMIC); + if (!dst) + return -ENOMEM; + + /* Reuse input buffer, strip padding from the output */ + child_req->src = req->src; + child_req->src_len = req->src_len; + child_req->dst = dst; + child_req->dst_len = ctx->key_size; + + akcipher_request_set_tfm(child_req, ctx->child); + akcipher_request_set_callback(child_req, req->base.flags, + pkcs1pad_verify_complete_cb, req); + + err = crypto_akcipher_verify(child_req); + if (err != -EINPROGRESS && err != -EBUSY) + return pkcs1pad_verify_complete(req, err); + + return err; +} + +static int pkcs1pad_init_tfm(struct crypto_tfm *tfm) +{ + struct crypto_instance *inst = (void *) tfm->__crt_alg; + struct pkcs1pad_ctx *ctx = crypto_tfm_ctx(tfm); + struct crypto_tfm *new_tfm; + + new_tfm = crypto_spawn_tfm(crypto_instance_ctx(inst), + CRYPTO_ALG_TYPE_AKCIPHER, CRYPTO_ALG_TYPE_MASK); + if (IS_ERR(new_tfm)) + return PTR_ERR(new_tfm); + + ctx->child = __crypto_akcipher_tfm(new_tfm); + + return 0; +} + +static void pkcs1pad_exit_tfm(struct crypto_tfm *tfm) +{ + struct pkcs1pad_ctx *ctx = crypto_tfm_ctx(tfm); + + crypto_free_akcipher(ctx->child); +} + +static struct crypto_instance *pkcs1pad_alloc(struct rtattr **tb) +{ + struct crypto_instance *inst = NULL; + struct crypto_alg *alg; + struct akcipher_alg *akalg; + int err; + + err = crypto_check_attr_type(tb, CRYPTO_ALG_TYPE_AKCIPHER); + if (err) + return ERR_PTR(err); + + alg = crypto_get_attr_alg(tb, CRYPTO_ALG_TYPE_AKCIPHER, + CRYPTO_ALG_TYPE_MASK); + if (IS_ERR(alg)) + return ERR_CAST(alg); + + akalg = crypto_alloc_instance2("pkcs1pad", alg, + crypto_akcipher_type.tfmsize); + if (IS_ERR(akalg)) { + inst = ERR_CAST(akalg); + goto out_put_alg; + } + + inst = container_of(&akalg->base, struct crypto_instance, alg); + + err = crypto_init_spawn2(crypto_instance_ctx(inst), alg, inst, + &crypto_akcipher_type); + if (err) { + inst = ERR_PTR(err); + kfree(akalg); + + goto out_put_alg; + } + + inst->alg.cra_flags = CRYPTO_ALG_TYPE_AKCIPHER; + inst->alg.cra_priority = alg->cra_priority; + inst->alg.cra_type = alg->cra_type; + + inst->alg.cra_ctxsize = sizeof(struct pkcs1pad_ctx); + + inst->alg.cra_init = pkcs1pad_init_tfm; + inst->alg.cra_exit = pkcs1pad_exit_tfm; + + akalg->encrypt = pkcs1pad_encrypt; + akalg->decrypt = pkcs1pad_decrypt; + akalg->sign = pkcs1pad_sign; + akalg->verify = pkcs1pad_verify; + akalg->setkey = pkcs1pad_setkey; + akalg->reqsize = sizeof(struct akcipher_request) + + __crypto_akcipher_alg(alg)->reqsize; + +out_put_alg: + crypto_mod_put(alg); + return inst; +} + +static void pkcs1pad_free(struct crypto_instance *inst) +{ + struct akcipher_alg *akalg = __crypto_akcipher_alg(&inst->alg); + + crypto_drop_spawn(crypto_instance_ctx(inst)); + kfree(akalg); +} + +struct crypto_template rsa_pkcs1pad_tmpl = { + .name = "pkcs1pad", + .alloc = pkcs1pad_alloc, + .free = pkcs1pad_free, + .module = THIS_MODULE, +}; diff --git a/crypto/rsa.c b/crypto/rsa.c index 752af06..1f030fa 100644 --- a/crypto/rsa.c +++ b/crypto/rsa.c @@ -13,6 +13,7 @@ #include <crypto/internal/rsa.h> #include <crypto/internal/akcipher.h> #include <crypto/akcipher.h> +#include <crypto/algapi.h> /* * RSAEP function [RFC3447 sec 5.1.1] @@ -300,11 +301,24 @@ static struct akcipher_alg rsa = { static int rsa_init(void) { - return crypto_register_akcipher(&rsa); + int err; + + err = crypto_register_akcipher(&rsa); + if (err) + return err; + + err = crypto_register_template(&rsa_pkcs1pad_tmpl); + if (err) { + crypto_unregister_akcipher(&rsa); + return err; + } + + return 0; } static void rsa_exit(void) { + crypto_unregister_template(&rsa_pkcs1pad_tmpl); crypto_unregister_akcipher(&rsa); } diff --git a/include/crypto/akcipher.h b/include/crypto/akcipher.h index 69d163e..6ab7a7f 100644 --- a/include/crypto/akcipher.h +++ b/include/crypto/akcipher.h @@ -330,8 +330,8 @@ static inline int crypto_akcipher_verify(struct akcipher_request *req) * * Return: zero on success; error code in case of error */ -static inline int crypto_akcipher_setkey(struct crypto_akcipher *tfm, void *key, - unsigned int keylen) +static inline int crypto_akcipher_setkey(struct crypto_akcipher *tfm, + const void *key, unsigned int keylen) { struct akcipher_alg *alg = crypto_akcipher_alg(tfm); diff --git a/include/crypto/algapi.h b/include/crypto/algapi.h index d4ebf6e..b48ed67 100644 --- a/include/crypto/algapi.h +++ b/include/crypto/algapi.h @@ -128,6 +128,7 @@ struct ablkcipher_walk { extern const struct crypto_type crypto_ablkcipher_type; extern const struct crypto_type crypto_blkcipher_type; +extern const struct crypto_type crypto_akcipher_type; void crypto_mod_put(struct crypto_alg *alg); diff --git a/include/crypto/internal/rsa.h b/include/crypto/internal/rsa.h index a8c8636..162baf9 100644 --- a/include/crypto/internal/rsa.h +++ b/include/crypto/internal/rsa.h @@ -24,4 +24,6 @@ int rsa_parse_key(struct rsa_key *rsa_key, const void *key, unsigned int key_len); void rsa_free_key(struct rsa_key *rsa_key); + +extern struct crypto_template rsa_pkcs1pad_tmpl; #endif
This patch adds PKCS#1 v1.5 standard RSA padding as a separate template. This way an RSA cipher with padding can be obtained by instantiating "pkcs1pad(rsa-generic)". The reason for adding this is that RSA is almost never used without this padding (or OAEP) so it will be needed for either certificate work in the kernel or the userspace, and also I hear that it is likely implemented by hardware RSA. From the generic code I could not figure out why the crypto_type.init and .ctxsize functions are needed for a template but not for a standalone algorithm but I see the word "compat" in their implementations for shash or blkcipher. If they are to be added for akcipher it should probably be a separate patch. Signed-off-by: Andrew Zaborowski <andrew.zaborowski@intel.com> --- crypto/Makefile | 1 + crypto/akcipher.c | 16 +- crypto/rsa-padding.c | 438 ++++++++++++++++++++++++++++++++++++++++++ crypto/rsa.c | 16 +- include/crypto/akcipher.h | 4 +- include/crypto/algapi.h | 1 + include/crypto/internal/rsa.h | 2 + 7 files changed, 474 insertions(+), 4 deletions(-) create mode 100644 crypto/rsa-padding.c