New function to dup EVP_PKEY_CTX. This will be needed to make new signing

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

diff --git a/crypto/evp/pmeth_lib.c b/crypto/evp/pmeth_lib.c
index 4b69593ee7cd4ca9e35884f7bf57faf89ab83820..069cdaf3ffb9602d294ee82606e97b210a030858 100644 (file)
--- a/crypto/evp/pmeth_lib.c
+++ b/crypto/evp/pmeth_lib.c
@@ -150,6 +150,7 @@ EVP_PKEY_METHOD* EVP_PKEY_meth_new(int id, int flags)
        pmeth->flags = flags | EVP_PKEY_FLAG_DYNAMIC;
 
        pmeth->init = 0;
+       pmeth->copy = 0;
        pmeth->cleanup = 0;
        pmeth->paramgen_init = 0;
        pmeth->paramgen = 0;
@@ -193,6 +194,41 @@ EVP_PKEY_CTX *EVP_PKEY_CTX_new_id(int id, ENGINE *e)
        return int_ctx_new(NULL, e, id);
        }
 
+EVP_PKEY_CTX *EVP_PKEY_CTX_dup(EVP_PKEY_CTX *pctx)
+       {
+       EVP_PKEY_CTX *rctx;
+       if (!pctx->pmeth || !pctx->pmeth->copy)
+               return NULL;
+       rctx = OPENSSL_malloc(sizeof(EVP_PKEY_CTX));
+       if (!rctx)
+               return NULL;
+
+       rctx->pmeth = pctx->pmeth;
+
+       if (pctx->pkey)
+               {
+               CRYPTO_add(&pctx->pkey->references,1,CRYPTO_LOCK_EVP_PKEY);
+               rctx->pkey = pctx->pkey;
+               }
+
+       if (pctx->peerkey)
+               {
+               CRYPTO_add(&pctx->peerkey->references,1,CRYPTO_LOCK_EVP_PKEY);
+               rctx->peerkey = pctx->peerkey;
+               }
+
+       rctx->data = NULL;
+       rctx->app_data = NULL;
+       rctx->operation = pctx->operation;
+
+       if (pctx->pmeth->copy(rctx, pctx) > 0)
+               return pctx;
+
+       EVP_PKEY_CTX_free(rctx);
+       return NULL;
+
+       }
+
 int EVP_PKEY_meth_add0(const EVP_PKEY_METHOD *pmeth)
        {
        if (app_pkey_methods == NULL)
@@ -305,6 +341,12 @@ void EVP_PKEY_meth_set_init(EVP_PKEY_METHOD *pmeth,
        pmeth->init = init;
        }
 
+void EVP_PKEY_meth_set_copy(EVP_PKEY_METHOD *pmeth,
+       int (*copy)(EVP_PKEY_CTX *dst, EVP_PKEY_CTX *src))
+       {
+       pmeth->copy = copy;
+       }
+
 void EVP_PKEY_meth_set_cleanup(EVP_PKEY_METHOD *pmeth,
        void (*cleanup)(EVP_PKEY_CTX *ctx))
        {
@@ -329,8 +371,8 @@ void EVP_PKEY_meth_set_keygen(EVP_PKEY_METHOD *pmeth,
 
 void EVP_PKEY_meth_set_sign(EVP_PKEY_METHOD *pmeth,
        int (*sign_init)(EVP_PKEY_CTX *ctx),
-       int (*sign)(EVP_PKEY_CTX *ctx, unsigned char *sig, int *siglen,
-                                       const unsigned char *tbs, int tbslen))
+       int (*sign)(EVP_PKEY_CTX *ctx, unsigned char *sig, size_t *siglen,
+                                       const unsigned char *tbs, size_t tbslen))
        {
        pmeth->sign_init = sign_init;
        pmeth->sign = sign;
@@ -338,8 +380,8 @@ void EVP_PKEY_meth_set_sign(EVP_PKEY_METHOD *pmeth,
 
 void EVP_PKEY_meth_set_verify(EVP_PKEY_METHOD *pmeth,
        int (*verify_init)(EVP_PKEY_CTX *ctx),
-       int (*verify)(EVP_PKEY_CTX *ctx, const unsigned char *sig, int siglen,
-                                       const unsigned char *tbs, int tbslen))
+       int (*verify)(EVP_PKEY_CTX *ctx, const unsigned char *sig, size_t siglen,
+                                       const unsigned char *tbs, size_t tbslen))
        {
        pmeth->verify_init = verify_init;
        pmeth->verify = verify;
@@ -348,8 +390,8 @@ void EVP_PKEY_meth_set_verify(EVP_PKEY_METHOD *pmeth,
 void EVP_PKEY_meth_set_verify_recover(EVP_PKEY_METHOD *pmeth,
        int (*verify_recover_init)(EVP_PKEY_CTX *ctx),
        int (*verify_recover)(EVP_PKEY_CTX *ctx,
-                                       unsigned char *sig, int *siglen,
-                                       const unsigned char *tbs, int tbslen))
+                                       unsigned char *sig, size_t *siglen,
+                                       const unsigned char *tbs, size_t tbslen))
        {
        pmeth->verify_recover_init = verify_recover_init;
        pmeth->verify_recover = verify_recover;
@@ -357,7 +399,7 @@ void EVP_PKEY_meth_set_verify_recover(EVP_PKEY_METHOD *pmeth,
 
 void EVP_PKEY_meth_set_signctx(EVP_PKEY_METHOD *pmeth,
        int (*signctx_init)(EVP_PKEY_CTX *ctx, EVP_MD_CTX *mctx),
-       int (*signctx)(EVP_PKEY_CTX *ctx, unsigned char *sig, int *siglen,
+       int (*signctx)(EVP_PKEY_CTX *ctx, unsigned char *sig, size_t *siglen,
                                        EVP_MD_CTX *mctx))
        {
        pmeth->signctx_init = signctx_init;
@@ -375,8 +417,8 @@ void EVP_PKEY_meth_set_verifyctx(EVP_PKEY_METHOD *pmeth,
 
 void EVP_PKEY_meth_set_encrypt(EVP_PKEY_METHOD *pmeth,
        int (*encrypt_init)(EVP_PKEY_CTX *ctx),
-       int (*encrypt)(EVP_PKEY_CTX *ctx, unsigned char *out, int *outlen,
-                                       const unsigned char *in, int inlen))
+       int (*encrypt)(EVP_PKEY_CTX *ctx, unsigned char *out, size_t *outlen,
+                                       const unsigned char *in, size_t inlen))
        {
        pmeth->encrypt_init = encrypt_init;
        pmeth->encrypt = encrypt;
@@ -384,8 +426,8 @@ void EVP_PKEY_meth_set_encrypt(EVP_PKEY_METHOD *pmeth,
 
 void EVP_PKEY_meth_set_decrypt(EVP_PKEY_METHOD *pmeth,
        int (*decrypt_init)(EVP_PKEY_CTX *ctx),
-       int (*decrypt)(EVP_PKEY_CTX *ctx, unsigned char *out, int *outlen,
-                                       const unsigned char *in, int inlen))
+       int (*decrypt)(EVP_PKEY_CTX *ctx, unsigned char *out, size_t *outlen,
+                                       const unsigned char *in, size_t inlen))
        {
        pmeth->decrypt_init = decrypt_init;
        pmeth->decrypt = decrypt;
@@ -393,7 +435,7 @@ void EVP_PKEY_meth_set_decrypt(EVP_PKEY_METHOD *pmeth,
 
 void EVP_PKEY_meth_set_derive(EVP_PKEY_METHOD *pmeth,
        int (*derive_init)(EVP_PKEY_CTX *ctx),
-       int (*derive)(EVP_PKEY_CTX *ctx, unsigned char *key, int *keylen))
+       int (*derive)(EVP_PKEY_CTX *ctx, unsigned char *key, size_t *keylen))
        {
        pmeth->derive_init = derive_init;
        pmeth->derive = derive;