crypto: safexcel - Group authenc ciphersuites

Move authenc(sha1,des) and authenc(sha1,3des) ciphersuites to appropriate
groups. No functional changes intended.

Signed-off-by: Aleksander Jan Bajkowski <olek2@wp.pl>
Acked-by: Antoine Tenart <atenart@kernel.org>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/drivers/crypto/inside-secure/safexcel.c b/drivers/crypto/inside-secure/safexcel.c
index 660f45ab864720c0d6734225bfd1ec3af95bcad2..072059154d1c784e0e1da746362de19df64a97b8 100644 (file)
--- a/drivers/crypto/inside-secure/safexcel.c
+++ b/drivers/crypto/inside-secure/safexcel.c
@@ -1209,7 +1209,6 @@ static struct safexcel_alg_template *safexcel_algs[] = {
        &safexcel_alg_authenc_hmac_sha256_cbc_aes,
        &safexcel_alg_authenc_hmac_sha384_cbc_aes,
        &safexcel_alg_authenc_hmac_sha512_cbc_aes,
-       &safexcel_alg_authenc_hmac_sha1_cbc_des3_ede,
        &safexcel_alg_authenc_hmac_sha1_ctr_aes,
        &safexcel_alg_authenc_hmac_sha224_ctr_aes,
        &safexcel_alg_authenc_hmac_sha256_ctr_aes,
@@ -1241,11 +1240,12 @@ static struct safexcel_alg_template *safexcel_algs[] = {
        &safexcel_alg_hmac_sha3_256,
        &safexcel_alg_hmac_sha3_384,
        &safexcel_alg_hmac_sha3_512,
-       &safexcel_alg_authenc_hmac_sha1_cbc_des,
+       &safexcel_alg_authenc_hmac_sha1_cbc_des3_ede,
        &safexcel_alg_authenc_hmac_sha256_cbc_des3_ede,
        &safexcel_alg_authenc_hmac_sha224_cbc_des3_ede,
        &safexcel_alg_authenc_hmac_sha512_cbc_des3_ede,
        &safexcel_alg_authenc_hmac_sha384_cbc_des3_ede,
+       &safexcel_alg_authenc_hmac_sha1_cbc_des,
        &safexcel_alg_authenc_hmac_sha256_cbc_des,
        &safexcel_alg_authenc_hmac_sha224_cbc_des,
        &safexcel_alg_authenc_hmac_sha512_cbc_des,

diff --git a/drivers/crypto/inside-secure/safexcel.h b/drivers/crypto/inside-secure/safexcel.h
index 0f27367a85fa2c939d5ab437bdd567c6b314fcf0..ca012e2845f7b04f8276d10365181beadf1bdb33 100644 (file)
--- a/drivers/crypto/inside-secure/safexcel.h
+++ b/drivers/crypto/inside-secure/safexcel.h
@@ -950,7 +950,6 @@ extern struct safexcel_alg_template safexcel_alg_authenc_hmac_sha224_cbc_aes;
 extern struct safexcel_alg_template safexcel_alg_authenc_hmac_sha256_cbc_aes;
 extern struct safexcel_alg_template safexcel_alg_authenc_hmac_sha384_cbc_aes;
 extern struct safexcel_alg_template safexcel_alg_authenc_hmac_sha512_cbc_aes;
-extern struct safexcel_alg_template safexcel_alg_authenc_hmac_sha1_cbc_des3_ede;
 extern struct safexcel_alg_template safexcel_alg_authenc_hmac_sha1_ctr_aes;
 extern struct safexcel_alg_template safexcel_alg_authenc_hmac_sha224_ctr_aes;
 extern struct safexcel_alg_template safexcel_alg_authenc_hmac_sha256_ctr_aes;
@@ -982,11 +981,12 @@ extern struct safexcel_alg_template safexcel_alg_hmac_sha3_224;
 extern struct safexcel_alg_template safexcel_alg_hmac_sha3_256;
 extern struct safexcel_alg_template safexcel_alg_hmac_sha3_384;
 extern struct safexcel_alg_template safexcel_alg_hmac_sha3_512;
-extern struct safexcel_alg_template safexcel_alg_authenc_hmac_sha1_cbc_des;
+extern struct safexcel_alg_template safexcel_alg_authenc_hmac_sha1_cbc_des3_ede;
 extern struct safexcel_alg_template safexcel_alg_authenc_hmac_sha256_cbc_des3_ede;
 extern struct safexcel_alg_template safexcel_alg_authenc_hmac_sha224_cbc_des3_ede;
 extern struct safexcel_alg_template safexcel_alg_authenc_hmac_sha512_cbc_des3_ede;
 extern struct safexcel_alg_template safexcel_alg_authenc_hmac_sha384_cbc_des3_ede;
+extern struct safexcel_alg_template safexcel_alg_authenc_hmac_sha1_cbc_des;
 extern struct safexcel_alg_template safexcel_alg_authenc_hmac_sha256_cbc_des;
 extern struct safexcel_alg_template safexcel_alg_authenc_hmac_sha224_cbc_des;
 extern struct safexcel_alg_template safexcel_alg_authenc_hmac_sha512_cbc_des;