summaryrefslogtreecommitdiffstats
path: root/crypto/testmgr.c
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2015-07-30 11:53:14 +0200
committerHerbert Xu <herbert@gondor.apana.org.au>2015-08-04 14:45:30 +0200
commit7079ce62c0e9bfcca35214105c08a2d00fbea9ee (patch)
tree75838d36e7ac44bfd2ec26b5e93aa5fa16c331be /crypto/testmgr.c
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 (diff)
downloadlinux-7079ce62c0e9bfcca35214105c08a2d00fbea9ee.tar.xz
linux-7079ce62c0e9bfcca35214105c08a2d00fbea9ee.zip
crypto: testmgr - Disable authenc test and convert test vectors
This patch disables the authenc tests while the conversion to the new IV calling convention takes place. It also replaces the authenc test vectors with ones that will work with the new IV convention. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'crypto/testmgr.c')
-rw-r--r--crypto/testmgr.c26
1 files changed, 13 insertions, 13 deletions
diff --git a/crypto/testmgr.c b/crypto/testmgr.c
index d0a42bd3aae9..0b14f71cf3d6 100644
--- a/crypto/testmgr.c
+++ b/crypto/testmgr.c
@@ -2090,7 +2090,7 @@ static const struct alg_test_desc alg_test_descs[] = {
}
}
}, {
- .alg = "authenc(hmac(sha1),cbc(aes))",
+ .alg = "authenc(hmac(sha1),cbc(aes))-disabled",
.test = alg_test_aead,
.fips_allowed = 1,
.suite = {
@@ -2104,7 +2104,7 @@ static const struct alg_test_desc alg_test_descs[] = {
}
}
}, {
- .alg = "authenc(hmac(sha1),cbc(des))",
+ .alg = "authenc(hmac(sha1),cbc(des))-disabled",
.test = alg_test_aead,
.fips_allowed = 1,
.suite = {
@@ -2118,7 +2118,7 @@ static const struct alg_test_desc alg_test_descs[] = {
}
}
}, {
- .alg = "authenc(hmac(sha1),cbc(des3_ede))",
+ .alg = "authenc(hmac(sha1),cbc(des3_ede))-disabled",
.test = alg_test_aead,
.fips_allowed = 1,
.suite = {
@@ -2152,7 +2152,7 @@ static const struct alg_test_desc alg_test_descs[] = {
}
}
}, {
- .alg = "authenc(hmac(sha224),cbc(des))",
+ .alg = "authenc(hmac(sha224),cbc(des))-disabled",
.test = alg_test_aead,
.fips_allowed = 1,
.suite = {
@@ -2166,7 +2166,7 @@ static const struct alg_test_desc alg_test_descs[] = {
}
}
}, {
- .alg = "authenc(hmac(sha224),cbc(des3_ede))",
+ .alg = "authenc(hmac(sha224),cbc(des3_ede))-disabled",
.test = alg_test_aead,
.fips_allowed = 1,
.suite = {
@@ -2180,7 +2180,7 @@ static const struct alg_test_desc alg_test_descs[] = {
}
}
}, {
- .alg = "authenc(hmac(sha256),cbc(aes))",
+ .alg = "authenc(hmac(sha256),cbc(aes))-disabled",
.test = alg_test_aead,
.fips_allowed = 1,
.suite = {
@@ -2194,7 +2194,7 @@ static const struct alg_test_desc alg_test_descs[] = {
}
}
}, {
- .alg = "authenc(hmac(sha256),cbc(des))",
+ .alg = "authenc(hmac(sha256),cbc(des))-disabled",
.test = alg_test_aead,
.fips_allowed = 1,
.suite = {
@@ -2208,7 +2208,7 @@ static const struct alg_test_desc alg_test_descs[] = {
}
}
}, {
- .alg = "authenc(hmac(sha256),cbc(des3_ede))",
+ .alg = "authenc(hmac(sha256),cbc(des3_ede))-disabled",
.test = alg_test_aead,
.fips_allowed = 1,
.suite = {
@@ -2222,7 +2222,7 @@ static const struct alg_test_desc alg_test_descs[] = {
}
}
}, {
- .alg = "authenc(hmac(sha384),cbc(des))",
+ .alg = "authenc(hmac(sha384),cbc(des))-disabled",
.test = alg_test_aead,
.fips_allowed = 1,
.suite = {
@@ -2236,7 +2236,7 @@ static const struct alg_test_desc alg_test_descs[] = {
}
}
}, {
- .alg = "authenc(hmac(sha384),cbc(des3_ede))",
+ .alg = "authenc(hmac(sha384),cbc(des3_ede))-disabled",
.test = alg_test_aead,
.fips_allowed = 1,
.suite = {
@@ -2250,7 +2250,7 @@ static const struct alg_test_desc alg_test_descs[] = {
}
}
}, {
- .alg = "authenc(hmac(sha512),cbc(aes))",
+ .alg = "authenc(hmac(sha512),cbc(aes))-disabled",
.test = alg_test_aead,
.fips_allowed = 1,
.suite = {
@@ -2264,7 +2264,7 @@ static const struct alg_test_desc alg_test_descs[] = {
}
}
}, {
- .alg = "authenc(hmac(sha512),cbc(des))",
+ .alg = "authenc(hmac(sha512),cbc(des))-disabled",
.test = alg_test_aead,
.fips_allowed = 1,
.suite = {
@@ -2278,7 +2278,7 @@ static const struct alg_test_desc alg_test_descs[] = {
}
}
}, {
- .alg = "authenc(hmac(sha512),cbc(des3_ede))",
+ .alg = "authenc(hmac(sha512),cbc(des3_ede))-disabled",
.test = alg_test_aead,
.fips_allowed = 1,
.suite = {