Update EVP_PKEY_cmp() and X509_check_private() to return sensible values and

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

diff --git a/crypto/evp/pmeth_fn.c b/crypto/evp/pmeth_fn.c
index 979588b3a449bdcd5fb740f603cbe00857fa6c81..dbd639bef208193cdc8b56498d2a74728f538ff8 100644 (file)
--- a/crypto/evp/pmeth_fn.c
+++ b/crypto/evp/pmeth_fn.c
@@ -58,21 +58,39 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <openssl/objects.h>
 #include "cryptlib.h"
+#include <openssl/objects.h>
 #include <openssl/evp.h>
 #include "evp_locl.h"
 
+#define M_check_autoarg(ctx, arg, arglen, err) \
+       if (ctx->pmeth->flags & EVP_PKEY_FLAG_AUTOARGLEN) \
+               { \
+               int pksize = EVP_PKEY_size(ctx->pkey); \
+               if (!arg) \
+                       { \
+                       *arglen = pksize; \
+                       return 1; \
+                       } \
+               else if (*arglen < pksize) \
+                       { \
+                       EVPerr(err, EVP_R_BUFFER_TOO_SMALL); \
+                       return 0; \
+                       } \
+               }
+
 int EVP_PKEY_sign_init(EVP_PKEY_CTX *ctx)
        {
        int ret;
-       if (!ctx || !ctx->pmeth || !ctx->pmeth->sign_init)
+       if (!ctx || !ctx->pmeth || !ctx->pmeth->sign)
                {
                EVPerr(EVP_F_EVP_PKEY_SIGN_INIT,
                        EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE);
                return -2;
                }
        ctx->operation = EVP_PKEY_OP_SIGN;
+       if (!ctx->pmeth->sign_init)
+               return 1;
        ret = ctx->pmeth->sign_init(ctx);
        if (ret <= 0)
                ctx->operation = EVP_PKEY_OP_UNDEFINED;
@@ -81,7 +99,7 @@ int EVP_PKEY_sign_init(EVP_PKEY_CTX *ctx)
 
 int EVP_PKEY_sign(EVP_PKEY_CTX *ctx,
                        unsigned char *sig, int *siglen,
-                       unsigned char *tbs, int tbslen)
+                       const unsigned char *tbs, int tbslen)
        {
        if (!ctx || !ctx->pmeth || !ctx->pmeth->sign)
                {
@@ -94,19 +112,22 @@ int EVP_PKEY_sign(EVP_PKEY_CTX *ctx,
                EVPerr(EVP_F_EVP_PKEY_SIGN, EVP_R_OPERATON_NOT_INITIALIZED);
                return -1;
                }
+       M_check_autoarg(ctx, sig, siglen, EVP_F_EVP_PKEY_SIGN)
        return ctx->pmeth->sign(ctx, sig, siglen, tbs, tbslen);
        }
 
 int EVP_PKEY_verify_init(EVP_PKEY_CTX *ctx)
        {
        int ret;
-       if (!ctx || !ctx->pmeth || !ctx->pmeth->verify_init)
+       if (!ctx || !ctx->pmeth || !ctx->pmeth->verify)
                {
                EVPerr(EVP_F_EVP_PKEY_VERIFY_INIT,
                        EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE);
                return -2;
                }
        ctx->operation = EVP_PKEY_OP_VERIFY;
+       if (!ctx->pmeth->verify_init)
+               return 1;
        ret = ctx->pmeth->verify_init(ctx);
        if (ret <= 0)
                ctx->operation = EVP_PKEY_OP_UNDEFINED;
@@ -114,8 +135,8 @@ int EVP_PKEY_verify_init(EVP_PKEY_CTX *ctx)
        }
 
 int EVP_PKEY_verify(EVP_PKEY_CTX *ctx,
-                       unsigned char *sig, int siglen,
-                       unsigned char *tbs, int tbslen)
+                       const unsigned char *sig, int siglen,
+                       const unsigned char *tbs, int tbslen)
        {
        if (!ctx || !ctx->pmeth || !ctx->pmeth->verify)
                {
@@ -134,13 +155,15 @@ int EVP_PKEY_verify(EVP_PKEY_CTX *ctx,
 int EVP_PKEY_verify_recover_init(EVP_PKEY_CTX *ctx)
        {
        int ret;
-       if (!ctx || !ctx->pmeth || !ctx->pmeth->verify_recover_init)
+       if (!ctx || !ctx->pmeth || !ctx->pmeth->verify_recover)
                {
                EVPerr(EVP_F_EVP_PKEY_VERIFY_RECOVER_INIT,
                        EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE);
                return -2;
                }
        ctx->operation = EVP_PKEY_OP_VERIFYRECOVER;
+       if (!ctx->pmeth->verify_recover_init)
+               return 1;
        ret = ctx->pmeth->verify_recover_init(ctx);
        if (ret <= 0)
                ctx->operation = EVP_PKEY_OP_UNDEFINED;
@@ -149,7 +172,7 @@ int EVP_PKEY_verify_recover_init(EVP_PKEY_CTX *ctx)
 
 int EVP_PKEY_verify_recover(EVP_PKEY_CTX *ctx,
                        unsigned char *rout, int *routlen,
-                       unsigned char *sig, int siglen)
+                       const unsigned char *sig, int siglen)
        {
        if (!ctx || !ctx->pmeth || !ctx->pmeth->verify_recover)
                {
@@ -162,19 +185,22 @@ int EVP_PKEY_verify_recover(EVP_PKEY_CTX *ctx,
                EVPerr(EVP_F_EVP_PKEY_VERIFY_RECOVER, EVP_R_OPERATON_NOT_INITIALIZED);
                return -1;
                }
+       M_check_autoarg(ctx, rout, routlen, EVP_F_EVP_PKEY_VERIFY_RECOVER)
        return ctx->pmeth->verify_recover(ctx, rout, routlen, sig, siglen);
        }
 
 int EVP_PKEY_encrypt_init(EVP_PKEY_CTX *ctx)
        {
        int ret;
-       if (!ctx || !ctx->pmeth || !ctx->pmeth->encrypt_init)
+       if (!ctx || !ctx->pmeth || !ctx->pmeth->encrypt)
                {
                EVPerr(EVP_F_EVP_PKEY_ENCRYPT_INIT,
                        EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE);
                return -2;
                }
        ctx->operation = EVP_PKEY_OP_ENCRYPT;
+       if (!ctx->pmeth->encrypt_init)
+               return 1;
        ret = ctx->pmeth->encrypt_init(ctx);
        if (ret <= 0)
                ctx->operation = EVP_PKEY_OP_UNDEFINED;
@@ -183,7 +209,7 @@ int EVP_PKEY_encrypt_init(EVP_PKEY_CTX *ctx)
 
 int EVP_PKEY_encrypt(EVP_PKEY_CTX *ctx,
                        unsigned char *out, int *outlen,
-                       unsigned char *in, int inlen)
+                       const unsigned char *in, int inlen)
        {
        if (!ctx || !ctx->pmeth || !ctx->pmeth->encrypt)
                {
@@ -196,19 +222,22 @@ int EVP_PKEY_encrypt(EVP_PKEY_CTX *ctx,
                EVPerr(EVP_F_EVP_PKEY_ENCRYPT, EVP_R_OPERATON_NOT_INITIALIZED);
                return -1;
                }
+       M_check_autoarg(ctx, out, outlen, EVP_F_EVP_PKEY_ENCRYPT)
        return ctx->pmeth->encrypt(ctx, out, outlen, in, inlen);
        }
 
 int EVP_PKEY_decrypt_init(EVP_PKEY_CTX *ctx)
        {
        int ret;
-       if (!ctx || !ctx->pmeth || !ctx->pmeth->decrypt_init)
+       if (!ctx || !ctx->pmeth || !ctx->pmeth->decrypt)
                {
                EVPerr(EVP_F_EVP_PKEY_DECRYPT_INIT,
                        EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE);
                return -2;
                }
        ctx->operation = EVP_PKEY_OP_DECRYPT;
+       if (!ctx->pmeth->decrypt_init)
+               return 1;
        ret = ctx->pmeth->decrypt_init(ctx);
        if (ret <= 0)
                ctx->operation = EVP_PKEY_OP_UNDEFINED;
@@ -217,7 +246,7 @@ int EVP_PKEY_decrypt_init(EVP_PKEY_CTX *ctx)
 
 int EVP_PKEY_decrypt(EVP_PKEY_CTX *ctx,
                        unsigned char *out, int *outlen,
-                       unsigned char *in, int inlen)
+                       const unsigned char *in, int inlen)
        {
        if (!ctx || !ctx->pmeth || !ctx->pmeth->decrypt)
                {
@@ -230,6 +259,103 @@ int EVP_PKEY_decrypt(EVP_PKEY_CTX *ctx,
                EVPerr(EVP_F_EVP_PKEY_DECRYPT, EVP_R_OPERATON_NOT_INITIALIZED);
                return -1;
                }
+       M_check_autoarg(ctx, out, outlen, EVP_F_EVP_PKEY_DECRYPT)
        return ctx->pmeth->decrypt(ctx, out, outlen, in, inlen);
        }
 
+
+int EVP_PKEY_derive_init(EVP_PKEY_CTX *ctx)
+       {
+       int ret;
+       if (!ctx || !ctx->pmeth || !ctx->pmeth->derive)
+               {
+               EVPerr(EVP_F_EVP_PKEY_DERIVE_INIT,
+                       EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE);
+               return -2;
+               }
+       ctx->operation = EVP_PKEY_OP_DERIVE;
+       if (!ctx->pmeth->derive_init)
+               return 1;
+       ret = ctx->pmeth->derive_init(ctx);
+       if (ret <= 0)
+               ctx->operation = EVP_PKEY_OP_UNDEFINED;
+       return ret;
+       }
+
+int EVP_PKEY_derive_set_peer(EVP_PKEY_CTX *ctx, EVP_PKEY *peer)
+       {
+       int ret;
+       if (!ctx || !ctx->pmeth || !ctx->pmeth->derive || !ctx->pmeth->ctrl)
+               {
+               EVPerr(EVP_F_EVP_PKEY_DERIVE_SET_PEER,
+                       EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE);
+               return -2;
+               }
+       if (ctx->operation != EVP_PKEY_OP_DERIVE)
+               {
+               EVPerr(EVP_F_EVP_PKEY_DERIVE_SET_PEER,
+                                       EVP_R_OPERATON_NOT_INITIALIZED);
+               return -1;
+               }
+
+       ret = ctx->pmeth->ctrl(ctx, EVP_PKEY_CTRL_PEER_KEY, 0, peer);
+
+       if (ret <= 0)
+               return ret;
+
+       if (ret == 2)
+               return 1;
+
+       if (!ctx->pkey)
+               {
+               EVPerr(EVP_F_EVP_PKEY_DERIVE_SET_PEER, EVP_R_NO_KEY_SET);
+               return -1;
+               }
+
+       if (ctx->pkey->type != peer->type)
+               {
+               EVPerr(EVP_F_EVP_PKEY_DERIVE_SET_PEER,
+                                               EVP_R_DIFFERENT_KEY_TYPES);
+               return -1;
+               }
+
+       if (!EVP_PKEY_missing_parameters(peer) &&
+               !EVP_PKEY_cmp_parameters(ctx->pkey, peer))
+               {
+               EVPerr(EVP_F_EVP_PKEY_DERIVE_SET_PEER,
+                                               EVP_R_DIFFERENT_PARAMETERS);
+               return -1;
+               }
+
+       ctx->peerkey = peer;
+
+       ret = ctx->pmeth->ctrl(ctx, EVP_PKEY_CTRL_PEER_KEY, 1, peer);
+
+       if (ret <= 0)
+               {
+               ctx->peerkey = NULL;
+               return ret;
+               }
+
+       CRYPTO_add(&peer->references,1,CRYPTO_LOCK_EVP_PKEY);
+       return 1;
+       }
+
+
+int EVP_PKEY_derive(EVP_PKEY_CTX *ctx, unsigned char *key, int *pkeylen)
+       {
+       if (!ctx || !ctx->pmeth || !ctx->pmeth->derive)
+               {
+               EVPerr(EVP_F_EVP_PKEY_DERIVE,
+                       EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE);
+               return -2;
+               }
+       if (ctx->operation != EVP_PKEY_OP_DERIVE)
+               {
+               EVPerr(EVP_F_EVP_PKEY_DERIVE, EVP_R_OPERATON_NOT_INITIALIZED);
+               return -1;
+               }
+       M_check_autoarg(ctx, key, pkeylen, EVP_F_EVP_PKEY_DERIVE)
+       return ctx->pmeth->derive(ctx, key, pkeylen);
+       }
+