Provisional support for EC pkey method, supporting ECDH and ECDSA.
[openssl.git] / crypto / evp / pmeth_lib.c
index 9ca351a53e9d37560ef0de13a34a8de5abd0e0cc..d68972c7c47b4da2876725e6692837a87cee560f 100644 (file)
 #include "asn1_locl.h"
 #include "evp_locl.h"
 
+typedef int sk_cmp_fn_type(const char * const *a, const char * const *b);
 STACK *app_pkey_methods = NULL;
 
-extern EVP_PKEY_METHOD rsa_pkey_meth;
+extern EVP_PKEY_METHOD rsa_pkey_meth, dh_pkey_meth, dsa_pkey_meth, ec_pkey_meth;
 
 static const EVP_PKEY_METHOD *standard_methods[] =
        {
-       &rsa_pkey_meth
+       &rsa_pkey_meth,
+       &dh_pkey_meth,
+       &dsa_pkey_meth,
+       &ec_pkey_meth
        };
 
 static int pmeth_cmp(const EVP_PKEY_METHOD * const *a,
@@ -101,20 +105,26 @@ const EVP_PKEY_METHOD *EVP_PKEY_meth_find(int type, ENGINE *e)
        return *ret;
        }
 
-EVP_PKEY_CTX *EVP_PKEY_CTX_new(EVP_PKEY *pkey)
+static EVP_PKEY_CTX *int_ctx_new(EVP_PKEY *pkey, ENGINE *e, int id)
        {
        EVP_PKEY_CTX *ret;
        const EVP_PKEY_METHOD *pmeth;
-       if (!pkey || !pkey->ameth)
-               return NULL;
-       pmeth = EVP_PKEY_meth_find(pkey->ameth->pkey_id, NULL);
+       if (id == -1)
+               {
+               if (!pkey || !pkey->ameth)
+                       return NULL;
+               id = pkey->ameth->pkey_id;
+               }
+       pmeth = EVP_PKEY_meth_find(id, e);
        if (pmeth == NULL)
                return NULL;
        ret = OPENSSL_malloc(sizeof(EVP_PKEY_CTX));
        ret->pmeth = pmeth;
        ret->operation = EVP_PKEY_OP_UNDEFINED;
-       CRYPTO_add(&pkey->references,1,CRYPTO_LOCK_EVP_PKEY);
        ret->pkey = pkey;
+       ret->peerkey = NULL;
+       if (pkey)
+               CRYPTO_add(&pkey->references,1,CRYPTO_LOCK_EVP_PKEY);
        ret->data = NULL;
 
        if (pmeth->init)
@@ -129,12 +139,82 @@ EVP_PKEY_CTX *EVP_PKEY_CTX_new(EVP_PKEY *pkey)
        return ret;
        }
 
+EVP_PKEY_METHOD* EVP_PKEY_meth_new(int id, int flags)
+       {
+       EVP_PKEY_METHOD *pmeth;
+       pmeth = OPENSSL_malloc(sizeof(EVP_PKEY_METHOD));
+       if (!pmeth)
+               return NULL;
+
+       pmeth->pkey_id = id;
+       pmeth->flags = flags | EVP_PKEY_FLAG_DYNAMIC;
+
+       pmeth->init = 0;
+       pmeth->cleanup = 0;
+       pmeth->paramgen_init = 0;
+       pmeth->paramgen = 0;
+       pmeth->keygen_init = 0;
+       pmeth->keygen = 0;
+       pmeth->sign_init = 0;
+       pmeth->sign = 0;
+       pmeth->verify_init = 0;
+       pmeth->verify = 0;
+       pmeth->verify_recover_init = 0;
+       pmeth->verify_recover = 0;
+       pmeth->signctx_init = 0;
+       pmeth->signctx = 0;
+       pmeth->verifyctx_init = 0;
+       pmeth->verifyctx = 0;
+       pmeth->encrypt_init = 0;
+       pmeth->encrypt = 0;
+       pmeth->decrypt_init = 0;
+       pmeth->decrypt = 0;
+       pmeth->derive_init = 0;
+       pmeth->derive = 0;
+       pmeth->ctrl = 0;
+       pmeth->ctrl_str = 0;
+
+       return pmeth;
+       }
+
+void EVP_PKEY_meth_free(EVP_PKEY_METHOD *pmeth)
+       {
+       if (pmeth && (pmeth->flags & EVP_PKEY_FLAG_DYNAMIC))
+               OPENSSL_free(pmeth);
+       }
+
+EVP_PKEY_CTX *EVP_PKEY_CTX_new(EVP_PKEY *pkey, ENGINE *e)
+       {
+       return int_ctx_new(pkey, e, -1);
+       }
+
+EVP_PKEY_CTX *EVP_PKEY_CTX_new_id(int id, ENGINE *e)
+       {
+       return int_ctx_new(NULL, e, id);
+       }
+
+int EVP_PKEY_meth_add0(const EVP_PKEY_METHOD *pmeth)
+       {
+       if (app_pkey_methods == NULL)
+               {
+               app_pkey_methods = sk_new((sk_cmp_fn_type *)pmeth_cmp);
+               if (!app_pkey_methods)
+                       return 0;
+               }
+       if (!sk_push(app_pkey_methods, (char *)pmeth))
+               return 0;
+       sk_sort(app_pkey_methods);
+       return 1;
+       }
+
 void EVP_PKEY_CTX_free(EVP_PKEY_CTX *ctx)
        {
        if (ctx->pmeth && ctx->pmeth->cleanup)
                ctx->pmeth->cleanup(ctx);
        if (ctx->pkey)
                EVP_PKEY_free(ctx->pkey);
+       if (ctx->peerkey)
+               EVP_PKEY_free(ctx->peerkey);
        OPENSSL_free(ctx);
        }
 
