Update openssl to 1.0.2d

Also update Cryptlib to edk2 r17731

Signed-off-by: Gary Ching-Pang Lin <glin@suse.com>

1 files changed, 39 insertions, 592 deletions

diff --git a/Cryptlib/OpenSSL/crypto/evp/evp_pkey.c b/Cryptlib/OpenSSL/crypto/evp/evp_pkey.c
index bc4d5c28..6a456297 100644
--- a/Cryptlib/OpenSSL/crypto/evp/evp_pkey.c
+++ b/Cryptlib/OpenSSL/crypto/evp/evp_pkey.c
@@ -4,7 +4,7 @@
  * 1999.
  */
 /* ====================================================================
- * Copyright (c) 1999-2002 The OpenSSL Project.  All rights reserved.
+ * Copyright (c) 1999-2005 The OpenSSL Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -62,281 +62,46 @@
 #include "cryptlib.h"
 #include <openssl/x509.h>
 #include <openssl/rand.h>
-#ifndef OPENSSL_NO_RSA
-# include <openssl/rsa.h>
-#endif
-#ifndef OPENSSL_NO_DSA
-# include <openssl/dsa.h>
-#endif
-#include <openssl/bn.h>
-
-#ifndef OPENSSL_NO_DSA
-static int dsa_pkey2pkcs8(PKCS8_PRIV_KEY_INFO *p8inf, EVP_PKEY *pkey);
-#endif
-#ifndef OPENSSL_NO_EC
-static int eckey_pkey2pkcs8(PKCS8_PRIV_KEY_INFO *p8inf, EVP_PKEY *pkey);
-#endif
+#include "asn1_locl.h"
 
 /* Extract a private key from a PKCS8 structure */
 
 EVP_PKEY *EVP_PKCS82PKEY(PKCS8_PRIV_KEY_INFO *p8)
 {
     EVP_PKEY *pkey = NULL;
-#ifndef OPENSSL_NO_RSA
-    RSA *rsa = NULL;
-#endif
-#ifndef OPENSSL_NO_DSA
-    DSA *dsa = NULL;
-    ASN1_TYPE *t1, *t2;
-    ASN1_INTEGER *privkey;
-    STACK_OF(ASN1_TYPE) *ndsa = NULL;
-#endif
-#ifndef OPENSSL_NO_EC
-    EC_KEY *eckey = NULL;
-    const unsigned char *p_tmp;
-#endif
-#if !defined(OPENSSL_NO_DSA) || !defined(OPENSSL_NO_EC)
-    ASN1_TYPE *param = NULL;
-    BN_CTX *ctx = NULL;
-    int plen;
-#endif
-    X509_ALGOR *a;
-    const unsigned char *p;
-    const unsigned char *cp;
-    int pkeylen;
-    int nid;
+    ASN1_OBJECT *algoid;
     char obj_tmp[80];
 
-    if (p8->pkey->type == V_ASN1_OCTET_STRING) {
-        p8->broken = PKCS8_OK;
-        p = p8->pkey->value.octet_string->data;
-        pkeylen = p8->pkey->value.octet_string->length;
-    } else {
-        p8->broken = PKCS8_NO_OCTET;
-        p = p8->pkey->value.sequence->data;
-        pkeylen = p8->pkey->value.sequence->length;
-    }
+    if (!PKCS8_pkey_get0(&algoid, NULL, NULL, NULL, p8))
+        return NULL;
+
     if (!(pkey = EVP_PKEY_new())) {
         EVPerr(EVP_F_EVP_PKCS82PKEY, ERR_R_MALLOC_FAILURE);
         return NULL;
     }
-    a = p8->pkeyalg;
-    nid = OBJ_obj2nid(a->algorithm);
-    switch (nid) {
-#ifndef OPENSSL_NO_RSA
-    case NID_rsaEncryption:
-        cp = p;
-        if (!(rsa = d2i_RSAPrivateKey(NULL, &cp, pkeylen))) {
-            EVPerr(EVP_F_EVP_PKCS82PKEY, EVP_R_DECODE_ERROR);
-            return NULL;
-        }
-        EVP_PKEY_assign_RSA(pkey, rsa);
-        break;
-#endif
-#ifndef OPENSSL_NO_DSA
-    case NID_dsa:
-        /*
-         * PKCS#8 DSA is weird: you just get a private key integer and
-         * parameters in the AlgorithmIdentifier the pubkey must be
-         * recalculated.
-         */
-
-        /* Check for broken DSA PKCS#8, UGH! */
-        if (*p == (V_ASN1_SEQUENCE | V_ASN1_CONSTRUCTED)) {
-            if (!(ndsa = ASN1_seq_unpack_ASN1_TYPE(p, pkeylen,
-                                                   d2i_ASN1_TYPE,
-                                                   ASN1_TYPE_free))) {
-                EVPerr(EVP_F_EVP_PKCS82PKEY, EVP_R_DECODE_ERROR);
-                goto dsaerr;
-            }
-            if (sk_ASN1_TYPE_num(ndsa) != 2) {
-                EVPerr(EVP_F_EVP_PKCS82PKEY, EVP_R_DECODE_ERROR);
-                goto dsaerr;
-            }
-            /*
-             * Handle Two broken types: SEQUENCE {parameters, priv_key}
-             * SEQUENCE {pub_key, priv_key}
-             */
 
-            t1 = sk_ASN1_TYPE_value(ndsa, 0);
-            t2 = sk_ASN1_TYPE_value(ndsa, 1);
-            if (t1->type == V_ASN1_SEQUENCE) {
-                p8->broken = PKCS8_EMBEDDED_PARAM;
-                param = t1;
-            } else if (a->parameter->type == V_ASN1_SEQUENCE) {
-                p8->broken = PKCS8_NS_DB;
-                param = a->parameter;
-            } else {
-                EVPerr(EVP_F_EVP_PKCS82PKEY, EVP_R_DECODE_ERROR);
-                goto dsaerr;
-            }
-
-            if (t2->type != V_ASN1_INTEGER) {
-                EVPerr(EVP_F_EVP_PKCS82PKEY, EVP_R_DECODE_ERROR);
-                goto dsaerr;
-            }
-            privkey = t2->value.integer;
-        } else {
-            if (!(privkey = d2i_ASN1_INTEGER(NULL, &p, pkeylen))) {
-                EVPerr(EVP_F_EVP_PKCS82PKEY, EVP_R_DECODE_ERROR);
-                goto dsaerr;
-            }
-            param = p8->pkeyalg->parameter;
-        }
-        if (!param || (param->type != V_ASN1_SEQUENCE)) {
-            EVPerr(EVP_F_EVP_PKCS82PKEY, EVP_R_DECODE_ERROR);
-            goto dsaerr;
-        }
-        cp = p = param->value.sequence->data;
-        plen = param->value.sequence->length;
-        if (!(dsa = d2i_DSAparams(NULL, &cp, plen))) {
-            EVPerr(EVP_F_EVP_PKCS82PKEY, EVP_R_DECODE_ERROR);
-            goto dsaerr;
-        }
-        /* We have parameters now set private key */
-        if (!(dsa->priv_key = ASN1_INTEGER_to_BN(privkey, NULL))) {
-            EVPerr(EVP_F_EVP_PKCS82PKEY, EVP_R_BN_DECODE_ERROR);
-            goto dsaerr;
-        }
-        /* Calculate public key (ouch!) */
-        if (!(dsa->pub_key = BN_new())) {
-            EVPerr(EVP_F_EVP_PKCS82PKEY, ERR_R_MALLOC_FAILURE);
-            goto dsaerr;
-        }
-        if (!(ctx = BN_CTX_new())) {
-            EVPerr(EVP_F_EVP_PKCS82PKEY, ERR_R_MALLOC_FAILURE);
-            goto dsaerr;
-        }
-
-        if (!BN_mod_exp(dsa->pub_key, dsa->g, dsa->priv_key, dsa->p, ctx)) {
-
-            EVPerr(EVP_F_EVP_PKCS82PKEY, EVP_R_BN_PUBKEY_ERROR);
-            goto dsaerr;
-        }
-
-        EVP_PKEY_assign_DSA(pkey, dsa);
-        BN_CTX_free(ctx);
-        if (ndsa)
-            sk_ASN1_TYPE_pop_free(ndsa, ASN1_TYPE_free);
-        else
-            ASN1_INTEGER_free(privkey);
-        break;
- dsaerr:
-        BN_CTX_free(ctx);
-        sk_ASN1_TYPE_pop_free(ndsa, ASN1_TYPE_free);
-        DSA_free(dsa);
-        EVP_PKEY_free(pkey);
-        return NULL;
-        break;
-#endif
-#ifndef OPENSSL_NO_EC
-    case NID_X9_62_id_ecPublicKey:
-        p_tmp = p;
-        /* extract the ec parameters */
-        param = p8->pkeyalg->parameter;
-
-        if (!param || ((param->type != V_ASN1_SEQUENCE) &&
-                       (param->type != V_ASN1_OBJECT))) {
-            EVPerr(EVP_F_EVP_PKCS82PKEY, EVP_R_DECODE_ERROR);
-            goto ecerr;
-        }
-
-        if (param->type == V_ASN1_SEQUENCE) {
-            cp = p = param->value.sequence->data;
-            plen = param->value.sequence->length;
-
-            if (!(eckey = d2i_ECParameters(NULL, &cp, plen))) {
-                EVPerr(EVP_F_EVP_PKCS82PKEY, EVP_R_DECODE_ERROR);
-                goto ecerr;
-            }
-        } else {
-            EC_GROUP *group;
-            cp = p = param->value.object->data;
-            plen = param->value.object->length;
-
-            /*
-             * type == V_ASN1_OBJECT => the parameters are given by an asn1
-             * OID
-             */
-            if ((eckey = EC_KEY_new()) == NULL) {
-                EVPerr(EVP_F_EVP_PKCS82PKEY, ERR_R_MALLOC_FAILURE);
-                goto ecerr;
-            }
-            group =
-                EC_GROUP_new_by_curve_name(OBJ_obj2nid
-                                           (a->parameter->value.object));
-            if (group == NULL)
-                goto ecerr;
-            EC_GROUP_set_asn1_flag(group, OPENSSL_EC_NAMED_CURVE);
-            if (EC_KEY_set_group(eckey, group) == 0)
-                goto ecerr;
-            EC_GROUP_free(group);
-        }
-
-        /* We have parameters now set private key */
-        if (!d2i_ECPrivateKey(&eckey, &p_tmp, pkeylen)) {
-            EVPerr(EVP_F_EVP_PKCS82PKEY, EVP_R_DECODE_ERROR);
-            goto ecerr;
-        }
-
-        /* calculate public key (if necessary) */
-        if (EC_KEY_get0_public_key(eckey) == NULL) {
-            const BIGNUM *priv_key;
-            const EC_GROUP *group;
-            EC_POINT *pub_key;
-            /*
-             * the public key was not included in the SEC1 private key =>
-             * calculate the public key
-             */
-            group = EC_KEY_get0_group(eckey);
-            pub_key = EC_POINT_new(group);
-            if (pub_key == NULL) {
-                EVPerr(EVP_F_EVP_PKCS82PKEY, ERR_R_EC_LIB);
-                goto ecerr;
-            }
-            if (!EC_POINT_copy(pub_key, EC_GROUP_get0_generator(group))) {
-                EC_POINT_free(pub_key);
-                EVPerr(EVP_F_EVP_PKCS82PKEY, ERR_R_EC_LIB);
-                goto ecerr;
-            }
-            priv_key = EC_KEY_get0_private_key(eckey);
-            if (!EC_POINT_mul(group, pub_key, priv_key, NULL, NULL, ctx)) {
-                EC_POINT_free(pub_key);
-                EVPerr(EVP_F_EVP_PKCS82PKEY, ERR_R_EC_LIB);
-                goto ecerr;
-            }
-            if (EC_KEY_set_public_key(eckey, pub_key) == 0) {
-                EC_POINT_free(pub_key);
-                EVPerr(EVP_F_EVP_PKCS82PKEY, ERR_R_EC_LIB);
-                goto ecerr;
-            }
-            EC_POINT_free(pub_key);
-        }
-
-        EVP_PKEY_assign_EC_KEY(pkey, eckey);
-        if (ctx)
-            BN_CTX_free(ctx);
-        break;
- ecerr:
-        if (ctx)
-            BN_CTX_free(ctx);
-        if (eckey)
-            EC_KEY_free(eckey);
-        if (pkey)
-            EVP_PKEY_free(pkey);
-        return NULL;
-#endif
-    default:
+    if (!EVP_PKEY_set_type(pkey, OBJ_obj2nid(algoid))) {
         EVPerr(EVP_F_EVP_PKCS82PKEY, EVP_R_UNSUPPORTED_PRIVATE_KEY_ALGORITHM);
-        if (!a->algorithm)
-            BUF_strlcpy(obj_tmp, "NULL", sizeof obj_tmp);
-        else
-            i2t_ASN1_OBJECT(obj_tmp, 80, a->algorithm);
+        i2t_ASN1_OBJECT(obj_tmp, 80, algoid);
         ERR_add_error_data(2, "TYPE=", obj_tmp);
-        EVP_PKEY_free(pkey);
-        return NULL;
+        goto error;
     }
+
+    if (pkey->ameth->priv_decode) {
+        if (!pkey->ameth->priv_decode(pkey, p8)) {
+            EVPerr(EVP_F_EVP_PKCS82PKEY, EVP_R_PRIVATE_KEY_DECODE_ERROR);
+            goto error;
+        }
+    } else {
+        EVPerr(EVP_F_EVP_PKCS82PKEY, EVP_R_METHOD_NOT_SUPPORTED);
+        goto error;
+    }
+
     return pkey;
+
+ error:
+    EVP_PKEY_free(pkey);
+    return NULL;
 }
 
 PKCS8_PRIV_KEY_INFO *EVP_PKEY2PKCS8(EVP_PKEY *pkey)
@@ -355,60 +120,29 @@ PKCS8_PRIV_KEY_INFO *EVP_PKEY2PKCS8_broken(EVP_PKEY *pkey, int broken)
         return NULL;
     }
     p8->broken = broken;
