Commit d7db7a88 authored by Giovanni Cabiddu's avatar Giovanni Cabiddu Committed by Herbert Xu
Browse files

crypto: acomp - update testmgr with support for acomp 



Add tests to the test manager for algorithms exposed through acomp.

Signed-off-by: default avatarGiovanni Cabiddu <giovanni.cabiddu@intel.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent f6ded09d

crypto/testmgr.c

+145 −13
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 
#include <crypto/drbg.h>

#include <crypto/akcipher.h>

#include <crypto/kpp.h>

#include <crypto/acompress.h>



#include "internal.h"
@@ -1442,6 +1443,121 @@ 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)

{

	const char *algo = crypto_tfm_alg_driver_name(crypto_acomp_tfm(tfm));

	unsigned int i;

	char output[COMP_BUF_SIZE];

	int ret;

	struct scatterlist src, dst;

	struct acomp_req *req;

	struct tcrypt_result result;



	for (i = 0; i < ctcount; i++) {

		unsigned int dlen = COMP_BUF_SIZE;

		int ilen = ctemplate[i].inlen;



		memset(output, 0, sizeof(output));

		init_completion(&result.completion);

		sg_init_one(&src, ctemplate[i].input, ilen);

		sg_init_one(&dst, output, dlen);



		req = acomp_request_alloc(tfm);

		if (!req) {

			pr_err("alg: acomp: request alloc failed for %s\n",

			       algo);

			ret = -ENOMEM;

			goto out;

		}



		acomp_request_set_params(req, &src, &dst, ilen, dlen);

		acomp_request_set_callback(req, CRYPTO_TFM_REQ_MAY_BACKLOG,

					   tcrypt_complete, &result);



		ret = wait_async_op(&result, crypto_acomp_compress(req));

		if (ret) {

			pr_err("alg: acomp: compression failed on test %d for %s: ret=%d\n",

			       i + 1, algo, -ret);

			acomp_request_free(req);

			goto out;

		}



		if (req->dlen != ctemplate[i].outlen) {

			pr_err("alg: acomp: Compression test %d failed for %s: output len = %d\n",

			       i + 1, algo, req->dlen);

			ret = -EINVAL;

			acomp_request_free(req);

			goto out;

		}



		if (memcmp(output, ctemplate[i].output, req->dlen)) {

			pr_err("alg: acomp: Compression test %d failed for %s\n",

			       i + 1, algo);

			hexdump(output, req->dlen);

			ret = -EINVAL;

			acomp_request_free(req);

			goto out;

		}



		acomp_request_free(req);

	}



	for (i = 0; i < dtcount; i++) {

		unsigned int dlen = COMP_BUF_SIZE;

		int ilen = dtemplate[i].inlen;



		memset(output, 0, sizeof(output));

		init_completion(&result.completion);

		sg_init_one(&src, dtemplate[i].input, ilen);

		sg_init_one(&dst, output, dlen);



		req = acomp_request_alloc(tfm);

		if (!req) {

			pr_err("alg: acomp: request alloc failed for %s\n",

			       algo);

			ret = -ENOMEM;

			goto out;

		}



		acomp_request_set_params(req, &src, &dst, ilen, dlen);

		acomp_request_set_callback(req, CRYPTO_TFM_REQ_MAY_BACKLOG,

					   tcrypt_complete, &result);



		ret = wait_async_op(&result, crypto_acomp_decompress(req));

		if (ret) {

			pr_err("alg: acomp: decompression failed on test %d for %s: ret=%d\n",

			       i + 1, algo, -ret);

			acomp_request_free(req);

			goto out;

		}



		if (req->dlen != dtemplate[i].outlen) {

			pr_err("alg: acomp: Decompression test %d failed for %s: output len = %d\n",

			       i + 1, algo, req->dlen);

			ret = -EINVAL;

			acomp_request_free(req);

			goto out;

		}



		if (memcmp(output, dtemplate[i].output, req->dlen)) {

			pr_err("alg: acomp: Decompression test %d failed for %s\n",

			       i + 1, algo);

			hexdump(output, req->dlen);

			ret = -EINVAL;

			acomp_request_free(req);

			goto out;

		}



		acomp_request_free(req);

	}



	ret = 0;



out:

	return ret;

}



static int test_cprng(struct crypto_rng *tfm, struct cprng_testvec *template,

		      unsigned int tcount)

{
@@ -1593,22 +1709,38 @@ static int alg_test_skcipher(const struct alg_test_desc *desc, 
static int alg_test_comp(const struct alg_test_desc *desc, const char *driver,

			 u32 type, u32 mask)

{

	struct crypto_comp *tfm;

	struct crypto_comp *comp;

	struct crypto_acomp *acomp;

	int err;

	u32 algo_type = type & CRYPTO_ALG_TYPE_ACOMPRESS_MASK;



	tfm = crypto_alloc_comp(driver, type, mask);

	if (IS_ERR(tfm)) {

		printk(KERN_ERR "alg: comp: Failed to load transform for %s: "

		       "%ld\n", driver, PTR_ERR(tfm));

		return PTR_ERR(tfm);

	if (algo_type == CRYPTO_ALG_TYPE_ACOMPRESS) {

		acomp = crypto_alloc_acomp(driver, type, mask);

		if (IS_ERR(acomp)) {

			pr_err("alg: acomp: Failed to load transform for %s: %ld\n",

			       driver, PTR_ERR(acomp));

			return PTR_ERR(acomp);

		}

		err = test_acomp(acomp, desc->suite.comp.comp.vecs,

				 desc->suite.comp.decomp.vecs,

				 desc->suite.comp.comp.count,

				 desc->suite.comp.decomp.count);

		crypto_free_acomp(acomp);

	} else {

		comp = crypto_alloc_comp(driver, type, mask);

		if (IS_ERR(comp)) {

			pr_err("alg: comp: Failed to load transform for %s: %ld\n",

			       driver, PTR_ERR(comp));

			return PTR_ERR(comp);

		}



	err = test_comp(tfm, desc->suite.comp.comp.vecs,

		err = test_comp(comp, desc->suite.comp.comp.vecs,

				desc->suite.comp.decomp.vecs,

				desc->suite.comp.comp.count,

				desc->suite.comp.decomp.count);



	crypto_free_comp(tfm);

		crypto_free_comp(comp);

	}

	return err;

}