Revert to original...

[oweals/openssl.git] / crypto / asn1 / d2i_pr.c

diff --git a/crypto/asn1/d2i_pr.c b/crypto/asn1/d2i_pr.c
index 7ae87819de66221bc6d5ab2d4026d2f2604e88ba..b4e47d48197f5080e9270d3cc5b8a702fdc196d5 100644 (file)
--- a/crypto/asn1/d2i_pr.c
+++ b/crypto/asn1/d2i_pr.c
@@ -62,8 +62,9 @@
 #include <openssl/evp.h>
 #include <openssl/objects.h>
 #include <openssl/asn1.h>
+#include "asn1_locl.h"
 
-EVP_PKEY *d2i_PrivateKey(int type, EVP_PKEY **a, unsigned char **pp,
+EVP_PKEY *d2i_PrivateKey(int type, EVP_PKEY **a, const unsigned char **pp,
             long length)
        {
        EVP_PKEY *ret;
@@ -80,27 +81,18 @@ EVP_PKEY *d2i_PrivateKey(int type, EVP_PKEY **a, unsigned char **pp,
 
        ret->save_type=type;
        ret->type=EVP_PKEY_type(type);
-       switch (ret->type)
+       ret->ameth = EVP_PKEY_asn1_find(type);
+       if (ret->ameth)
                {
-#ifndef NO_RSA
-       case EVP_PKEY_RSA:
-               if ((ret->pkey.rsa=d2i_RSAPrivateKey(NULL,pp,length)) == NULL)
+               if (!ret->ameth->old_priv_decode ||
+                       !ret->ameth->old_priv_decode(ret, pp, length))
                        {
                        ASN1err(ASN1_F_D2I_PRIVATEKEY,ERR_R_ASN1_LIB);
                        goto err;
                        }
-               break;
-#endif
-#ifndef NO_DSA
-       case EVP_PKEY_DSA:
-               if ((ret->pkey.dsa=d2i_DSAPrivateKey(NULL,pp,length)) == NULL)
-                       {
-                       ASN1err(ASN1_F_D2I_PRIVATEKEY,ERR_R_ASN1_LIB);
-                       goto err;
-                       }
-               break;
-#endif
-       default:
+               }
+       else
+               {
                ASN1err(ASN1_F_D2I_PRIVATEKEY,ASN1_R_UNKNOWN_PUBLIC_KEY_TYPE);
                goto err;
                /* break; */
@@ -114,15 +106,15 @@ err:
 
 /* This works like d2i_PrivateKey() except it automatically works out the type */
 
-EVP_PKEY *d2i_AutoPrivateKey(EVP_PKEY **a, unsigned char **pp,
+EVP_PKEY *d2i_AutoPrivateKey(EVP_PKEY **a, const unsigned char **pp,
             long length)
 {
        STACK_OF(ASN1_TYPE) *inkey;
-       unsigned char *p;
+       const unsigned char *p;
        int keytype;
        p = *pp;
        /* Dirty trick: read in the ASN1 data into a STACK_OF(ASN1_TYPE):
-        * by analysing it we can determine the passed structure: this
+        * by analyzing it we can determine the passed structure: this
         * assumes the input is surrounded by an ASN1 SEQUENCE.
         */
        inkey = d2i_ASN1_SET_OF_ASN1_TYPE(NULL, &p, length, d2i_ASN1_TYPE, 
@@ -130,7 +122,10 @@ EVP_PKEY *d2i_AutoPrivateKey(EVP_PKEY **a, unsigned char **pp,
        /* Since we only need to discern "traditional format" RSA and DSA
         * keys we can just count the elements.
          */
-       if(sk_ASN1_TYPE_num(inkey) == 6) keytype = EVP_PKEY_DSA;
+       if(sk_ASN1_TYPE_num(inkey) == 6) 
+               keytype = EVP_PKEY_DSA;
+       else if (sk_ASN1_TYPE_num(inkey) == 4)
+               keytype = EVP_PKEY_EC;
        else keytype = EVP_PKEY_RSA;
        sk_ASN1_TYPE_pop_free(inkey, ASN1_TYPE_free);
        return d2i_PrivateKey(keytype, a, pp, length);