@@ -156,7 +236,7 @@ int EVP_PKEY_CTX_ctrl(EVP_PKEY_CTX *ctx, int keytype, int optype,
                return -1;
                }
 
-       if ((optype != -1) && (ctx->operation != optype))
+       if ((optype != -1) && !(ctx->operation & optype))
                {
                EVPerr(EVP_F_EVP_PKEY_CTX_CTRL, EVP_R_INVALID_OPERATION);
                return -1;
@@ -171,12 +251,153 @@ int EVP_PKEY_CTX_ctrl(EVP_PKEY_CTX *ctx, int keytype, int optype,
 
        }
 
-int EVP_PKEY_CTX_ctrl_str(EVP_PKEY_CTX *ctx, char *name, char *value)
+int EVP_PKEY_CTX_ctrl_str(EVP_PKEY_CTX *ctx,
+                                       const char *name, const char *value)
        {
-       if (!ctx || !ctx->pmeth || !ctx->pmeth->ctrl)
+       if (!ctx || !ctx->pmeth || !ctx->pmeth->ctrl_str)
                {
-               EVPerr(EVP_F_EVP_PKEY_CTX_CTRL, EVP_R_COMMAND_NOT_SUPPORTED);
+               EVPerr(EVP_F_EVP_PKEY_CTX_CTRL_STR,
+                                               EVP_R_COMMAND_NOT_SUPPORTED);
                return -2;
                }
+       if (!strcmp(name, "digest"))
+               {
+               const EVP_MD *md;
+               if (!value || !(md = EVP_get_digestbyname(value)))
+                       {
+                       EVPerr(EVP_F_EVP_PKEY_CTX_CTRL_STR,
+                                               EVP_R_INVALID_DIGEST);
+                       return 0;
+                       }
+               return EVP_PKEY_CTX_set_signature_md(ctx, md);
+               }
        return ctx->pmeth->ctrl_str(ctx, name, value);
        }
+
+void EVP_PKEY_CTX_set_data(EVP_PKEY_CTX *ctx, void *data)
+       {
+       ctx->data = data;
+       }
+
+void *EVP_PKEY_CTX_get_data(EVP_PKEY_CTX *ctx)
+       {
+       return ctx->data;
+       }
+
+void EVP_PKEY_CTX_set_app_data(EVP_PKEY_CTX *ctx, void *data)
+       {
+       ctx->app_data = data;
+       }
+
+void *EVP_PKEY_CTX_get_app_data(EVP_PKEY_CTX *ctx)
+       {
+       return ctx->app_data;
+       }
+
+void EVP_PKEY_meth_set_init(EVP_PKEY_METHOD *pmeth,
+       int (*init)(EVP_PKEY_CTX *ctx))
+       {
+       pmeth->init = init;
+       }
+
+void EVP_PKEY_meth_set_cleanup(EVP_PKEY_METHOD *pmeth,
+       void (*cleanup)(EVP_PKEY_CTX *ctx))
+       {
+       pmeth->cleanup = cleanup;
+       }
+
+void EVP_PKEY_meth_set_paramgen(EVP_PKEY_METHOD *pmeth,
+       int (*paramgen_init)(EVP_PKEY_CTX *ctx),
+       int (*paramgen)(EVP_PKEY_CTX *ctx, EVP_PKEY *pkey))
+       {
+       pmeth->paramgen_init = paramgen_init;
+       pmeth->paramgen = paramgen;
+       }
+
+void EVP_PKEY_meth_set_keygen(EVP_PKEY_METHOD *pmeth,
+       int (*keygen_init)(EVP_PKEY_CTX *ctx),
+       int (*keygen)(EVP_PKEY_CTX *ctx, EVP_PKEY *pkey))
+       {
+       pmeth->keygen_init = keygen_init;
+       pmeth->keygen = keygen;
+       }
+
+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))
+       {
+       pmeth->sign_init = sign_init;
+       pmeth->sign = sign;
+       }
+
+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))
+       {
+       pmeth->verify_init = verify_init;
+       pmeth->verify = verify;
+       }
+
+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))
+       {
+       pmeth->verify_recover_init = verify_recover_init;
+       pmeth->verify_recover = verify_recover;
+       }
+
+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,
+                                       EVP_MD_CTX *mctx))
+       {
+       pmeth->signctx_init = signctx_init;
+       pmeth->signctx = signctx;
+       }
+
+void EVP_PKEY_meth_set_verifyctx(EVP_PKEY_METHOD *pmeth,
+       int (*verifyctx_init)(EVP_PKEY_CTX *ctx, EVP_MD_CTX *mctx),
+       int (*verifyctx)(EVP_PKEY_CTX *ctx, const unsigned char *sig,int siglen,
+                                       EVP_MD_CTX *mctx))
+       {
+       pmeth->verifyctx_init = verifyctx_init;
+       pmeth->verifyctx = verifyctx;
+       }
+
+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))
+       {
+       pmeth->encrypt_init = encrypt_init;
+       pmeth->encrypt = encrypt;
+       }
+
+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))
+       {
+       pmeth->decrypt_init = decrypt_init;
+       pmeth->decrypt = decrypt;
+       }
+
+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))
+       {
+       pmeth->derive_init = derive_init;
+       pmeth->derive = derive;
+       }
+
+void EVP_PKEY_meth_set_ctrl(EVP_PKEY_METHOD *pmeth,
+       int (*ctrl)(EVP_PKEY_CTX *ctx, int type, int p1, void *p2),
+       int (*ctrl_str)(EVP_PKEY_CTX *ctx, const char *type, const char *value))
+       {
+       pmeth->ctrl = ctrl;
+       pmeth->ctrl_str = ctrl_str;
+       }