summaryrefslogtreecommitdiffstats
path: root/crypto/evp/p_lib.c
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2006-03-22 17:59:49 +0000
committerDr. Stephen Henson <steve@openssl.org>2006-03-22 17:59:49 +0000
commit18e377b4ffa6d15572d7283f1eb1743ce5875804 (patch)
tree60cbdb8623a4afd56950d7797727071b4486823b /crypto/evp/p_lib.c
parent043b2e9c2ec57da817457c8108c13cf90ce572cb (diff)
Make EVP_PKEY_ASN1_METHOD opaque. Add application level functions to
initialize it. Initial support for application added public key ASN1.
Diffstat (limited to 'crypto/evp/p_lib.c')
-rw-r--r--crypto/evp/p_lib.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/crypto/evp/p_lib.c b/crypto/evp/p_lib.c
index 7fd31b00a4..f18ac62a0f 100644
--- a/crypto/evp/p_lib.c
+++ b/crypto/evp/p_lib.c
@@ -74,6 +74,8 @@
#include <openssl/dh.h>
#endif
+#include "asn1_locl.h"
+
static void EVP_PKEY_free_it(EVP_PKEY *x);
int EVP_PKEY_bits(EVP_PKEY *pkey)
@@ -189,7 +191,7 @@ int EVP_PKEY_assign(EVP_PKEY *pkey, int type, char *key)
if (pkey == NULL) return(0);
if (pkey->pkey.ptr != NULL)
EVP_PKEY_free_it(pkey);
- ameth = EVP_PKEY_ASN1_find(type);
+ ameth = EVP_PKEY_asn1_find(type);
pkey->ameth = ameth;
pkey->type = ameth->pkey_id;
pkey->save_type=type;
@@ -284,7 +286,7 @@ DH *EVP_PKEY_get1_DH(EVP_PKEY *pkey)
int EVP_PKEY_type(int type)
{
const EVP_PKEY_ASN1_METHOD *ameth;
- ameth = EVP_PKEY_ASN1_find(type);
+ ameth = EVP_PKEY_asn1_find(type);
if (ameth)
return ameth->pkey_id;
return NID_undef;