From: Ard Biesheuvel <ard.biesheuvel@linaro.org>
To: linux-crypto@vger.kernel.org
Cc: herbert@gondor.apana.org.au, ebiggers@kernel.org,
horia.geanta@nxp.com, Ard Biesheuvel <ard.biesheuvel@linaro.org>
Subject: [PATCH v4 28/30] crypto: x86/des - switch to library interface
Date: Mon, 5 Aug 2019 20:00:35 +0300 [thread overview]
Message-ID: <20190805170037.31330-29-ard.biesheuvel@linaro.org> (raw)
In-Reply-To: <20190805170037.31330-1-ard.biesheuvel@linaro.org>
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
---
arch/x86/crypto/des3_ede_glue.c | 42 +++++++++++---------
1 file changed, 23 insertions(+), 19 deletions(-)
diff --git a/arch/x86/crypto/des3_ede_glue.c b/arch/x86/crypto/des3_ede_glue.c
index f730a312ce35..89830e531350 100644
--- a/arch/x86/crypto/des3_ede_glue.c
+++ b/arch/x86/crypto/des3_ede_glue.c
@@ -11,7 +11,7 @@
*/
#include <crypto/algapi.h>
-#include <crypto/internal/des.h>
+#include <crypto/des.h>
#include <crypto/internal/skcipher.h>
#include <linux/crypto.h>
#include <linux/init.h>
@@ -19,8 +19,8 @@
#include <linux/types.h>
struct des3_ede_x86_ctx {
- u32 enc_expkey[DES3_EDE_EXPKEY_WORDS];
- u32 dec_expkey[DES3_EDE_EXPKEY_WORDS];
+ struct des3_ede_ctx enc;
+ struct des3_ede_ctx dec;
};
/* regular block cipher functions */
@@ -34,7 +34,7 @@ asmlinkage void des3_ede_x86_64_crypt_blk_3way(const u32 *expkey, u8 *dst,
static inline void des3_ede_enc_blk(struct des3_ede_x86_ctx *ctx, u8 *dst,
const u8 *src)
{
- u32 *enc_ctx = ctx->enc_expkey;
+ u32 *enc_ctx = ctx->enc.expkey;
des3_ede_x86_64_crypt_blk(enc_ctx, dst, src);
}
@@ -42,7 +42,7 @@ static inline void des3_ede_enc_blk(struct des3_ede_x86_ctx *ctx, u8 *dst,
static inline void des3_ede_dec_blk(struct des3_ede_x86_ctx *ctx, u8 *dst,
const u8 *src)
{
- u32 *dec_ctx = ctx->dec_expkey;
+ u32 *dec_ctx = ctx->dec.expkey;
des3_ede_x86_64_crypt_blk(dec_ctx, dst, src);
}
@@ -50,7 +50,7 @@ static inline void des3_ede_dec_blk(struct des3_ede_x86_ctx *ctx, u8 *dst,
static inline void des3_ede_enc_blk_3way(struct des3_ede_x86_ctx *ctx, u8 *dst,
const u8 *src)
{
- u32 *enc_ctx = ctx->enc_expkey;
+ u32 *enc_ctx = ctx->enc.expkey;
des3_ede_x86_64_crypt_blk_3way(enc_ctx, dst, src);
}
@@ -58,7 +58,7 @@ static inline void des3_ede_enc_blk_3way(struct des3_ede_x86_ctx *ctx, u8 *dst,
static inline void des3_ede_dec_blk_3way(struct des3_ede_x86_ctx *ctx, u8 *dst,
const u8 *src)
{
- u32 *dec_ctx = ctx->dec_expkey;
+ u32 *dec_ctx = ctx->dec.expkey;
des3_ede_x86_64_crypt_blk_3way(dec_ctx, dst, src);
}
@@ -122,7 +122,7 @@ static int ecb_encrypt(struct skcipher_request *req)
struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(req);
struct des3_ede_x86_ctx *ctx = crypto_skcipher_ctx(tfm);
- return ecb_crypt(req, ctx->enc_expkey);
+ return ecb_crypt(req, ctx->enc.expkey);
}
static int ecb_decrypt(struct skcipher_request *req)
@@ -130,7 +130,7 @@ static int ecb_decrypt(struct skcipher_request *req)
struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(req);
struct des3_ede_x86_ctx *ctx = crypto_skcipher_ctx(tfm);
- return ecb_crypt(req, ctx->dec_expkey);
+ return ecb_crypt(req, ctx->dec.expkey);
}
static unsigned int __cbc_encrypt(struct des3_ede_x86_ctx *ctx,
@@ -348,24 +348,28 @@ static int des3_ede_x86_setkey(struct crypto_tfm *tfm, const u8 *key,
u32 i, j, tmp;
int err;
- err = crypto_des3_ede_verify_key(tfm, key);
- if (err)
- return err;
+ err = des3_ede_expand_key(&ctx->enc, key, keylen);
+ if (err == -ENOKEY) {
+ if (crypto_tfm_get_flags(tfm) & CRYPTO_TFM_REQ_FORBID_WEAK_KEYS)
+ err = -EINVAL;
+ else
+ err = 0;
+ }
- /* Generate encryption context using generic implementation. */
- err = __des3_ede_setkey(ctx->enc_expkey, &tfm->crt_flags, key, keylen);
- if (err < 0)
+ if (err) {
+ memset(ctx, 0, sizeof(*ctx));
return err;
+ }
/* Fix encryption context for this implementation and form decryption
* context. */
j = DES3_EDE_EXPKEY_WORDS - 2;
for (i = 0; i < DES3_EDE_EXPKEY_WORDS; i += 2, j -= 2) {
- tmp = ror32(ctx->enc_expkey[i + 1], 4);
- ctx->enc_expkey[i + 1] = tmp;
+ tmp = ror32(ctx->enc.expkey[i + 1], 4);
+ ctx->enc.expkey[i + 1] = tmp;
- ctx->dec_expkey[j + 0] = ctx->enc_expkey[i + 0];
- ctx->dec_expkey[j + 1] = tmp;
+ ctx->dec.expkey[j + 0] = ctx->enc.expkey[i + 0];
+ ctx->dec.expkey[j + 1] = tmp;
}
return 0;
--
2.17.1
next prev parent reply other threads:[~2019-08-05 17:02 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-05 17:00 [PATCH v4 00/30] crypto: DES/3DES cleanup Ard Biesheuvel
2019-08-05 17:00 ` [PATCH v4 01/30] crypto: des/3des_ede - add new helpers to verify keys Ard Biesheuvel
2019-08-05 17:00 ` [PATCH v4 02/30] crypto: s390/des - switch to new verification routines Ard Biesheuvel
2019-08-06 6:12 ` Harald Freudenberger
2019-08-05 17:00 ` [PATCH v4 03/30] crypto: sparc/des " Ard Biesheuvel
2019-08-05 17:00 ` [PATCH v4 04/30] crypto: atmel/des " Ard Biesheuvel
2019-08-05 17:00 ` [PATCH v4 05/30] crypto: bcm/des " Ard Biesheuvel
2019-08-05 17:00 ` [PATCH v4 06/30] crypto: caam/des " Ard Biesheuvel
2019-08-15 4:54 ` Herbert Xu
2019-08-15 5:01 ` Ard Biesheuvel
2019-08-15 5:43 ` Ard Biesheuvel
2019-08-15 11:37 ` Herbert Xu
2019-08-05 17:00 ` [PATCH v4 07/30] crypto: cpt/des " Ard Biesheuvel
2019-08-05 17:00 ` [PATCH v4 08/30] crypto: nitrox/des " Ard Biesheuvel
2019-08-05 17:00 ` [PATCH v4 09/30] crypto: ccp/des " Ard Biesheuvel
2019-08-05 17:00 ` [PATCH v4 10/30] crypto: ccree/des " Ard Biesheuvel
2019-08-05 17:00 ` [PATCH v4 11/30] crypto: hifn/des " Ard Biesheuvel
2019-08-05 17:00 ` [PATCH v4 12/30] crypto: hisilicon/des " Ard Biesheuvel
2019-08-05 17:00 ` [PATCH v4 13/30] crypto: safexcel/des " Ard Biesheuvel
2019-08-05 17:00 ` [PATCH v4 14/30] crypto: ixp4xx/des " Ard Biesheuvel
2019-08-05 17:00 ` [PATCH v4 15/30] crypto: cesa/des " Ard Biesheuvel
2019-08-05 17:00 ` [PATCH v4 16/30] crypto: n2/des " Ard Biesheuvel
2019-08-05 17:00 ` [PATCH v4 17/30] crypto: omap/des " Ard Biesheuvel
2019-08-05 17:00 ` [PATCH v4 18/30] crypto: picoxcell/des " Ard Biesheuvel
2019-08-05 17:00 ` [PATCH v4 19/30] crypto: qce/des " Ard Biesheuvel
2019-08-05 17:00 ` [PATCH v4 20/30] crypto: rk3288/des " Ard Biesheuvel
2019-08-05 17:00 ` [PATCH v4 21/30] crypto: stm32/des " Ard Biesheuvel
2019-08-05 17:00 ` [PATCH v4 22/30] crypto: sun4i/des " Ard Biesheuvel
2019-08-05 17:00 ` [PATCH v4 23/30] crypto: talitos/des " Ard Biesheuvel
2019-08-05 20:00 ` Christophe Leroy
2019-08-05 17:00 ` [PATCH v4 24/30] crypto: ux500/des " Ard Biesheuvel
2019-08-05 17:00 ` [PATCH v4 25/30] crypto: 3des - move verification out of exported routine Ard Biesheuvel
2019-08-05 17:00 ` [PATCH v4 26/30] crypto: des - remove unused function Ard Biesheuvel
2019-08-05 17:00 ` [PATCH v4 27/30] crypto: des - split off DES library from generic DES cipher driver Ard Biesheuvel
2019-08-05 17:00 ` Ard Biesheuvel [this message]
2019-08-05 17:00 ` [PATCH v4 29/30] crypto: des - remove now unused __des3_ede_setkey() Ard Biesheuvel
2019-08-05 17:00 ` [PATCH v4 30/30] fs: cifs: move from the crypto cipher API to the new DES library interface Ard Biesheuvel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190805170037.31330-29-ard.biesheuvel@linaro.org \
--to=ard.biesheuvel@linaro.org \
--cc=ebiggers@kernel.org \
--cc=herbert@gondor.apana.org.au \
--cc=horia.geanta@nxp.com \
--cc=linux-crypto@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).