crypto: constify test vectors
Subsystems (2)
cover crypto: constify test vectors
From: Eric Biggers <[email protected]>
These two patches mark all the cryptographic test vectors as 'const'. This has several potential advantages and moves a large amount of data from .data to .rodata when the tests are enabled. The second patch does the real work; the first just prepares for it by updating a function to take a const buffer argument.
Eric Biggers (2):
crypto: kpp - constify buffer passed to crypto_kpp_set_secret()
crypto: testmgr - constify all test vectors
crypto/dh.c | 3 +- crypto/ecdh.c | 3 +- crypto/testmgr.c | 71 ++-- crypto/testmgr.h | 512 +++++++++++++------------- drivers/crypto/qat/qat_common/qat_asym_algs.c | 2 +- include/crypto/kpp.h | 6 +- 6 files changed, 305 insertions(+), 292 deletions(-)
Signature · 1 line
2.11.0.483.g087da7b7c-goog
PATCH 1/2 crypto: kpp - constify buffer passed to crypto_kpp_set_secret()
From: Eric Biggers <[email protected]>
Constify the buffer passed to crypto_kpp_set_secret() and kpp_alg.set_secret, since it is never modified.
--- crypto/dh.c | 3 ++- crypto/ecdh.c | 3 ++- drivers/crypto/qat/qat_common/qat_asym_algs.c | 2 +- include/crypto/kpp.h | 6 +++--- 4 files changed, 8 insertions(+), 6 deletions(-)
crypto/dh.c +2 -1
@@ -79,7 +79,8 @@ static int dh_set_params(struct dh_ctx *ctx, struct dh *params)return 0 ; } -static int dh_set_secret (struct crypto_kpp *tfm,void *buf,unsigned int len) +static int dh_set_secret (struct crypto_kpp *tfm,const void *buf, +unsigned int len) {struct dh_ctx *ctx =dh_get_ctx (tfm);struct dh params;
crypto/ecdh.c +2 -1
@@ -38,7 +38,8 @@ static unsigned int ecdh_supported_curve(unsigned int curve_id) } } -static int ecdh_set_secret (struct crypto_kpp *tfm,void *buf,unsigned int len) +static int ecdh_set_secret (struct crypto_kpp *tfm,const void *buf, +unsigned int len) {struct ecdh_ctx *ctx =ecdh_get_ctx (tfm);struct ecdh params;
drivers/crypto/qat/qat_common/qat_asym_algs.c +1 -1
@@ -491,7 +491,7 @@ static void qat_dh_clear_ctx(struct device *dev, struct qat_dh_ctx *ctx) ctx->g2 = false; } -static int qat_dh_set_secret (struct crypto_kpp *tfm,void *buf, +static int qat_dh_set_secret (struct crypto_kpp *tfm,const void *buf,unsigned int len) {struct qat_dh_ctx *ctx =kpp_tfm_ctx (tfm);
include/crypto/kpp.h +3 -3
@@ -74,7 +74,7 @@ struct crypto_kpp {* @base: Common crypto API algorithm data structure */ struct kpp_alg { -int (*set_secret)(struct crypto_kpp *tfm,void *buffer, +int (*set_secret)(struct crypto_kpp *tfm,const void *buffer,unsigned int len);int (*generate_public_key)(struct kpp_request *req);int (*compute_shared_secret)(struct kpp_request *req);
@@ -273,8 +273,8 @@ struct kpp_secret {* * Return: zero on success; error code in case of error */ -static inline int crypto_kpp_set_secret (struct crypto_kpp *tfm,void *buffer, -unsigned int len) +static inline int crypto_kpp_set_secret (struct crypto_kpp *tfm, +const void *buffer,unsigned int len) {struct kpp_alg *alg =crypto_kpp_alg (tfm);
Signature · 1 line
2.11.0.483.g087da7b7c-goog
PATCH 2/2 crypto: testmgr - constify all test vectors
In reply to Eric BiggersFrom: Eric Biggers <[email protected]>
Cryptographic test vectors should never be modified, so constify them to enforce this at both compile-time and run-time. This moves a significant amount of data from .data to .rodata when the crypto tests are enabled.
--- crypto/testmgr.c | 71 ++++---- crypto/testmgr.h | 512 +++++++++++++++++++++++++++---------------------------- 2 files changed, 297 insertions(+), 286 deletions(-)
crypto/testmgr.c +41 -30
@@ -83,47 +83,47 @@ struct tcrypt_result {struct aead_test_suite {struct { -struct aead_testvec *vecs; +const struct aead_testvec *vecs;unsigned int count; } enc, dec; };struct cipher_test_suite {struct { -struct cipher_testvec *vecs; +const struct cipher_testvec *vecs;unsigned int count; } enc, dec; };struct comp_test_suite {struct { -struct comp_testvec *vecs; +const struct comp_testvec *vecs;unsigned int count; } comp, decomp; };struct hash_test_suite { -struct hash_testvec *vecs; +const struct hash_testvec *vecs;unsigned int count; };struct cprng_test_suite { -struct cprng_testvec *vecs; +const struct cprng_testvec *vecs;unsigned int count; };struct drbg_test_suite { -struct drbg_testvec *vecs; +const struct drbg_testvec *vecs;unsigned int count; };struct akcipher_test_suite { -struct akcipher_testvec *vecs; +const struct akcipher_testvec *vecs;unsigned int count; };struct kpp_test_suite { -struct kpp_testvec *vecs; +const struct kpp_testvec *vecs;unsigned int count; };
@@ -145,7 +145,8 @@ struct alg_test_desc { } suite; }; -static unsigned int IDX [8 ] = {IDX1 ,IDX2 ,IDX3 ,IDX4 ,IDX5 ,IDX6 ,IDX7 ,IDX8 }; +static const unsigned int IDX [8 ] = { +IDX1 ,IDX2 ,IDX3 ,IDX4 ,IDX5 ,IDX6 ,IDX7 ,IDX8 };static void hexdump (unsigned char *buf,unsigned int len) {
@@ -203,7 +204,7 @@ static int wait_async_op(struct tcrypt_result *tr, int ret) }static int ahash_partial_update (struct ahash_request **preq, -struct crypto_ahash *tfm,struct hash_testvec *template, +struct crypto_ahash *tfm,const struct hash_testvec *template,void *hash_buff,int k,int temp,struct scatterlist *sg,const char *algo,char *result,struct tcrypt_result *tresult) {
@@ -260,9 +261,9 @@ static int ahash_partial_update(struct ahash_request **preq,return ret; } -static int __test_hash (struct crypto_ahash *tfm,struct hash_testvec *template, -unsigned int tcount,bool use_digest, -const int align_offset) +static int __test_hash (struct crypto_ahash *tfm, +const struct hash_testvec *template,unsigned int tcount, +bool use_digest,const int align_offset) {const char *algo =crypto_tfm_alg_driver_name (crypto_ahash_tfm (tfm));size_t digest_size =crypto_ahash_digestsize (tfm);
@@ -538,7 +539,8 @@ static int __test_hash(struct crypto_ahash *tfm, struct hash_testvec *template,return ret; } -static int test_hash (struct crypto_ahash *tfm,struct hash_testvec *template, +static int test_hash (struct crypto_ahash *tfm, +const struct hash_testvec *template,unsigned int tcount,bool use_digest) {unsigned int alignmask;
@@ -566,7 +568,7 @@ static int test_hash(struct crypto_ahash *tfm, struct hash_testvec *template, }static int __test_aead (struct crypto_aead *tfm,int enc, -struct aead_testvec *template,unsigned int tcount, +const struct aead_testvec *template,unsigned int tcount,const bool diff_dst,const int align_offset) {const char *algo =crypto_tfm_alg_driver_name (crypto_aead_tfm (tfm));
@@ -957,7 +959,7 @@ static int __test_aead(struct crypto_aead *tfm, int enc, }static int test_aead (struct crypto_aead *tfm,int enc, -struct aead_testvec *template,unsigned int tcount) +const struct aead_testvec *template,unsigned int tcount) {unsigned int alignmask;int ret;
@@ -990,7 +992,8 @@ static int test_aead(struct crypto_aead *tfm, int enc, }static int test_cipher (struct crypto_cipher *tfm,int enc, -struct cipher_testvec *template,unsigned int tcount) +const struct cipher_testvec *template, +unsigned int tcount) {const char *algo =crypto_tfm_alg_driver_name (crypto_cipher_tfm (tfm));unsigned int i, j, k;
@@ -1068,7 +1071,8 @@ static int test_cipher(struct crypto_cipher *tfm, int enc, }static int __test_skcipher (struct crypto_skcipher *tfm,int enc, -struct cipher_testvec *template,unsigned int tcount, +const struct cipher_testvec *template, +unsigned int tcount,const bool diff_dst,const int align_offset) { const char *algo =
@@ -1332,7 +1336,8 @@ static int __test_skcipher(struct crypto_skcipher *tfm, int enc, }static int test_skcipher (struct crypto_skcipher *tfm,int enc, -struct cipher_testvec *template,unsigned int tcount) +const struct cipher_testvec *template, +unsigned int tcount) {unsigned int alignmask;int ret;
@@ -1364,8 +1369,10 @@ static int test_skcipher(struct crypto_skcipher *tfm, int enc,return 0 ; } -static int test_comp (struct crypto_comp *tfm,struct comp_testvec *ctemplate, -struct comp_testvec *dtemplate,int ctcount,int dtcount) +static int test_comp (struct crypto_comp *tfm, +const struct comp_testvec *ctemplate, +const struct comp_testvec *dtemplate, +int ctcount,int dtcount) {const char *algo =crypto_tfm_alg_driver_name (crypto_comp_tfm (tfm));unsigned int i;
@@ -1444,8 +1451,10 @@ static int test_comp(struct crypto_comp *tfm, struct comp_testvec *ctemplate,return ret; } -static int test_acomp (struct crypto_acomp *tfm,struct comp_testvec *ctemplate, -struct comp_testvec *dtemplate,int ctcount,int dtcount) +static int test_acomp (struct crypto_acomp *tfm, +const struct comp_testvec *ctemplate, +const struct comp_testvec *dtemplate, +int ctcount,int dtcount) {const char *algo =crypto_tfm_alg_driver_name (crypto_acomp_tfm (tfm));unsigned int i;
@@ -1588,7 +1597,8 @@ static int test_acomp(struct crypto_acomp *tfm, struct comp_testvec *ctemplate,return ret; } -static int test_cprng (struct crypto_rng *tfm,struct cprng_testvec *template, +static int test_cprng (struct crypto_rng *tfm, +const struct cprng_testvec *template,unsigned int tcount) {const char *algo =crypto_tfm_alg_driver_name (crypto_rng_tfm (tfm));
@@ -1865,7 +1875,7 @@ static int alg_test_cprng(const struct alg_test_desc *desc, const char *driver, } -static int drbg_cavs_test (struct drbg_testvec *test,int pr, +static int drbg_cavs_test (const struct drbg_testvec *test,int pr,const char *driver,u32 type,u32 mask) {int ret = -EAGAIN ;
@@ -1939,7 +1949,7 @@ static int alg_test_drbg(const struct alg_test_desc *desc, const char *driver,int err =0 ;int pr =0 ;int i =0 ; -struct drbg_testvec *template = desc->suite.drbg.vecs; +const struct drbg_testvec *template = desc->suite.drbg.vecs;unsigned int tcount = desc->suite.drbg.count;if (0 ==memcmp (driver,"drbg_pr_" ,8 ))
@@ -1958,7 +1968,7 @@ static int alg_test_drbg(const struct alg_test_desc *desc, const char *driver, } -static int do_test_kpp (struct crypto_kpp *tfm,struct kpp_testvec *vec, +static int do_test_kpp (struct crypto_kpp *tfm,const struct kpp_testvec *vec,const char *alg) {struct kpp_request *req;
@@ -2050,7 +2060,7 @@ static int do_test_kpp(struct crypto_kpp *tfm, struct kpp_testvec *vec, }static int test_kpp (struct crypto_kpp *tfm,const char *alg, -struct kpp_testvec *vecs,unsigned int tcount) +const struct kpp_testvec *vecs,unsigned int tcount) {int ret, i;
@@ -2086,7 +2096,7 @@ static int alg_test_kpp(const struct alg_test_desc *desc, const char *driver, }static int test_akcipher_one (struct crypto_akcipher *tfm, -struct akcipher_testvec *vecs) +const struct akcipher_testvec *vecs) {char *xbuf[XBUFSIZE ];struct akcipher_request *req;
@@ -2206,7 +2216,8 @@ static int test_akcipher_one(struct crypto_akcipher *tfm, }static int test_akcipher (struct crypto_akcipher *tfm,const char *alg, -struct akcipher_testvec *vecs,unsigned int tcount) +const struct akcipher_testvec *vecs, +unsigned int tcount) {const char *algo =crypto_tfm_alg_driver_name (crypto_akcipher_tfm (tfm));
crypto/testmgr.h +256 -256
1,764 lines not on this page · raw message
Signature · 1 line
2.11.0.483.g087da7b7c-goog
Herbert Xu
maintainerQuoted 11 lines · Eric Biggers
From: Eric Biggers <[email protected]>
These two patches mark all the cryptographic test vectors as 'const'. This has several potential advantages and moves a large amount of data from .data to .rodata when the tests are enabled. The second patch does the real work; the first just prepares for it by updating a function to take a const buffer argument.
Eric Biggers (2):
crypto: kpp - constify buffer passed tocrypto_kpp_set_secret()
crypto: testmgr - constify all test vectors
All applied. Thanks.
Signature · 3 lines
Email: Herbert Xu <[email protected]> Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt