Change array representation of binary polynomials to make GF2m part of

[openssl.git] / crypto / ec / ec_ameth.c

diff --git a/crypto/ec/ec_ameth.c b/crypto/ec/ec_ameth.c
index 18c4265cfcce92682f47dde2bf855d7141064530..ba611646fd51bb9642bf43fcf37fedc3c15b20e0 100644 (file)
--- a/crypto/ec/ec_ameth.c
+++ b/crypto/ec/ec_ameth.c
@@ -394,7 +394,7 @@ static int ec_missing_parameters(const EVP_PKEY *pkey)
        return 0;
        }
 
-int ec_copy_parameters(EVP_PKEY *to, const EVP_PKEY *from)
+static int ec_copy_parameters(EVP_PKEY *to, const EVP_PKEY *from)
        {
        EC_GROUP *group = EC_GROUP_dup(EC_KEY_get0_group(from->pkey.ec));
        if (group == NULL)
@@ -405,7 +405,7 @@ int ec_copy_parameters(EVP_PKEY *to, const EVP_PKEY *from)
        return 1;
        }
 
-int ec_cmp_parameters(const EVP_PKEY *a, const EVP_PKEY *b)
+static int ec_cmp_parameters(const EVP_PKEY *a, const EVP_PKEY *b)
        {
        const EC_GROUP *group_a = EC_KEY_get0_group(a->pkey.ec),
                       *group_b = EC_KEY_get0_group(b->pkey.ec);
@@ -570,6 +570,33 @@ static int old_ec_priv_encode(const EVP_PKEY *pkey, unsigned char **pder)
        return i2d_ECPrivateKey(pkey->pkey.ec, pder);
        }
 
+static int ec_pkey_ctrl(EVP_PKEY *pkey, int op, long arg1, void *arg2)
+       {
+       switch (op)
+               {
+               case ASN1_PKEY_CTRL_PKCS7_SIGN:
+               if (arg1 == 0)
+                       {
+                       X509_ALGOR *alg1, *alg2;
+                       PKCS7_SIGNER_INFO_get0_algs(arg2, NULL, &alg1, &alg2);
+                       X509_ALGOR_set0(alg1, OBJ_nid2obj(NID_sha1),
+                                                       V_ASN1_NULL, 0);
+                       X509_ALGOR_set0(alg2, OBJ_nid2obj(NID_ecdsa_with_SHA1),
+                                                       V_ASN1_NULL, 0);
+                       }
+               return 1;
+
+               case ASN1_PKEY_CTRL_DEFAULT_MD_NID:
+               *(int *)arg2 = NID_sha1;
+               return 2;
+
+               default:
+               return -2;
+
+               }
+
+       }
+
 EVP_PKEY_ASN1_METHOD eckey_asn1_meth = 
        {
        EVP_PKEY_EC,
@@ -598,7 +625,7 @@ EVP_PKEY_ASN1_METHOD eckey_asn1_meth =
        eckey_param_print,
 
        int_ec_free,
-       0,
+       ec_pkey_ctrl,
        old_ec_priv_decode,
        old_ec_priv_encode
        };