Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 40725181 authored by Herbert Xu's avatar Herbert Xu Committed by David S. Miller
Browse files

[CRYPTO] Add support for low-level multi-block operations 



This patch adds hooks for cipher algorithms to implement multi-block
ECB/CBC operations directly.  This is expected to provide significant
performance boots to the VIA Padlock.

It could also be used for improving software implementations such as
AES where operating on multiple blocks at a time may enable certain
optimisations.

Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c774e93e

crypto/cipher.c

+18 −20
Original line number Original line Diff line number Diff line
@@ -23,14 +23,6 @@ 
#include "internal.h"

#include "internal.h"

#include "scatterwalk.h"

#include "scatterwalk.h"





struct cipher_desc {

	struct crypto_tfm *tfm;

	void (*crfn)(void *ctx, u8 *dst, const u8 *src);

	unsigned int (*prfn)(const struct cipher_desc *desc, u8 *dst,

			     const u8 *src, unsigned int nbytes);

	void *info;

};



static inline void xor_64(u8 *a, const u8 *b)

static inline void xor_64(u8 *a, const u8 *b)

{

{

	((u32 *)a)[0] ^= ((u32 *)b)[0];

	((u32 *)a)[0] ^= ((u32 *)b)[0];
@@ -224,10 +216,11 @@ static int ecb_encrypt(struct crypto_tfm *tfm, 
                       struct scatterlist *src, unsigned int nbytes)

                       struct scatterlist *src, unsigned int nbytes)

{

{

	struct cipher_desc desc;

	struct cipher_desc desc;

	struct cipher_alg *cipher = &tfm->__crt_alg->cra_cipher;





	desc.tfm = tfm;

	desc.tfm = tfm;

	desc.crfn = tfm->__crt_alg->cra_cipher.cia_encrypt;

	desc.crfn = cipher->cia_encrypt;

	desc.prfn = ecb_process;

	desc.prfn = cipher->cia_encrypt_ecb ?: ecb_process;





	return crypt(&desc, dst, src, nbytes);

	return crypt(&desc, dst, src, nbytes);

}

}
@@ -238,10 +231,11 @@ static int ecb_decrypt(struct crypto_tfm *tfm, 
		       unsigned int nbytes)

		       unsigned int nbytes)

{

{

	struct cipher_desc desc;

	struct cipher_desc desc;

	struct cipher_alg *cipher = &tfm->__crt_alg->cra_cipher;





	desc.tfm = tfm;

	desc.tfm = tfm;

	desc.crfn = tfm->__crt_alg->cra_cipher.cia_decrypt;

	desc.crfn = cipher->cia_decrypt;

	desc.prfn = ecb_process;

	desc.prfn = cipher->cia_decrypt_ecb ?: ecb_process;





	return crypt(&desc, dst, src, nbytes);

	return crypt(&desc, dst, src, nbytes);

}

}
@@ -252,10 +246,11 @@ static int cbc_encrypt(struct crypto_tfm *tfm, 
		       unsigned int nbytes)

		       unsigned int nbytes)

