lkml.org 
[lkml]   [2021]   [Jul]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.13 34/85] crypto: ecdh - fix ecdh-nist-p192's entry in testmgr
    Date
    From: Hui Tang <tanghui20@huawei.com>

    [ Upstream commit 6889fc2104e5d20899b91e61daf07a7524b2010d ]

    Add a comment that p192 will fail to register in FIPS mode.

    Fix ecdh-nist-p192's entry in testmgr by removing the ifdefs
    and not setting fips_allowed.

    Signed-off-by: Hui Tang <tanghui20@huawei.com>
    Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    crypto/ecdh.c | 1 +
    crypto/testmgr.c | 3 ---
    crypto/testmgr.h | 2 --
    3 files changed, 1 insertion(+), 5 deletions(-)

    diff --git a/crypto/ecdh.c b/crypto/ecdh.c
    index 04a427b8c956..4227d35f5485 100644
    --- a/crypto/ecdh.c
    +++ b/crypto/ecdh.c
    @@ -179,6 +179,7 @@ static int ecdh_init(void)
    {
    int ret;

    + /* NIST p192 will fail to register in FIPS mode */
    ret = crypto_register_kpp(&ecdh_nist_p192);
    ecdh_nist_p192_registered = ret == 0;

    diff --git a/crypto/testmgr.c b/crypto/testmgr.c
    index 10c5b3b01ec4..26e40dba9ad2 100644
    --- a/crypto/testmgr.c
    +++ b/crypto/testmgr.c
    @@ -4899,15 +4899,12 @@ 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,
    diff --git a/crypto/testmgr.h b/crypto/testmgr.h
    index 34e4a3db3991..fe1e59da59ff 100644
    --- a/crypto/testmgr.h
    +++ b/crypto/testmgr.h
    @@ -2685,7 +2685,6 @@ static const struct kpp_testvec curve25519_tv_template[] = {
    }
    };

    -#ifndef CONFIG_CRYPTO_FIPS
    static const struct kpp_testvec ecdh_p192_tv_template[] = {
    {
    .secret =
    @@ -2725,7 +2724,6 @@ static const struct kpp_testvec ecdh_p192_tv_template[] = {
    .expected_ss_size = 24
    }
    };
    -#endif

    static const struct kpp_testvec ecdh_p256_tv_template[] = {
    {
    --
    2.30.2
    \
     
     \ /
      Last update: 2021-07-05 01:09    [W:13.344 / U:0.000 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site