Merge tag 'thermal-v5.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/therma...

[linux-2.6-microblaze.git] / crypto / ecdh.c

diff --git a/crypto/ecdh.c b/crypto/ecdh.c
index 04a427b..c6f61c2 100644 (file)
--- a/crypto/ecdh.c
+++ b/crypto/ecdh.c
@@ -141,7 +141,7 @@ static struct kpp_alg ecdh_nist_p192 = {
        .init = ecdh_nist_p192_init_tfm,
        .base = {
                .cra_name = "ecdh-nist-p192",
-               .cra_driver_name = "ecdh-generic",
+               .cra_driver_name = "ecdh-nist-p192-generic",
                .cra_priority = 100,
                .cra_module = THIS_MODULE,
                .cra_ctxsize = sizeof(struct ecdh_ctx),
@@ -166,7 +166,32 @@ static struct kpp_alg ecdh_nist_p256 = {
        .init = ecdh_nist_p256_init_tfm,
        .base = {
                .cra_name = "ecdh-nist-p256",
-               .cra_driver_name = "ecdh-generic",
+               .cra_driver_name = "ecdh-nist-p256-generic",
+               .cra_priority = 100,
+               .cra_module = THIS_MODULE,
+               .cra_ctxsize = sizeof(struct ecdh_ctx),
+       },
+};
+
+static int ecdh_nist_p384_init_tfm(struct crypto_kpp *tfm)
+{
+       struct ecdh_ctx *ctx = ecdh_get_ctx(tfm);
+
+       ctx->curve_id = ECC_CURVE_NIST_P384;
+       ctx->ndigits = ECC_CURVE_NIST_P384_DIGITS;
+
+       return 0;
+}
+
+static struct kpp_alg ecdh_nist_p384 = {
+       .set_secret = ecdh_set_secret,
+       .generate_public_key = ecdh_compute_value,
+       .compute_shared_secret = ecdh_compute_value,
+       .max_size = ecdh_max_size,
+       .init = ecdh_nist_p384_init_tfm,
+       .base = {
+               .cra_name = "ecdh-nist-p384",
+               .cra_driver_name = "ecdh-nist-p384-generic",
                .cra_priority = 100,
                .cra_module = THIS_MODULE,
                .cra_ctxsize = sizeof(struct ecdh_ctx),
@@ -179,10 +204,27 @@ 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;
 
-       return crypto_register_kpp(&ecdh_nist_p256);
+       ret = crypto_register_kpp(&ecdh_nist_p256);
+       if (ret)
+               goto nist_p256_error;
+
+       ret = crypto_register_kpp(&ecdh_nist_p384);
+       if (ret)
+               goto nist_p384_error;
+
+       return 0;
+
+nist_p384_error:
+       crypto_unregister_kpp(&ecdh_nist_p256);
+
+nist_p256_error:
+       if (ecdh_nist_p192_registered)
+               crypto_unregister_kpp(&ecdh_nist_p192);
+       return ret;
 }
 
 static void ecdh_exit(void)
@@ -190,6 +232,7 @@ static void ecdh_exit(void)
        if (ecdh_nist_p192_registered)
                crypto_unregister_kpp(&ecdh_nist_p192);
        crypto_unregister_kpp(&ecdh_nist_p256);
+       crypto_unregister_kpp(&ecdh_nist_p384);
 }
 
 subsys_initcall(ecdh_init);