Store digests as EVP_MD instead of a NID.

[openssl.git] / crypto / evp / evp_pkey.c

diff --git a/crypto/evp/evp_pkey.c b/crypto/evp/evp_pkey.c
index f3eca2b87e16488bf033186efd5d48acac6490dc..e81c4fedb199954b540eb20b17be02699625b186 100644 (file)
--- a/crypto/evp/evp_pkey.c
+++ b/crypto/evp/evp_pkey.c
@@ -61,19 +61,7 @@
 #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>
-
-#ifdef FLAT_INC
 #include "asn1_locl.h"
-#else
-#include "../asn1/asn1_locl.h"
-#endif
 
 /* Extract a private key from a PKCS8 structure */
 
@@ -92,7 +80,7 @@ EVP_PKEY *EVP_PKCS82PKEY(PKCS8_PRIV_KEY_INFO *p8)
                return NULL;
        }
 
-       meth = EVP_PKEY_ASN1_find(OBJ_obj2nid(algoid));
+       meth = EVP_PKEY_asn1_find(OBJ_obj2nid(algoid));
 
        if (meth)
                {
@@ -144,7 +132,7 @@ PKCS8_PRIV_KEY_INFO *EVP_PKEY2PKCS8_broken(EVP_PKEY *pkey, int broken)
        }
        p8->broken = broken;
 
-       meth = EVP_PKEY_ASN1_find(pkey->type);
+       meth = EVP_PKEY_asn1_find(pkey->type);
 
        if (meth)
                {