EC_GROUP_get_group_by_name() is now called EC_GROUP_new_by_name()

diff --git a/apps/ecdsaparam.c b/apps/ecdsaparam.c
index ebb0d1ecb3b8fb751741041de7cff482bd9fc6d2..d94ee3a6495171fafd376bf2ae56d0202c0aa488 100644 (file)
--- a/apps/ecdsaparam.c
+++ b/apps/ecdsaparam.c
@@ -348,7 +348,7 @@ bad:
        {
                if ((ecdsa = ECDSA_new()) == NULL)
                        goto end;
        {
                if ((ecdsa = ECDSA_new()) == NULL)
                        goto end;

-               ecdsa->group = EC_GROUP_get_group_by_name(curve_type);
+               ecdsa->group = EC_GROUP_new_by_name(curve_type);

                if (named_curve)
                        ECDSA_set_parameter_flags(ecdsa, ECDSA_FLAG_NAMED_CURVE);
        }
                if (named_curve)
                        ECDSA_set_parameter_flags(ecdsa, ECDSA_FLAG_NAMED_CURVE);
        }

diff --git a/crypto/ecdsa/ecdsatest.c b/crypto/ecdsa/ecdsatest.c
index 1f2cef03319aacf2b2715e54d2c9a617838f706e..339f654516b7b6dfc2b7f576d6bed273cb058f27 100644 (file)
--- a/crypto/ecdsa/ecdsatest.c
+++ b/crypto/ecdsa/ecdsatest.c
@@ -119,7 +119,7 @@ int set_p192_param(ECDSA *ecdsa)
        if ((ctx = BN_CTX_new()) == NULL) goto err;
        clear_ecdsa(ecdsa);
        
        if ((ctx = BN_CTX_new()) == NULL) goto err;
        clear_ecdsa(ecdsa);
        