-    if (!ASN1_INTEGER_set(p8->version, 0)) {
-        EVPerr(EVP_F_EVP_PKEY2PKCS8_BROKEN, ERR_R_MALLOC_FAILURE);
-        PKCS8_PRIV_KEY_INFO_free(p8);
-        return NULL;
-    }
-    if (!(p8->pkeyalg->parameter = ASN1_TYPE_new())) {
-        EVPerr(EVP_F_EVP_PKEY2PKCS8_BROKEN, ERR_R_MALLOC_FAILURE);
-        PKCS8_PRIV_KEY_INFO_free(p8);
-        return NULL;
-    }
-    p8->pkey->type = V_ASN1_OCTET_STRING;
-    switch (EVP_PKEY_type(pkey->type)) {
-#ifndef OPENSSL_NO_RSA
-    case EVP_PKEY_RSA:
-
-        if (p8->broken == PKCS8_NO_OCTET)
-            p8->pkey->type = V_ASN1_SEQUENCE;
 
-        p8->pkeyalg->algorithm = OBJ_nid2obj(NID_rsaEncryption);
-        p8->pkeyalg->parameter->type = V_ASN1_NULL;
-        if (!ASN1_pack_string_of(EVP_PKEY, pkey, i2d_PrivateKey,
-                                 &p8->pkey->value.octet_string)) {
-            EVPerr(EVP_F_EVP_PKEY2PKCS8_BROKEN, ERR_R_MALLOC_FAILURE);
-            PKCS8_PRIV_KEY_INFO_free(p8);
-            return NULL;
-        }
-        break;
-#endif
-#ifndef OPENSSL_NO_DSA
-    case EVP_PKEY_DSA:
-        if (!dsa_pkey2pkcs8(p8, pkey)) {
-            PKCS8_PRIV_KEY_INFO_free(p8);
-            return NULL;
-        }
-
-        break;
-#endif
-#ifndef OPENSSL_NO_EC
-    case EVP_PKEY_EC:
-        if (!eckey_pkey2pkcs8(p8, pkey)) {
-            PKCS8_PRIV_KEY_INFO_free(p8);
-            return (NULL);
+    if (pkey->ameth) {
+        if (pkey->ameth->priv_encode) {
+            if (!pkey->ameth->priv_encode(p8, pkey)) {
+                EVPerr(EVP_F_EVP_PKEY2PKCS8_BROKEN,
+                       EVP_R_PRIVATE_KEY_ENCODE_ERROR);
+                goto error;
+            }
+        } else {
+            EVPerr(EVP_F_EVP_PKEY2PKCS8_BROKEN, EVP_R_METHOD_NOT_SUPPORTED);
+            goto error;
         }
-        break;
-#endif
-    default:
+    } else {
         EVPerr(EVP_F_EVP_PKEY2PKCS8_BROKEN,
                EVP_R_UNSUPPORTED_PRIVATE_KEY_ALGORITHM);
-        PKCS8_PRIV_KEY_INFO_free(p8);
-        return NULL;
+        goto error;
     }
     RAND_add(p8->pkey->value.octet_string->data,
              p8->pkey->value.octet_string->length, 0.0);
     return p8;
+ error:
+    PKCS8_PRIV_KEY_INFO_free(p8);
+    return NULL;
 }
 
 PKCS8_PRIV_KEY_INFO *PKCS8_set_broken(PKCS8_PRIV_KEY_INFO *p8, int broken)
@@ -432,293 +166,6 @@ PKCS8_PRIV_KEY_INFO *PKCS8_set_broken(PKCS8_PRIV_KEY_INFO *p8, int broken)
     }
 }
 
