spmi: hisi-spmi-controller: Use devm_spmi_controller_add()

[linux-2.6-microblaze.git] / crypto / testmgr.c

diff --git a/crypto/testmgr.c b/crypto/testmgr.c
index 54135c7..15c7a30 100644 (file)
--- a/crypto/testmgr.c
+++ b/crypto/testmgr.c
@@ -408,17 +408,15 @@ static const struct testvec_config default_hash_testvec_configs[] = {
                .finalization_type = FINALIZATION_TYPE_FINAL,
                .key_offset = 1,
        }, {
-               .name = "digest buffer aligned only to alignmask",
+               .name = "digest misaligned buffer",
                .src_divs = {
                        {
                                .proportion_of_total = 10000,
                                .offset = 1,
-                               .offset_relative_to_alignmask = true,
                        },
                },
                .finalization_type = FINALIZATION_TYPE_DIGEST,
                .key_offset = 1,
-               .key_offset_relative_to_alignmask = true,
        }, {
                .name = "init+update+update+final two even splits",
                .src_divs = {
@@ -1275,7 +1273,6 @@ static int test_shash_vec_cfg(const struct hash_testvec *vec,
                              u8 *hashstate)
 {
        struct crypto_shash *tfm = desc->tfm;
-       const unsigned int alignmask = crypto_shash_alignmask(tfm);
        const unsigned int digestsize = crypto_shash_digestsize(tfm);
        const unsigned int statesize = crypto_shash_statesize(tfm);
        const char *driver = crypto_shash_driver_name(tfm);
@@ -1287,7 +1284,7 @@ static int test_shash_vec_cfg(const struct hash_testvec *vec,
        /* Set the key, if specified */
        if (vec->ksize) {
                err = do_setkey(crypto_shash_setkey, tfm, vec->key, vec->ksize,
-                               cfg, alignmask);
+                               cfg, 0);
                if (err) {
                        if (err == vec->setkey_error)
                                return 0;
@@ -1304,7 +1301,7 @@ static int test_shash_vec_cfg(const struct hash_testvec *vec,
        }
 
        /* Build the scatterlist for the source data */
-       err = build_hash_sglist(tsgl, vec, cfg, alignmask, divs);
+       err = build_hash_sglist(tsgl, vec, cfg, 0, divs);
        if (err) {
                pr_err("alg: shash: %s: error preparing scatterlist for test vector %s, cfg=\"%s\"\n",
                       driver, vec_name, cfg->name);
@@ -1459,7 +1456,6 @@ static int test_ahash_vec_cfg(const struct hash_testvec *vec,
                              u8 *hashstate)
 {
        struct crypto_ahash *tfm = crypto_ahash_reqtfm(req);
-       const unsigned int alignmask = crypto_ahash_alignmask(tfm);
        const unsigned int digestsize = crypto_ahash_digestsize(tfm);
        const unsigned int statesize = crypto_ahash_statesize(tfm);
        const char *driver = crypto_ahash_driver_name(tfm);
@@ -1475,7 +1471,7 @@ static int test_ahash_vec_cfg(const struct hash_testvec *vec,
        /* Set the key, if specified */
        if (vec->ksize) {
                err = do_setkey(crypto_ahash_setkey, tfm, vec->key, vec->ksize,
-                               cfg, alignmask);
+                               cfg, 0);
                if (err) {
                        if (err == vec->setkey_error)
                                return 0;
@@ -1492,7 +1488,7 @@ static int test_ahash_vec_cfg(const struct hash_testvec *vec,
        }
 
        /* Build the scatterlist for the source data */
-       err = build_hash_sglist(tsgl, vec, cfg, alignmask, divs);
+       err = build_hash_sglist(tsgl, vec, cfg, 0, divs);
        if (err) {
                pr_err("alg: ahash: %s: error preparing scatterlist for test vector %s, cfg=\"%s\"\n",
                       driver, vec_name, cfg->name);
@@ -5460,6 +5456,18 @@ static const struct alg_test_desc alg_test_descs[] = {
                .suite = {
                        .akcipher = __VECS(pkcs1pad_rsa_tv_template)
                }
+       }, {
+               .alg = "pkcs1pad(rsa,sha3-256)",
+               .test = alg_test_null,
+               .fips_allowed = 1,
+       }, {
+               .alg = "pkcs1pad(rsa,sha3-384)",
+               .test = alg_test_null,
+               .fips_allowed = 1,
+       }, {
+               .alg = "pkcs1pad(rsa,sha3-512)",
+               .test = alg_test_null,
+               .fips_allowed = 1,
        }, {
                .alg = "pkcs1pad(rsa,sha384)",
                .test = alg_test_null,