Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[sfrench/cifs-2.6.git] / crypto / testmgr.c

diff --git a/crypto/testmgr.c b/crypto/testmgr.c
index 10c5b3b01ec47c2e45a044f3ad8c4180004f8c5a..1f7f63e836ae2979008871dc715198c720b9ac3d 100644 (file)
--- a/crypto/testmgr.c
+++ b/crypto/testmgr.c
@@ -4899,21 +4899,25 @@ static const struct alg_test_desc alg_test_descs[] = {
                }
        }, {
 #endif
-#ifndef CONFIG_CRYPTO_FIPS
                .alg = "ecdh-nist-p192",
                .test = alg_test_kpp,
-               .fips_allowed = 1,
                .suite = {
                        .kpp = __VECS(ecdh_p192_tv_template)
                }
        }, {
-#endif
                .alg = "ecdh-nist-p256",
                .test = alg_test_kpp,
                .fips_allowed = 1,
                .suite = {
                        .kpp = __VECS(ecdh_p256_tv_template)
                }
+       }, {
+               .alg = "ecdh-nist-p384",
+               .test = alg_test_kpp,
+               .fips_allowed = 1,
+               .suite = {
+                       .kpp = __VECS(ecdh_p384_tv_template)
+               }
        }, {
                .alg = "ecdsa-nist-p192",
                .test = alg_test_akcipher,