-#ifndef OPENSSL_NO_DSA
-static int dsa_pkey2pkcs8(PKCS8_PRIV_KEY_INFO *p8, EVP_PKEY *pkey)
-{
-    ASN1_STRING *params = NULL;
-    ASN1_INTEGER *prkey = NULL;
-    ASN1_TYPE *ttmp = NULL;
-    STACK_OF(ASN1_TYPE) *ndsa = NULL;
-    unsigned char *p = NULL, *q;
-    int len;
-
-    p8->pkeyalg->algorithm = OBJ_nid2obj(NID_dsa);
-    len = i2d_DSAparams(pkey->pkey.dsa, NULL);
-    if (!(p = OPENSSL_malloc(len))) {
-        EVPerr(EVP_F_DSA_PKEY2PKCS8, ERR_R_MALLOC_FAILURE);
-        goto err;
-    }
-    q = p;
-    i2d_DSAparams(pkey->pkey.dsa, &q);
-    if (!(params = ASN1_STRING_new())) {
-        EVPerr(EVP_F_DSA_PKEY2PKCS8, ERR_R_MALLOC_FAILURE);
-        goto err;
-    }
-    if (!ASN1_STRING_set(params, p, len)) {
-        EVPerr(EVP_F_DSA_PKEY2PKCS8, ERR_R_MALLOC_FAILURE);
-        goto err;
-    }
-    OPENSSL_free(p);
-    p = NULL;
-    /* Get private key into integer */
-    if (!(prkey = BN_to_ASN1_INTEGER(pkey->pkey.dsa->priv_key, NULL))) {
-        EVPerr(EVP_F_DSA_PKEY2PKCS8, EVP_R_ENCODE_ERROR);
-        goto err;
-    }
-
-    switch (p8->broken) {
-
-    case PKCS8_OK:
-    case PKCS8_NO_OCTET:
-
-        if (!ASN1_pack_string_of(ASN1_INTEGER, prkey, i2d_ASN1_INTEGER,
-                                 &p8->pkey->value.octet_string)) {
-            EVPerr(EVP_F_DSA_PKEY2PKCS8, ERR_R_MALLOC_FAILURE);
-            goto err;
-        }
-
-        M_ASN1_INTEGER_free(prkey);
-        prkey = NULL;
-        p8->pkeyalg->parameter->value.sequence = params;
-        params = NULL;
-        p8->pkeyalg->parameter->type = V_ASN1_SEQUENCE;
-
-        break;
-
-    case PKCS8_NS_DB:
-
-        p8->pkeyalg->parameter->value.sequence = params;
-        params = NULL;
-        p8->pkeyalg->parameter->type = V_ASN1_SEQUENCE;
-        if (!(ndsa = sk_ASN1_TYPE_new_null())) {
-            EVPerr(EVP_F_DSA_PKEY2PKCS8, ERR_R_MALLOC_FAILURE);
-            goto err;
-        }
-        if (!(ttmp = ASN1_TYPE_new())) {
-            EVPerr(EVP_F_DSA_PKEY2PKCS8, ERR_R_MALLOC_FAILURE);
-            goto err;
-        }
-        if (!(ttmp->value.integer =
-              BN_to_ASN1_INTEGER(pkey->pkey.dsa->pub_key, NULL))) {
-            EVPerr(EVP_F_DSA_PKEY2PKCS8, EVP_R_ENCODE_ERROR);
-            goto err;
-        }
-        ttmp->type = V_ASN1_INTEGER;
-        if (!sk_ASN1_TYPE_push(ndsa, ttmp)) {
-            EVPerr(EVP_F_DSA_PKEY2PKCS8, ERR_R_MALLOC_FAILURE);
-            goto err;
-        }
-
-        if (!(ttmp = ASN1_TYPE_new())) {
-            EVPerr(EVP_F_DSA_PKEY2PKCS8, ERR_R_MALLOC_FAILURE);
-            goto err;
-        }
-        ttmp->value.integer = prkey;
-        prkey = NULL;
-        ttmp->type = V_ASN1_INTEGER;
-        if (!sk_ASN1_TYPE_push(ndsa, ttmp)) {
-            EVPerr(EVP_F_DSA_PKEY2PKCS8, ERR_R_MALLOC_FAILURE);
-            goto err;
-        }
-        ttmp = NULL;
-
-        if (!(p8->pkey->value.octet_string = ASN1_OCTET_STRING_new())) {
-            EVPerr(EVP_F_DSA_PKEY2PKCS8, ERR_R_MALLOC_FAILURE);
-            goto err;
-        }
-
-        if (!ASN1_seq_pack_ASN1_TYPE(ndsa, i2d_ASN1_TYPE,
-                                     &p8->pkey->value.octet_string->data,
-                                     &p8->pkey->value.octet_string->length)) {
-
-            EVPerr(EVP_F_DSA_PKEY2PKCS8, ERR_R_MALLOC_FAILURE);
-            goto err;
-        }
-        sk_ASN1_TYPE_pop_free(ndsa, ASN1_TYPE_free);
-        break;
-
-    case PKCS8_EMBEDDED_PARAM:
-
-        p8->pkeyalg->parameter->type = V_ASN1_NULL;
-        if (!(ndsa = sk_ASN1_TYPE_new_null())) {
-            EVPerr(EVP_F_DSA_PKEY2PKCS8, ERR_R_MALLOC_FAILURE);
-            goto err;
-        }
-        if (!(ttmp = ASN1_TYPE_new())) {
-            EVPerr(EVP_F_DSA_PKEY2PKCS8, ERR_R_MALLOC_FAILURE);
-            goto err;
-        }
-        ttmp->value.sequence = params;
-        params = NULL;
-        ttmp->type = V_ASN1_SEQUENCE;
-        if (!sk_ASN1_TYPE_push(ndsa, ttmp)) {
-            EVPerr(EVP_F_DSA_PKEY2PKCS8, ERR_R_MALLOC_FAILURE);
-            goto err;
-        }
-
-        if (!(ttmp = ASN1_TYPE_new())) {
-            EVPerr(EVP_F_DSA_PKEY2PKCS8, ERR_R_MALLOC_FAILURE);
-            goto err;
-        }
-        ttmp->value.integer = prkey;
-        prkey = NULL;
-        ttmp->type = V_ASN1_INTEGER;
-        if (!sk_ASN1_TYPE_push(ndsa, ttmp)) {
-            EVPerr(EVP_F_DSA_PKEY2PKCS8, ERR_R_MALLOC_FAILURE);
-            goto err;
-        }
-        ttmp = NULL;
-
-        if (!(p8->pkey->value.octet_string = ASN1_OCTET_STRING_new())) {
-            EVPerr(EVP_F_DSA_PKEY2PKCS8, ERR_R_MALLOC_FAILURE);
-            goto err;
-        }
-
-        if (!ASN1_seq_pack_ASN1_TYPE(ndsa, i2d_ASN1_TYPE,
-                                     &p8->pkey->value.octet_string->data,
-                                     &p8->pkey->value.octet_string->length)) {
-
-            EVPerr(EVP_F_DSA_PKEY2PKCS8, ERR_R_MALLOC_FAILURE);
-            goto err;
-        }
-        sk_ASN1_TYPE_pop_free(ndsa, ASN1_TYPE_free);
-        break;
-    }
-    return 1;
- err:
-    if (p != NULL)
-        OPENSSL_free(p);
-    if (params != NULL)
-        ASN1_STRING_free(params);
-    if (prkey != NULL)
-        M_ASN1_INTEGER_free(prkey);
-    if (ttmp != NULL)
-        ASN1_TYPE_free(ttmp);
-    if (ndsa != NULL)
-        sk_ASN1_TYPE_pop_free(ndsa, ASN1_TYPE_free);
-    return 0;
-}
-#endif
-
-#ifndef OPENSSL_NO_EC
-static int eckey_pkey2pkcs8(PKCS8_PRIV_KEY_INFO *p8, EVP_PKEY *pkey)
-{
-    EC_KEY *ec_key;
-    const EC_GROUP *group;
-    unsigned char *p, *pp;
-    int nid, i, ret = 0;
-    unsigned int tmp_flags, old_flags;
-
-    ec_key = pkey->pkey.ec;
-    if (ec_key == NULL || (group = EC_KEY_get0_group(ec_key)) == NULL) {
-        EVPerr(EVP_F_ECKEY_PKEY2PKCS8, EVP_R_MISSING_PARAMETERS);
-        return 0;
-    }
-
-    /* set the ec parameters OID */
-    if (p8->pkeyalg->algorithm)
-        ASN1_OBJECT_free(p8->pkeyalg->algorithm);
-
-    p8->pkeyalg->algorithm = OBJ_nid2obj(NID_X9_62_id_ecPublicKey);
-
-    /* set the ec parameters */
-
-    if (p8->pkeyalg->parameter) {
-        ASN1_TYPE_free(p8->pkeyalg->parameter);
-        p8->pkeyalg->parameter = NULL;
-    }
-
-    if ((p8->pkeyalg->parameter = ASN1_TYPE_new()) == NULL) {
-        EVPerr(EVP_F_ECKEY_PKEY2PKCS8, ERR_R_MALLOC_FAILURE);
-        return 0;
-    }
-
-    if (EC_GROUP_get_asn1_flag(group)
-        && (nid = EC_GROUP_get_curve_name(group))) {
-        /* we have a 'named curve' => just set the OID */
-        p8->pkeyalg->parameter->type = V_ASN1_OBJECT;
-        p8->pkeyalg->parameter->value.object = OBJ_nid2obj(nid);
-    } else {                    /* explicit parameters */
-
-        if ((i = i2d_ECParameters(ec_key, NULL)) == 0) {
-            EVPerr(EVP_F_ECKEY_PKEY2PKCS8, ERR_R_EC_LIB);
-            return 0;
-        }
-        if ((p = (unsigned char *)OPENSSL_malloc(i)) == NULL) {
-            EVPerr(EVP_F_ECKEY_PKEY2PKCS8, ERR_R_MALLOC_FAILURE);
-            return 0;
-        }
-        pp = p;
-        if (!i2d_ECParameters(ec_key, &pp)) {
-            EVPerr(EVP_F_ECKEY_PKEY2PKCS8, ERR_R_EC_LIB);
-            OPENSSL_free(p);
-            return 0;
-        }
-        p8->pkeyalg->parameter->type = V_ASN1_SEQUENCE;
-        if ((p8->pkeyalg->parameter->value.sequence
-             = ASN1_STRING_new()) == NULL) {
-            EVPerr(EVP_F_ECKEY_PKEY2PKCS8, ERR_R_ASN1_LIB);
-            OPENSSL_free(p);
-            return 0;
-        }
-        ASN1_STRING_set(p8->pkeyalg->parameter->value.sequence, p, i);
-        OPENSSL_free(p);
-    }
-
-    /* set the private key */
-
-    /*
-     * do not include the parameters in the SEC1 private key see PKCS#11
-     * 12.11
-     */
-    old_flags = EC_KEY_get_enc_flags(pkey->pkey.ec);
-    tmp_flags = old_flags | EC_PKEY_NO_PARAMETERS;
-    EC_KEY_set_enc_flags(pkey->pkey.ec, tmp_flags);
-    i = i2d_ECPrivateKey(pkey->pkey.ec, NULL);
-    if (!i) {
-        EC_KEY_set_enc_flags(pkey->pkey.ec, old_flags);
-        EVPerr(EVP_F_ECKEY_PKEY2PKCS8, ERR_R_EC_LIB);
-        return 0;
-    }
-    p = (unsigned char *)OPENSSL_malloc(i);
-    if (!p) {
-        EC_KEY_set_enc_flags(pkey->pkey.ec, old_flags);
-        EVPerr(EVP_F_ECKEY_PKEY2PKCS8, ERR_R_MALLOC_FAILURE);
-        return 0;
-    }
-    pp = p;
-    if (!i2d_ECPrivateKey(pkey->pkey.ec, &pp)) {
-        EC_KEY_set_enc_flags(pkey->pkey.ec, old_flags);
-        EVPerr(EVP_F_ECKEY_PKEY2PKCS8, ERR_R_EC_LIB);
-        OPENSSL_free(p);
-        return 0;
-    }
-    /* restore old encoding flags */
-    EC_KEY_set_enc_flags(pkey->pkey.ec, old_flags);
-
-    switch (p8->broken) {
-
-    case PKCS8_OK:
-        p8->pkey->value.octet_string = ASN1_OCTET_STRING_new();
-        if (!p8->pkey->value.octet_string ||
-            !M_ASN1_OCTET_STRING_set(p8->pkey->value.octet_string,
-                                     (const void *)p, i)) {
-            EVPerr(EVP_F_ECKEY_PKEY2PKCS8, ERR_R_MALLOC_FAILURE);
-        } else
-            ret = 1;
-        break;
-    case PKCS8_NO_OCTET:       /* RSA specific */
-    case PKCS8_NS_DB:          /* DSA specific */
-    case PKCS8_EMBEDDED_PARAM: /* DSA specific */
-    default:
-        EVPerr(EVP_F_ECKEY_PKEY2PKCS8, EVP_R_ENCODE_ERROR);
-    }
-    OPENSSL_cleanse(p, (size_t)i);
-    OPENSSL_free(p);
-    return ret;
-}
-#endif
-
 /* EVP_PKEY attribute functions */
 
 int EVP_PKEY_get_attr_count(const EVP_PKEY *key)