projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
PR: 2258
[openssl.git]
/
crypto
/
evp
/
pmeth_lib.c
diff --git
a/crypto/evp/pmeth_lib.c
b/crypto/evp/pmeth_lib.c
index 928770df63b84826edd4ac422276ed723b93d7a1..29448c00ecba750ac73eb0ee6d045cb9a5597fdc 100644
(file)
--- a/
crypto/evp/pmeth_lib.c
+++ b/
crypto/evp/pmeth_lib.c
@@
-73,15
+73,24
@@
DECLARE_STACK_OF(EVP_PKEY_METHOD)
STACK_OF(EVP_PKEY_METHOD) *app_pkey_methods = NULL;
extern const EVP_PKEY_METHOD rsa_pkey_meth, dh_pkey_meth, dsa_pkey_meth;
STACK_OF(EVP_PKEY_METHOD) *app_pkey_methods = NULL;
extern const EVP_PKEY_METHOD rsa_pkey_meth, dh_pkey_meth, dsa_pkey_meth;
-extern const EVP_PKEY_METHOD ec_pkey_meth, hmac_pkey_meth;
+extern const EVP_PKEY_METHOD ec_pkey_meth, hmac_pkey_meth
, cmac_pkey_meth
;
static const EVP_PKEY_METHOD *standard_methods[] =
{
static const EVP_PKEY_METHOD *standard_methods[] =
{
+#ifndef OPENSSL_NO_RSA
&rsa_pkey_meth,
&rsa_pkey_meth,
+#endif
+#ifndef OPENSSL_NO_DH
&dh_pkey_meth,
&dh_pkey_meth,
+#endif
+#ifndef OPENSSL_NO_DSA
&dsa_pkey_meth,
&dsa_pkey_meth,
+#endif
+#ifndef OPENSSL_NO_EC
&ec_pkey_meth,
&ec_pkey_meth,
+#endif
&hmac_pkey_meth,
&hmac_pkey_meth,
+ &cmac_pkey_meth
};
DECLARE_OBJ_BSEARCH_CMP_FN(const EVP_PKEY_METHOD *, const EVP_PKEY_METHOD *,
};
DECLARE_OBJ_BSEARCH_CMP_FN(const EVP_PKEY_METHOD *, const EVP_PKEY_METHOD *,
@@
-125,6
+134,7
@@
static EVP_PKEY_CTX *int_ctx_new(EVP_PKEY *pkey, ENGINE *e, int id)
return NULL;
id = pkey->ameth->pkey_id;
}
return NULL;
id = pkey->ameth->pkey_id;
}
+#ifndef OPENSSL_NO_ENGINE
/* Try to find an ENGINE which implements this method */
if (e)
{
/* Try to find an ENGINE which implements this method */
if (e)
{
@@
-144,6
+154,7
@@
static EVP_PKEY_CTX *int_ctx_new(EVP_PKEY *pkey, ENGINE *e, int id)
if (e)
pmeth = ENGINE_get_pkey_meth(e, id);
else
if (e)
pmeth = ENGINE_get_pkey_meth(e, id);
else
+#endif
pmeth = EVP_PKEY_meth_find(id);
if (pmeth == NULL)
pmeth = EVP_PKEY_meth_find(id);
if (pmeth == NULL)
@@
-155,8
+166,10
@@
static EVP_PKEY_CTX *int_ctx_new(EVP_PKEY *pkey, ENGINE *e, int id)
ret = OPENSSL_malloc(sizeof(EVP_PKEY_CTX));
if (!ret)
{
ret = OPENSSL_malloc(sizeof(EVP_PKEY_CTX));
if (!ret)
{
+#ifndef OPENSSL_NO_ENGINE
if (e)
ENGINE_finish(e);
if (e)
ENGINE_finish(e);
+#endif
EVPerr(EVP_F_INT_CTX_NEW,ERR_R_MALLOC_FAILURE);
return NULL;
}
EVPerr(EVP_F_INT_CTX_NEW,ERR_R_MALLOC_FAILURE);
return NULL;
}
@@
-165,6
+178,7
@@
static EVP_PKEY_CTX *int_ctx_new(EVP_PKEY *pkey, ENGINE *e, int id)
ret->operation = EVP_PKEY_OP_UNDEFINED;
ret->pkey = pkey;
ret->peerkey = NULL;
ret->operation = EVP_PKEY_OP_UNDEFINED;
ret->pkey = pkey;
ret->peerkey = NULL;
+ ret->pkey_gencb = 0;
if (pkey)
CRYPTO_add(&pkey->references,1,CRYPTO_LOCK_EVP_PKEY);
ret->data = NULL;
if (pkey)
CRYPTO_add(&pkey->references,1,CRYPTO_LOCK_EVP_PKEY);
ret->data = NULL;