evp/e_aes_cbc_hmac_sha256.c: enable is on all AES-NI platforms, not only on AVX.

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

diff --git a/crypto/evp/pmeth_lib.c b/crypto/evp/pmeth_lib.c
index 9a85f60737258021e5a06da9fe76df65b46345d9..c64f907fdac037fa5e2ac4aaef150bead72b071d 100644 (file)
--- a/crypto/evp/pmeth_lib.c
+++ b/crypto/evp/pmeth_lib.c
@@ -73,15 +73,28 @@ 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;
-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;
+extern const EVP_PKEY_METHOD dhx_pkey_meth;
 
 static const EVP_PKEY_METHOD *standard_methods[] =
        {
+#ifndef OPENSSL_NO_RSA
        &rsa_pkey_meth,
+#endif
+#ifndef OPENSSL_NO_DH
        &dh_pkey_meth,
+#endif
+#ifndef OPENSSL_NO_DSA
        &dsa_pkey_meth,
+#endif
+#ifndef OPENSSL_NO_EC
        &ec_pkey_meth,
+#endif
        &hmac_pkey_meth,
+       &cmac_pkey_meth,
+#ifndef OPENSSL_NO_DH
+       &dhx_pkey_meth
+#endif
        };
 
 DECLARE_OBJ_BSEARCH_CMP_FN(const EVP_PKEY_METHOD *, const EVP_PKEY_METHOD *,
@@ -126,6 +139,8 @@ static EVP_PKEY_CTX *int_ctx_new(EVP_PKEY *pkey, ENGINE *e, int id)
                id = pkey->ameth->pkey_id;
                }
 #ifndef OPENSSL_NO_ENGINE
+       if (pkey && pkey->engine)
+               e = pkey->engine;
        /* Try to find an ENGINE which implements this method */
        if (e)
                {
@@ -169,6 +184,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->pkey_gencb = 0;
        if (pkey)
                CRYPTO_add(&pkey->references,1,CRYPTO_LOCK_EVP_PKEY);
        ret->data = NULL;
@@ -192,6 +208,8 @@ EVP_PKEY_METHOD* EVP_PKEY_meth_new(int id, int flags)
        if (!pmeth)
                return NULL;
 
+       memset(pmeth, 0, sizeof(EVP_PKEY_METHOD));
+
        pmeth->pkey_id = id;
        pmeth->flags = flags | EVP_PKEY_FLAG_DYNAMIC;
 
@@ -224,6 +242,56 @@ EVP_PKEY_METHOD* EVP_PKEY_meth_new(int id, int flags)
        return pmeth;
        }
 
+void EVP_PKEY_meth_get0_info(int *ppkey_id, int *pflags,
+                               const EVP_PKEY_METHOD *meth)
+       {
+       if (ppkey_id)
+               *ppkey_id = meth->pkey_id;
+       if (pflags)
+               *pflags = meth->flags;
+       }
+
+void EVP_PKEY_meth_copy(EVP_PKEY_METHOD *dst, const EVP_PKEY_METHOD *src)
+       {
+
+       dst->init = src->init;
+       dst->copy = src->copy;
+       dst->cleanup = src->cleanup;
+
+       dst->paramgen_init = src->paramgen_init;
+       dst->paramgen = src->paramgen;
+
+       dst->keygen_init = src->keygen_init;
+       dst->keygen = src->keygen;
+
+       dst->sign_init = src->sign_init;
+       dst->sign = src->sign;
+
+       dst->verify_init = src->verify_init;
+       dst->verify = src->verify;
+
+       dst->verify_recover_init = src->verify_recover_init;
+       dst->verify_recover = src->verify_recover;
+
+       dst->signctx_init = src->signctx_init;
+       dst->signctx = src->signctx;
+
+       dst->verifyctx_init = src->verifyctx_init;
+       dst->verifyctx = src->verifyctx;
+
+       dst->encrypt_init = src->encrypt_init;
+       dst->encrypt = src->encrypt;
+
+       dst->decrypt_init = src->decrypt_init;
+       dst->decrypt = src->decrypt;
+
+       dst->derive_init = src->derive_init;
+       dst->derive = src->derive;
+
+       dst->ctrl = src->ctrl;
+       dst->ctrl_str = src->ctrl_str;
+       }
+
 void EVP_PKEY_meth_free(EVP_PKEY_METHOD *pmeth)
        {
        if (pmeth && (pmeth->flags & EVP_PKEY_FLAG_DYNAMIC))