New utility 'pkeyutl' a general purpose version of 'rsautl'.

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

diff --git a/crypto/evp/pmeth_lib.c b/crypto/evp/pmeth_lib.c
index d229b0996d1f9162da3d256634eb8473f1c95417..9ca351a53e9d37560ef0de13a34a8de5abd0e0cc 100644 (file)
--- a/crypto/evp/pmeth_lib.c
+++ b/crypto/evp/pmeth_lib.c
@@ -61,13 +61,14 @@
 #include <openssl/objects.h>
 #include "cryptlib.h"
 #include <openssl/evp.h>
+#include "asn1_locl.h"
 #include "evp_locl.h"
 
 STACK *app_pkey_methods = NULL;
 
 extern EVP_PKEY_METHOD rsa_pkey_meth;
 
-const EVP_PKEY_METHOD *standard_methods[] =
+static const EVP_PKEY_METHOD *standard_methods[] =
        {
        &rsa_pkey_meth
        };
@@ -100,17 +101,20 @@ const EVP_PKEY_METHOD *EVP_PKEY_meth_find(int type, ENGINE *e)
        return *ret;
        }
 
-EVP_PKEY_CTX *EVP_PKEY_CTX_new(int ktype, ENGINE *e)
+EVP_PKEY_CTX *EVP_PKEY_CTX_new(EVP_PKEY *pkey)
        {
        EVP_PKEY_CTX *ret;
        const EVP_PKEY_METHOD *pmeth;
-       pmeth = EVP_PKEY_meth_find(ktype, e);
+       if (!pkey || !pkey->ameth)
+               return NULL;
+       pmeth = EVP_PKEY_meth_find(pkey->ameth->pkey_id, NULL);
        if (pmeth == NULL)
                return NULL;
        ret = OPENSSL_malloc(sizeof(EVP_PKEY_CTX));
        ret->pmeth = pmeth;
        ret->operation = EVP_PKEY_OP_UNDEFINED;
-       ret->pkey = NULL;
+       CRYPTO_add(&pkey->references,1,CRYPTO_LOCK_EVP_PKEY);
+       ret->pkey = pkey;
        ret->data = NULL;
 
        if (pmeth->init)