crypto/ecp_nistz256.c: harmonize error codes.

[oweals/openssl.git] / crypto / ec / ec_pmeth.c

diff --git a/crypto/ec/ec_pmeth.c b/crypto/ec/ec_pmeth.c
index 689a1734680aa7693207828a5bf9c2d12cd5ee3a..81ad4d499a1276651d4d66e8e4cced8d84d98b3f 100644 (file)
--- a/crypto/ec/ec_pmeth.c
+++ b/crypto/ec/ec_pmeth.c
@@ -76,7 +76,7 @@ typedef struct
        /* Duplicate key if custom cofactor needed */
        EC_KEY *co_key;
        /* Cofactor mode */
-       char cofactor_mode;
+       signed char cofactor_mode;
        /* KDF (if any) to use for ECDH */
        char kdf_type;
        /* Message digest to use for key derivation */
@@ -319,7 +319,7 @@ static int pkey_ec_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2)
                case EVP_PKEY_CTRL_EC_ECDH_COFACTOR:
                if (p1 == -2)
                        {
-                       if (dctx->co_key)
+                       if (dctx->cofactor_mode != -1)
                                return dctx->cofactor_mode;
                        else
                                {
@@ -459,6 +459,22 @@ static int pkey_ec_ctrl_str(EVP_PKEY_CTX *ctx,
                        return -2;
                return EVP_PKEY_CTX_set_ec_param_enc(ctx, param_enc);
                }
+       else if (!strcmp(type, "ecdh_kdf_md"))
+               {
+               const EVP_MD *md;
+               if (!(md = EVP_get_digestbyname(value)))
+                       {
+                       ECerr(EC_F_PKEY_EC_CTRL_STR, EC_R_INVALID_DIGEST);
+                       return 0;
+                       }
+               return EVP_PKEY_CTX_set_ecdh_kdf_md(ctx, md);
+               }
+       else if (!strcmp(type, "ecdh_cofactor_mode"))
+               {
+               int co_mode;
+               co_mode = atoi(value);
+               return EVP_PKEY_CTX_set_ecdh_cofactor_mode(ctx, co_mode);
+               }
                        
        return -2;
        }