-       if ((ecdsa->group = EC_GROUP_get_group_by_name(EC_GROUP_X9_62_PRIME_192V1)) == NULL)
+       if ((ecdsa->group = EC_GROUP_new_by_name(EC_GROUP_X9_62_PRIME_192V1)) == NULL)

        {
                BIO_printf(bio_err,"ECDSA_SET_GROUP_P_192_V1() failed \n");
                goto err;
        {
                BIO_printf(bio_err,"ECDSA_SET_GROUP_P_192_V1() failed \n");
                goto err;


@@ -152,7 +152,7 @@ int set_p239_param(ECDSA *ecdsa)
        if ((ctx = BN_CTX_new()) == NULL) goto err;
        clear_ecdsa(ecdsa);
        
        if ((ctx = BN_CTX_new()) == NULL) goto err;
        clear_ecdsa(ecdsa);
        

-       if ((ecdsa->group = EC_GROUP_get_group_by_name(EC_GROUP_X9_62_PRIME_239V1)) == NULL)
+       if ((ecdsa->group = EC_GROUP_new_by_name(EC_GROUP_X9_62_PRIME_239V1)) == NULL)

        {
                BIO_printf(bio_err,"ECDSA_SET_GROUP_P_239_V1() failed \n");
                goto err;
        {
                BIO_printf(bio_err,"ECDSA_SET_GROUP_P_239_V1() failed \n");
                goto err;


@@ -532,7 +532,7 @@ int main(void)
        BIO_printf(bio_err, "\nTesting sign & verify with NIST Prime-Curve P-192 : \n");
        ECDSA_free(ecdsa);
        if ((ecdsa = ECDSA_new()) == NULL) goto err;
        BIO_printf(bio_err, "\nTesting sign & verify with NIST Prime-Curve P-192 : \n");
        ECDSA_free(ecdsa);
        if ((ecdsa = ECDSA_new()) == NULL) goto err;

-       if ((ecdsa->group = EC_GROUP_get_group_by_name(EC_GROUP_NIST_PRIME_192)) == NULL) goto err;
+       if ((ecdsa->group = EC_GROUP_new_by_name(EC_GROUP_NIST_PRIME_192)) == NULL) goto err;

        if (!ECDSA_generate_key(ecdsa)) goto err;
         time = clock();
         for (i=0; i<ECDSA_NIST_TESTS; i++)
        if (!ECDSA_generate_key(ecdsa)) goto err;
         time = clock();
         for (i=0; i<ECDSA_NIST_TESTS; i++)


@@ -558,7 +558,7 @@ int main(void)
        BIO_printf(bio_err, "Testing sign & verify with NIST Prime-Curve P-224 : \n");
         ECDSA_free(ecdsa);
         if ((ecdsa = ECDSA_new()) == NULL) goto err;
        BIO_printf(bio_err, "Testing sign & verify with NIST Prime-Curve P-224 : \n");
         ECDSA_free(ecdsa);
         if ((ecdsa = ECDSA_new()) == NULL) goto err;

-        if ((ecdsa->group = EC_GROUP_get_group_by_name(EC_GROUP_NIST_PRIME_224)) == NULL) goto err;
+        if ((ecdsa->group = EC_GROUP_new_by_name(EC_GROUP_NIST_PRIME_224)) == NULL) goto err;

         if (!ECDSA_generate_key(ecdsa)) goto err;
         time = clock();
         for (i=0; i<ECDSA_NIST_TESTS; i++)
         if (!ECDSA_generate_key(ecdsa)) goto err;
         time = clock();
         for (i=0; i<ECDSA_NIST_TESTS; i++)


@@ -584,7 +584,7 @@ int main(void)
         BIO_printf(bio_err, "Testing sign & verify with NIST Prime-Curve P-256 : \n");
         ECDSA_free(ecdsa);
         if ((ecdsa = ECDSA_new()) == NULL) goto err;
         BIO_printf(bio_err, "Testing sign & verify with NIST Prime-Curve P-256 : \n");
         ECDSA_free(ecdsa);
         if ((ecdsa = ECDSA_new()) == NULL) goto err;

-        if ((ecdsa->group = EC_GROUP_get_group_by_name(EC_GROUP_NIST_PRIME_256)) == NULL) goto err;
+        if ((ecdsa->group = EC_GROUP_new_by_name(EC_GROUP_NIST_PRIME_256)) == NULL) goto err;

         if (!ECDSA_generate_key(ecdsa)) goto err;
         time = clock();
         for (i=0; i<ECDSA_NIST_TESTS; i++)
         if (!ECDSA_generate_key(ecdsa)) goto err;
         time = clock();
         for (i=0; i<ECDSA_NIST_TESTS; i++)


@@ -610,7 +610,7 @@ int main(void)
         BIO_printf(bio_err, "Testing sign & verify with NIST Prime-Curve P-384 : \n");
         ECDSA_free(ecdsa);
         if ((ecdsa = ECDSA_new()) == NULL) goto err;
         BIO_printf(bio_err, "Testing sign & verify with NIST Prime-Curve P-384 : \n");
         ECDSA_free(ecdsa);
         if ((ecdsa = ECDSA_new()) == NULL) goto err;

-        if ((ecdsa->group = EC_GROUP_get_group_by_name(EC_GROUP_NIST_PRIME_384)) == NULL) goto err;
+        if ((ecdsa->group = EC_GROUP_new_by_name(EC_GROUP_NIST_PRIME_384)) == NULL) goto err;

         if (!ECDSA_generate_key(ecdsa)) goto err;
         time = clock();
         for (i=0; i<ECDSA_NIST_TESTS; i++)
         if (!ECDSA_generate_key(ecdsa)) goto err;
         time = clock();
         for (i=0; i<ECDSA_NIST_TESTS; i++)


@@ -636,7 +636,7 @@ int main(void)
         BIO_printf(bio_err, "Testing sign & verify with NIST Prime-Curve P-521 : \n");
         ECDSA_free(ecdsa);
         if ((ecdsa = ECDSA_new()) == NULL) goto err;
         BIO_printf(bio_err, "Testing sign & verify with NIST Prime-Curve P-521 : \n");
         ECDSA_free(ecdsa);
         if ((ecdsa = ECDSA_new()) == NULL) goto err;

-        if ((ecdsa->group = EC_GROUP_get_group_by_name(EC_GROUP_NIST_PRIME_521)) == NULL) goto err;
+        if ((ecdsa->group = EC_GROUP_new_by_name(EC_GROUP_NIST_PRIME_521)) == NULL) goto err;

         if (!ECDSA_generate_key(ecdsa)) goto err;
         time = clock();
         for (i=0; i<ECDSA_NIST_TESTS; i++)
         if (!ECDSA_generate_key(ecdsa)) goto err;
         time = clock();
         for (i=0; i<ECDSA_NIST_TESTS; i++)

diff --git a/crypto/ecdsa/ecs_asn1.c b/crypto/ecdsa/ecs_asn1.c
index 3a5baf013b1700142ef254b872d1adc275681f46..fe2ed62d118d71ef7eab83d50518a3e8b60fb2b3 100644 (file)
--- a/crypto/ecdsa/ecs_asn1.c
+++ b/crypto/ecdsa/ecs_asn1.c
@@ -502,7 +502,7 @@ ECDSA *ECDSA_ecparameters2ecdsa(const EC_PARAMETERS *params, ECDSA *ecdsa)
                        EC_GROUP_free(ret->group);
                tmp = OBJ_obj2nid(params->value.named_curve);
                ret->parameter_flags |= ECDSA_FLAG_NAMED_CURVE;
                        EC_GROUP_free(ret->group);
                tmp = OBJ_obj2nid(params->value.named_curve);
                ret->parameter_flags |= ECDSA_FLAG_NAMED_CURVE;

-               if ((ret->group = EC_GROUP_get_group_by_name(tmp)) == NULL)
+               if ((ret->group = EC_GROUP_new_by_name(tmp)) == NULL)

                {
                        ECDSAerr(ECDSA_F_ECDSA_GET_ECDSA, ECDSA_R_EC_GROUP_NID2CURVE_FAILURE);
                        ECDSA_free(ret);
                {
                        ECDSAerr(ECDSA_F_ECDSA_GET_ECDSA, ECDSA_R_EC_GROUP_NID2CURVE_FAILURE);
                        ECDSA_free(ret);