Update from 0.9.8-stable.

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

diff --git a/crypto/ec/ec_ameth.c b/crypto/ec/ec_ameth.c
index aead4db841767e48e0376e0012fb29d96c30a451..c00f7d746c36e293a451a5aed64b144aef54c315 100644 (file)
--- a/crypto/ec/ec_ameth.c
+++ b/crypto/ec/ec_ameth.c
@@ -1,4 +1,4 @@
-/* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL
+/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2006.
  */
 /* ====================================================================
@@ -59,6 +59,10 @@
 #include "cryptlib.h"
 #include <openssl/x509.h>
 #include <openssl/ec.h>
+#include <openssl/bn.h>
+#ifndef OPENSSL_NO_CMS
+#include <openssl/cms.h>
+#endif
 #include "asn1_locl.h"
 
 static int eckey_param2type(int *pptype, void **ppval, EC_KEY *ec_key)
@@ -394,7 +398,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 +409,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);
@@ -503,7 +507,7 @@ static int do_EC_KEY_print(BIO *bp, const EC_KEY *x, int off, int ktype)
        ret=1;
 err:
        if (!ret)
-               ECerr(EC_F_EC_KEY_PRINT, reason);
+               ECerr(EC_F_DO_EC_KEY_PRINT, reason);
        if (pub_key) 
                BN_free(pub_key);
        if (order)
@@ -515,6 +519,24 @@ err:
        return(ret);
        }
 
+static int eckey_param_decode(EVP_PKEY *pkey,
+                                       const unsigned char **pder, int derlen)
+       {
+       EC_KEY *eckey;
+       if (!(eckey = d2i_ECParameters(NULL, pder, derlen)))
+               {
+               ECerr(EC_F_ECKEY_PARAM_DECODE, ERR_R_EC_LIB);
+               return 0;
+               }
+       EVP_PKEY_assign_EC_KEY(pkey, eckey);
+       return 1;
+       }
+
+static int eckey_param_encode(const EVP_PKEY *pkey, unsigned char **pder)
+       {
+       return i2d_ECParameters(pkey->pkey.ec, pder);
+       }
+
 static int eckey_param_print(BIO *bp, const EVP_PKEY *pkey, int indent,
                                                        ASN1_PCTX *ctx)
        {
@@ -534,12 +556,81 @@ static int eckey_priv_print(BIO *bp, const EVP_PKEY *pkey, int indent,
        return do_EC_KEY_print(bp, pkey->pkey.ec, indent, 2);
        }
 
-EVP_PKEY_ASN1_METHOD eckey_asn1_meth = 
+static int old_ec_priv_decode(EVP_PKEY *pkey,
+                                       const unsigned char **pder, int derlen)
+       {
+       EC_KEY *ec;
+       if (!(ec = d2i_ECPrivateKey (NULL, pder, derlen)))
+               {
+               ECerr(EC_F_OLD_EC_PRIV_DECODE, EC_R_DECODE_ERROR);
+               return 0;
+               }
+       EVP_PKEY_assign_EC_KEY(pkey, ec);
+       return 1;
+       }
+
+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)
+                       {
+                       int snid, hnid;
+                       X509_ALGOR *alg1, *alg2;
+                       PKCS7_SIGNER_INFO_get0_algs(arg2, NULL, &alg1, &alg2);
+                       if (alg1 == NULL || alg1->algorithm == NULL)
+                               return -1;
+                       hnid = OBJ_obj2nid(alg1->algorithm);
+                       if (hnid == NID_undef)
+                               return -1;
+                       if (!OBJ_find_sigid_by_algs(&snid, hnid, EVP_PKEY_id(pkey)))
+                               return -1; 
+                       X509_ALGOR_set0(alg2, OBJ_nid2obj(snid), V_ASN1_UNDEF, 0);
+                       }
+               return 1;
+#ifndef OPENSSL_NO_CMS
+               case ASN1_PKEY_CTRL_CMS_SIGN:
+               if (arg1 == 0)
+                       {
+                       int snid, hnid;
+                       X509_ALGOR *alg1, *alg2;
+                       CMS_SignerInfo_get0_algs(arg2, NULL, NULL,
+                                                               &alg1, &alg2);
+                       if (alg1 == NULL || alg1->algorithm == NULL)
+                               return -1;
+                       hnid = OBJ_obj2nid(alg1->algorithm);
+                       if (hnid == NID_undef)
+                               return -1;
+                       if (!OBJ_find_sigid_by_algs(&snid, hnid, EVP_PKEY_id(pkey)))
+                               return -1; 
+                       X509_ALGOR_set0(alg2, OBJ_nid2obj(snid), V_ASN1_UNDEF, 0);
+                       }
+               return 1;
+#endif
+
+               case ASN1_PKEY_CTRL_DEFAULT_MD_NID:
+               *(int *)arg2 = NID_sha1;
+               return 2;
+
+               default:
+               return -2;
+
+               }
+
+       }
+
+const EVP_PKEY_ASN1_METHOD eckey_asn1_meth = 
        {
        EVP_PKEY_EC,
        EVP_PKEY_EC,
        0,
-       "ec",
+       "EC",
        "OpenSSL EC algorithm",
 
        eckey_pub_decode,
@@ -554,12 +645,15 @@ EVP_PKEY_ASN1_METHOD eckey_asn1_meth =
        int_ec_size,
        ec_bits,
 
-       0,0,    
+       eckey_param_decode,
+       eckey_param_encode,
        ec_missing_parameters,
        ec_copy_parameters,
        ec_cmp_parameters,
        eckey_param_print,
 
        int_ec_free,
-       0
+       ec_pkey_ctrl,
+       old_ec_priv_decode,
+       old_ec_priv_encode
        };