{

{

	struct cipher_desc desc;

	struct cipher_desc desc;

	struct cipher_alg *cipher = &tfm->__crt_alg->cra_cipher;





	desc.tfm = tfm;

	desc.tfm = tfm;

	desc.crfn = tfm->__crt_alg->cra_cipher.cia_encrypt;

	desc.crfn = cipher->cia_encrypt;

	desc.prfn = cbc_process_encrypt;

	desc.prfn = cipher->cia_encrypt_cbc ?: cbc_process_encrypt;

	desc.info = tfm->crt_cipher.cit_iv;

	desc.info = tfm->crt_cipher.cit_iv;





	return crypt(&desc, dst, src, nbytes);

	return crypt(&desc, dst, src, nbytes);
@@ -267,10 +262,11 @@ static int cbc_encrypt_iv(struct crypto_tfm *tfm, 
                          unsigned int nbytes, u8 *iv)

                          unsigned int nbytes, u8 *iv)

{

{

	struct cipher_desc desc;

	struct cipher_desc desc;

	struct cipher_alg *cipher = &tfm->__crt_alg->cra_cipher;





	desc.tfm = tfm;

	desc.tfm = tfm;

	desc.crfn = tfm->__crt_alg->cra_cipher.cia_encrypt;

	desc.crfn = cipher->cia_encrypt;

	desc.prfn = cbc_process_encrypt;

	desc.prfn = cipher->cia_encrypt_cbc ?: cbc_process_encrypt;

	desc.info = iv;

	desc.info = iv;





	return crypt(&desc, dst, src, nbytes);

	return crypt(&desc, dst, src, nbytes);
@@ -282,10 +278,11 @@ static int cbc_decrypt(struct crypto_tfm *tfm, 
		       unsigned int nbytes)

		       unsigned int nbytes)

{

{

	struct cipher_desc desc;

	struct cipher_desc desc;

	struct cipher_alg *cipher = &tfm->__crt_alg->cra_cipher;





	desc.tfm = tfm;

	desc.tfm = tfm;

	desc.crfn = tfm->__crt_alg->cra_cipher.cia_decrypt;

	desc.crfn = cipher->cia_decrypt;

	desc.prfn = cbc_process_decrypt;

	desc.prfn = cipher->cia_decrypt_cbc ?: cbc_process_decrypt;

	desc.info = tfm->crt_cipher.cit_iv;

	desc.info = tfm->crt_cipher.cit_iv;





	return crypt(&desc, dst, src, nbytes);

	return crypt(&desc, dst, src, nbytes);
@@ -297,10 +294,11 @@ static int cbc_decrypt_iv(struct crypto_tfm *tfm, 
                          unsigned int nbytes, u8 *iv)

                          unsigned int nbytes, u8 *iv)

{

{

	struct cipher_desc desc;

	struct cipher_desc desc;

	struct cipher_alg *cipher = &tfm->__crt_alg->cra_cipher;





	desc.tfm = tfm;

	desc.tfm = tfm;

	desc.crfn = tfm->__crt_alg->cra_cipher.cia_decrypt;

	desc.crfn = cipher->cia_decrypt;

	desc.prfn = cbc_process_decrypt;

	desc.prfn = cipher->cia_decrypt_cbc ?: cbc_process_decrypt;

	desc.info = iv;

	desc.info = iv;





	return crypt(&desc, dst, src, nbytes);

	return crypt(&desc, dst, src, nbytes);

crypto/internal.h

+0 −5
Original line number Original line Diff line number Diff line
@@ -42,11 +42,6 @@ static inline void crypto_yield(struct crypto_tfm *tfm) 
		cond_resched();

		cond_resched();

}

}





static inline void *crypto_tfm_ctx(struct crypto_tfm *tfm)

{

	return (void *)&tfm[1];

}



struct crypto_alg *crypto_alg_lookup(const char *name);

struct crypto_alg *crypto_alg_lookup(const char *name);





/* A far more intelligent version of this is planned.  For now, just

/* A far more intelligent version of this is planned.  For now, just

include/linux/crypto.h

+27 −1
Original line number Original line Diff line number Diff line
@@ -61,6 +61,15 @@ 
#define CRYPTO_DIR_DECRYPT		0

#define CRYPTO_DIR_DECRYPT		0





struct scatterlist;

struct scatterlist;

struct crypto_tfm;



struct cipher_desc {

	struct crypto_tfm *tfm;

	void (*crfn)(void *ctx, u8 *dst, const u8 *src);

	unsigned int (*prfn)(const struct cipher_desc *desc, u8 *dst,

			     const u8 *src, unsigned int nbytes);

	void *info;

};





/*

/*

 * Algorithms: modular crypto algorithm implementations, managed

 * Algorithms: modular crypto algorithm implementations, managed
@@ -73,6 +82,19 @@ struct cipher_alg { 
	                  unsigned int keylen, u32 *flags);

	                  unsigned int keylen, u32 *flags);

	void (*cia_encrypt)(void *ctx, u8 *dst, const u8 *src);

	void (*cia_encrypt)(void *ctx, u8 *dst, const u8 *src);

	void (*cia_decrypt)(void *ctx, u8 *dst, const u8 *src);

	void (*cia_decrypt)(void *ctx, u8 *dst, const u8 *src);



	unsigned int (*cia_encrypt_ecb)(const struct cipher_desc *desc,

					u8 *dst, const u8 *src,

					unsigned int nbytes);

	unsigned int (*cia_decrypt_ecb)(const struct cipher_desc *desc,

					u8 *dst, const u8 *src,

					unsigned int nbytes);

	unsigned int (*cia_encrypt_cbc)(const struct cipher_desc *desc,

					u8 *dst, const u8 *src,

					unsigned int nbytes);

	unsigned int (*cia_decrypt_cbc)(const struct cipher_desc *desc,

					u8 *dst, const u8 *src,

					unsigned int nbytes);

};

};





struct digest_alg {

struct digest_alg {
@@ -136,7 +158,6 @@ static inline int crypto_alg_available(const char *name, u32 flags) 
 * and core processing logic.  Managed via crypto_alloc_tfm() and

 * and core processing logic.  Managed via crypto_alloc_tfm() and

 * crypto_free_tfm(), as well as the various helpers below.

 * crypto_free_tfm(), as well as the various helpers below.

 */

 */

struct crypto_tfm;





struct cipher_tfm {

struct cipher_tfm {

	void *cit_iv;

	void *cit_iv;
@@ -266,6 +287,11 @@ static inline unsigned int crypto_tfm_alg_digestsize(struct crypto_tfm *tfm) 
	return tfm->__crt_alg->cra_digest.dia_digestsize;

	return tfm->__crt_alg->cra_digest.dia_digestsize;

}

}





static inline void *crypto_tfm_ctx(struct crypto_tfm *tfm)

{

	return (void *)&tfm[1];

}



/*

/*

 * API wrappers.

 * API wrappers.

 */

 */