kernel: replace aes-lib with aes-generic in testmgr tests

The name “aes-lib” is used since kernel 7.0. In kernels 6.12 and 6.18,
the name “aes-generic” is used. This change makes it possible to run
comparative selftests of the generic and hardware implementations.
This will help identify any potential differences in the results.

Signed-off-by: Aleksander Jan Bajkowski <olek2@wp.pl>
Link: https://github.com/openwrt/openwrt/pull/23392
Signed-off-by: Robert Marko <robimarko@gmail.com>

diff --git a/target/linux/generic/backport-6.12/916-v7.1-crypto-testmgr-Add-test-vectors-for-authenc-hmac-sha.patch b/target/linux/generic/backport-6.12/916-v7.1-crypto-testmgr-Add-test-vectors-for-authenc-hmac-sha.patch
index c5c5db687bbbe7ecb51040128d490eb83732a97f..21ad148c5ba60d87c0d297b7bd9153997c041cb3 100644 (file)
--- a/target/linux/generic/backport-6.12/916-v7.1-crypto-testmgr-Add-test-vectors-for-authenc-hmac-sha.patch
+++ b/target/linux/generic/backport-6.12/916-v7.1-crypto-testmgr-Add-test-vectors-for-authenc-hmac-sha.patch
@@ -23,7 +23,7 @@ Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
        }, {
                .alg = "authenc(hmac(sha1),rfc3686(ctr(aes)))",
 -              .test = alg_test_null,
-+              .generic_driver = "authenc(hmac-sha1-lib,rfc3686(ctr(aes-lib)))",
++              .generic_driver = "authenc(hmac-sha1-lib,rfc3686(ctr(aes-generic)))",
 +              .test = alg_test_aead,
                .fips_allowed = 1,
 +              .suite = {

diff --git a/target/linux/generic/backport-6.12/917-v7.1-crypto-testmgr-Add-test-vectors-for-authenc-hmac-sha.patch b/target/linux/generic/backport-6.12/917-v7.1-crypto-testmgr-Add-test-vectors-for-authenc-hmac-sha.patch
index 1b10427f025890fd031a36b6d5f61539089f5e33..4c47f2c1f9b0f0e9ad3d595b5d64720d0ab28cb2 100644 (file)
--- a/target/linux/generic/backport-6.12/917-v7.1-crypto-testmgr-Add-test-vectors-for-authenc-hmac-sha.patch
+++ b/target/linux/generic/backport-6.12/917-v7.1-crypto-testmgr-Add-test-vectors-for-authenc-hmac-sha.patch
@@ -23,7 +23,7 @@ Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
        }, {
                .alg = "authenc(hmac(sha224),rfc3686(ctr(aes)))",
 -              .test = alg_test_null,
-+              .generic_driver = "authenc(hmac-sha224-lib,rfc3686(ctr(aes-lib)))",
++              .generic_driver = "authenc(hmac-sha224-lib,rfc3686(ctr(aes-generic)))",
 +              .test = alg_test_aead,
                .fips_allowed = 1,
 +              .suite = {

diff --git a/target/linux/generic/backport-6.12/918-v7.1-crypto-testmgr-Add-test-vectors-for-authenc-hmac-sha.patch b/target/linux/generic/backport-6.12/918-v7.1-crypto-testmgr-Add-test-vectors-for-authenc-hmac-sha.patch
index a08e410c7bdfaff81bdc9936e75107ec7bcee29b..1457fff4bfa3098fe587f9fe52c608a5558b0f44 100644 (file)
--- a/target/linux/generic/backport-6.12/918-v7.1-crypto-testmgr-Add-test-vectors-for-authenc-hmac-sha.patch
+++ b/target/linux/generic/backport-6.12/918-v7.1-crypto-testmgr-Add-test-vectors-for-authenc-hmac-sha.patch
@@ -23,7 +23,7 @@ Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
        }, {
                .alg = "authenc(hmac(sha256),rfc3686(ctr(aes)))",
 -              .test = alg_test_null,
-+              .generic_driver = "authenc(hmac-sha256-lib,rfc3686(ctr(aes-lib)))",
++              .generic_driver = "authenc(hmac-sha256-lib,rfc3686(ctr(aes-generic)))",
 +              .test = alg_test_aead,
                .fips_allowed = 1,
 +              .suite = {

diff --git a/target/linux/generic/backport-6.12/919-v7.1-crypto-testmgr-Add-test-vectors-for-authenc-hmac-sha.patch b/target/linux/generic/backport-6.12/919-v7.1-crypto-testmgr-Add-test-vectors-for-authenc-hmac-sha.patch
index 47251ec874135669768154e983503121ea8c2c98..aca68e0db4300f382b62aa8132bcd66f8ffc0db7 100644 (file)
--- a/target/linux/generic/backport-6.12/919-v7.1-crypto-testmgr-Add-test-vectors-for-authenc-hmac-sha.patch
+++ b/target/linux/generic/backport-6.12/919-v7.1-crypto-testmgr-Add-test-vectors-for-authenc-hmac-sha.patch
@@ -23,7 +23,7 @@ Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
        }, {
                .alg = "authenc(hmac(sha384),rfc3686(ctr(aes)))",
 -              .test = alg_test_null,
-+              .generic_driver = "authenc(hmac-sha384-lib,rfc3686(ctr(aes-lib)))",
++              .generic_driver = "authenc(hmac-sha384-lib,rfc3686(ctr(aes-generic)))",
 +              .test = alg_test_aead,
                .fips_allowed = 1,
 +              .suite = {

diff --git a/target/linux/generic/backport-6.12/920-v7.1-crypto-testmgr-Add-test-vectors-for-authenc-hmac-sha.patch b/target/linux/generic/backport-6.12/920-v7.1-crypto-testmgr-Add-test-vectors-for-authenc-hmac-sha.patch
index 108da3781f505d7e65a46b0622191608d0f0cdff..0c461349fbdbf7820c3c98e5f2cf5e7b09ec62f2 100644 (file)
--- a/target/linux/generic/backport-6.12/920-v7.1-crypto-testmgr-Add-test-vectors-for-authenc-hmac-sha.patch
+++ b/target/linux/generic/backport-6.12/920-v7.1-crypto-testmgr-Add-test-vectors-for-authenc-hmac-sha.patch
@@ -23,7 +23,7 @@ Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
        }, {
                .alg = "authenc(hmac(sha512),rfc3686(ctr(aes)))",
 -              .test = alg_test_null,
-+              .generic_driver = "authenc(hmac-sha512-lib,rfc3686(ctr(aes-lib)))",
++              .generic_driver = "authenc(hmac-sha512-lib,rfc3686(ctr(aes-generic)))",
 +              .test = alg_test_aead,
                .fips_allowed = 1,
 +              .suite = {

diff --git a/target/linux/generic/backport-6.12/922-v7.1-crypto-testmgr-Add-test-vectors-for-authenc-hmac-md5.patch b/target/linux/generic/backport-6.12/922-v7.1-crypto-testmgr-Add-test-vectors-for-authenc-hmac-md5.patch
index 2eed4f3d21d982d970291a3680437282c6b7c040..4128feeeebff0815f19b54280172f046009556c5 100644 (file)
--- a/target/linux/generic/backport-6.12/922-v7.1-crypto-testmgr-Add-test-vectors-for-authenc-hmac-md5.patch
+++ b/target/linux/generic/backport-6.12/922-v7.1-crypto-testmgr-Add-test-vectors-for-authenc-hmac-md5.patch
@@ -23,7 +23,7 @@ Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
                }
        }, {
 +              .alg = "authenc(hmac(md5),rfc3686(ctr(aes)))",
-+              .generic_driver = "authenc(hmac-md5-lib,rfc3686(ctr(aes-lib)))",
++              .generic_driver = "authenc(hmac-md5-lib,rfc3686(ctr(aes-generic)))",
 +              .test = alg_test_aead,
 +              .suite = {
 +                      .aead = __VECS(hmac_md5_aes_ctr_rfc3686_tv_temp)

diff --git a/target/linux/generic/backport-6.12/923-v7.1-crypto-testmgr-Add-test-vectors-for-authenc-hmac-md5.patch b/target/linux/generic/backport-6.12/923-v7.1-crypto-testmgr-Add-test-vectors-for-authenc-hmac-md5.patch
index 2050ded1d08dd00a240ac54ce5bc0b309db1a3ef..f1ed34e681f892e76762ebbc60461925d1200152 100644 (file)
--- a/target/linux/generic/backport-6.12/923-v7.1-crypto-testmgr-Add-test-vectors-for-authenc-hmac-md5.patch
+++ b/target/linux/generic/backport-6.12/923-v7.1-crypto-testmgr-Add-test-vectors-for-authenc-hmac-md5.patch
@@ -23,7 +23,7 @@ Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
                }
        }, {
 +              .alg = "authenc(hmac(md5),cbc(aes))",
-+              .generic_driver = "authenc(hmac-md5-lib,cbc(aes-lib))",
++              .generic_driver = "authenc(hmac-md5-lib,cbc(aes-generic))",
 +              .test = alg_test_aead,
 +              .suite = {
 +                      .aead = __VECS(hmac_md5_aes_cbc_tv_temp)

diff --git a/target/linux/generic/backport-6.18/916-v7.1-crypto-testmgr-Add-test-vectors-for-authenc-hmac-sha.patch b/target/linux/generic/backport-6.18/916-v7.1-crypto-testmgr-Add-test-vectors-for-authenc-hmac-sha.patch
index e775b83603e0d948e6d4697a2128cfc69812ada6..cf968c101e09d0dc11be74ac364a8fe93633701b 100644 (file)
--- a/target/linux/generic/backport-6.18/916-v7.1-crypto-testmgr-Add-test-vectors-for-authenc-hmac-sha.patch
+++ b/target/linux/generic/backport-6.18/916-v7.1-crypto-testmgr-Add-test-vectors-for-authenc-hmac-sha.patch
@@ -23,7 +23,7 @@ Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
        }, {
                .alg = "authenc(hmac(sha1),rfc3686(ctr(aes)))",
 -              .test = alg_test_null,
-+              .generic_driver = "authenc(hmac-sha1-lib,rfc3686(ctr(aes-lib)))",
++              .generic_driver = "authenc(hmac-sha1-lib,rfc3686(ctr(aes-generic)))",
 +              .test = alg_test_aead,
                .fips_allowed = 1,
 +              .suite = {

diff --git a/target/linux/generic/backport-6.18/917-v7.1-crypto-testmgr-Add-test-vectors-for-authenc-hmac-sha.patch b/target/linux/generic/backport-6.18/917-v7.1-crypto-testmgr-Add-test-vectors-for-authenc-hmac-sha.patch
index c6b2a88deddbd074173ee27ad3df069f70bfab91..108e68d5f2d341458113c6feb307f8a2c3870cea 100644 (file)
--- a/target/linux/generic/backport-6.18/917-v7.1-crypto-testmgr-Add-test-vectors-for-authenc-hmac-sha.patch
+++ b/target/linux/generic/backport-6.18/917-v7.1-crypto-testmgr-Add-test-vectors-for-authenc-hmac-sha.patch
@@ -23,7 +23,7 @@ Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
        }, {
                .alg = "authenc(hmac(sha224),rfc3686(ctr(aes)))",
 -              .test = alg_test_null,
-+              .generic_driver = "authenc(hmac-sha224-lib,rfc3686(ctr(aes-lib)))",
++              .generic_driver = "authenc(hmac-sha224-lib,rfc3686(ctr(aes-generic)))",
 +              .test = alg_test_aead,
                .fips_allowed = 1,
 +              .suite = {

diff --git a/target/linux/generic/backport-6.18/918-v7.1-crypto-testmgr-Add-test-vectors-for-authenc-hmac-sha.patch b/target/linux/generic/backport-6.18/918-v7.1-crypto-testmgr-Add-test-vectors-for-authenc-hmac-sha.patch
index 2a6321f7d3f34d02f4da5a0bedd63d899a47060c..6355ea1056fa2b59ce30969e3b1a7e671f31fc17 100644 (file)
--- a/target/linux/generic/backport-6.18/918-v7.1-crypto-testmgr-Add-test-vectors-for-authenc-hmac-sha.patch
+++ b/target/linux/generic/backport-6.18/918-v7.1-crypto-testmgr-Add-test-vectors-for-authenc-hmac-sha.patch
@@ -23,7 +23,7 @@ Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
        }, {
                .alg = "authenc(hmac(sha256),rfc3686(ctr(aes)))",
 -              .test = alg_test_null,
-+              .generic_driver = "authenc(hmac-sha256-lib,rfc3686(ctr(aes-lib)))",
++              .generic_driver = "authenc(hmac-sha256-lib,rfc3686(ctr(aes-generic)))",
 +              .test = alg_test_aead,
                .fips_allowed = 1,
 +              .suite = {

diff --git a/target/linux/generic/backport-6.18/919-v7.1-crypto-testmgr-Add-test-vectors-for-authenc-hmac-sha.patch b/target/linux/generic/backport-6.18/919-v7.1-crypto-testmgr-Add-test-vectors-for-authenc-hmac-sha.patch
index 11a0c34eee2b826d0db47dd5f98d8a6e5d9f108e..1d32d21d3f6f23b8e5c757ded7c5133ccfb12970 100644 (file)
--- a/target/linux/generic/backport-6.18/919-v7.1-crypto-testmgr-Add-test-vectors-for-authenc-hmac-sha.patch
+++ b/target/linux/generic/backport-6.18/919-v7.1-crypto-testmgr-Add-test-vectors-for-authenc-hmac-sha.patch
@@ -23,7 +23,7 @@ Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
        }, {
                .alg = "authenc(hmac(sha384),rfc3686(ctr(aes)))",
 -              .test = alg_test_null,
-+              .generic_driver = "authenc(hmac-sha384-lib,rfc3686(ctr(aes-lib)))",
++              .generic_driver = "authenc(hmac-sha384-lib,rfc3686(ctr(aes-generic)))",
 +              .test = alg_test_aead,
                .fips_allowed = 1,
 +              .suite = {

diff --git a/target/linux/generic/backport-6.18/920-v7.1-crypto-testmgr-Add-test-vectors-for-authenc-hmac-sha.patch b/target/linux/generic/backport-6.18/920-v7.1-crypto-testmgr-Add-test-vectors-for-authenc-hmac-sha.patch
index 42f6b10eec69e4d1f66b6ef4574c60b9309dfc1d..4699c08add79c412208092c011f871b5720202c4 100644 (file)
--- a/target/linux/generic/backport-6.18/920-v7.1-crypto-testmgr-Add-test-vectors-for-authenc-hmac-sha.patch
+++ b/target/linux/generic/backport-6.18/920-v7.1-crypto-testmgr-Add-test-vectors-for-authenc-hmac-sha.patch
@@ -23,7 +23,7 @@ Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
        }, {
                .alg = "authenc(hmac(sha512),rfc3686(ctr(aes)))",
 -              .test = alg_test_null,
-+              .generic_driver = "authenc(hmac-sha512-lib,rfc3686(ctr(aes-lib)))",
++              .generic_driver = "authenc(hmac-sha512-lib,rfc3686(ctr(aes-generic)))",
 +              .test = alg_test_aead,
                .fips_allowed = 1,
 +              .suite = {

diff --git a/target/linux/generic/backport-6.18/922-v7.1-crypto-testmgr-Add-test-vectors-for-authenc-hmac-md5.patch b/target/linux/generic/backport-6.18/922-v7.1-crypto-testmgr-Add-test-vectors-for-authenc-hmac-md5.patch
index 6fb705a5fb9145795a2da02b4f90685e0259d056..9a511b18a70b0e3b4cd9443f6edf8618efde1ac9 100644 (file)
--- a/target/linux/generic/backport-6.18/922-v7.1-crypto-testmgr-Add-test-vectors-for-authenc-hmac-md5.patch
+++ b/target/linux/generic/backport-6.18/922-v7.1-crypto-testmgr-Add-test-vectors-for-authenc-hmac-md5.patch
@@ -23,7 +23,7 @@ Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
                }
        }, {
 +              .alg = "authenc(hmac(md5),rfc3686(ctr(aes)))",
-+              .generic_driver = "authenc(hmac-md5-lib,rfc3686(ctr(aes-lib)))",
++              .generic_driver = "authenc(hmac-md5-lib,rfc3686(ctr(aes-generic)))",
 +              .test = alg_test_aead,
 +              .suite = {
 +                      .aead = __VECS(hmac_md5_aes_ctr_rfc3686_tv_temp)