projects / openssl.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Add control to retrieve signature MD.
[openssl.git] / engines / ccgost / gost_pmeth.c
diff --git a/engines/ccgost/gost_pmeth.c b/engines/ccgost/gost_pmeth.c
index 996beaf4b640ceb6c75a23bad488c51cb45220b2..3189798cf4b64337760fa248729ea8f98be66e27 100644 (file)
--- a/engines/ccgost/gost_pmeth.c
+++ b/engines/ccgost/gost_pmeth.c
@@ -22,9 +22,23 @@
 static int pkey_gost_init(EVP_PKEY_CTX *ctx)
        {
        struct gost_pmeth_data *data;
+       EVP_PKEY *pkey = EVP_PKEY_CTX_get0_pkey(ctx);
        data = OPENSSL_malloc(sizeof(struct gost_pmeth_data));
        if (!data) return 0;
        memset(data,0,sizeof(struct gost_pmeth_data));
+       if (pkey && EVP_PKEY_get0(pkey)) 
+               {
+               switch (EVP_PKEY_base_id(pkey)) {
+               case NID_id_GostR3410_94:
+                 data->sign_param_nid = gost94_nid_by_params(EVP_PKEY_get0(pkey));
+                 break;
+               case NID_id_GostR3410_2001:
+                  data->sign_param_nid = EC_GROUP_get_curve_name(EC_KEY_get0_group(EVP_PKEY_get0((EVP_PKEY *)pkey)));
+               break;
+               default:
+                       return 0;
+               }         
+               }
        EVP_PKEY_CTX_set_data(ctx,data);
        return 1;
        }
@@ -72,9 +86,19 @@ static int pkey_gost_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2)
                }
                break;
 
+               case EVP_PKEY_CTRL_GET_MD:
+               *(const EVP_MD **)p2 = pctx->md;
+               return 1;
+
                case EVP_PKEY_CTRL_PKCS7_ENCRYPT:
                case EVP_PKEY_CTRL_PKCS7_DECRYPT:
                case EVP_PKEY_CTRL_PKCS7_SIGN:
+               case EVP_PKEY_CTRL_DIGESTINIT:
+#ifndef OPENSSL_NO_CMS         
+               case EVP_PKEY_CTRL_CMS_ENCRYPT:
+               case EVP_PKEY_CTRL_CMS_DECRYPT:
+               case EVP_PKEY_CTRL_CMS_SIGN:
+#endif         
                        return 1;
 
                case EVP_PKEY_CTRL_GOST_PARAMSET:
@@ -84,7 +108,14 @@ static int pkey_gost_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2)
                        pctx->shared_ukm=OPENSSL_malloc((int)p1);
                        memcpy(pctx->shared_ukm,p2,(int) p1);
                        return 1;
-                       
+               case EVP_PKEY_CTRL_PEER_KEY:
+                       if (p1 == 0 || p1 == 1) /* call from EVP_PKEY_derive_set_peer */
+                               return 1;
+                       if (p1 == 2)            /* TLS: peer key used? */
+                               return pctx->peer_key_used;
+                       if (p1 == 3)            /* TLS: peer key used! */
+                               return (pctx->peer_key_used = 1);
+                       return -2;
                }
        return -2;
        }
@@ -102,7 +133,7 @@ static int pkey_gost_ctrl94_str(EVP_PKEY_CTX *ctx,
                        }
                if (strlen(value) == 1)
                        {
-                       switch(toupper(value[0]))
+                       switch(toupper((unsigned char)value[0]))
                                {
                                case 'A':
                                        param_nid = NID_id_GostR3410_94_CryptoPro_A_ParamSet;
@@ -121,9 +152,9 @@ static int pkey_gost_ctrl94_str(EVP_PKEY_CTX *ctx,
                                        break;
                                }
                        }
-               else if ((strlen(value) == 2) && (toupper(value[0]) == 'X'))
+               else if ((strlen(value) == 2) && (toupper((unsigned char)value[0]) == 'X'))
                        {
-                       switch (toupper(value[1]))
+                       switch (toupper((unsigned char)value[1]))
                                {
                                case 'A':
                                        param_nid = NID_id_GostR3410_94_CryptoPro_XchA_ParamSet;
@@ -177,7 +208,7 @@ static int pkey_gost_ctrl01_str(EVP_PKEY_CTX *ctx,
                        }
                if (strlen(value) == 1)
                        {
-                       switch(toupper(value[0]))
+                       switch(toupper((unsigned char)value[0]))
                                {
                                case 'A':
                                        param_nid = NID_id_GostR3410_2001_CryptoPro_A_ParamSet;
@@ -196,9 +227,9 @@ static int pkey_gost_ctrl01_str(EVP_PKEY_CTX *ctx,
                                        break;
                                }
                        }
-               else if ((strlen(value) == 2) && (toupper(value[0]) == 'X'))
+               else if ((strlen(value) == 2) && (toupper((unsigned char)value[0]) == 'X'))
                        {
-                       switch (toupper(value[1]))
+                       switch (toupper((unsigned char)value[1]))
                                {
                                case 'A':
                                        param_nid = NID_id_GostR3410_2001_CryptoPro_XchA_ParamSet;
@@ -239,15 +270,16 @@ static int pkey_gost_ctrl01_str(EVP_PKEY_CTX *ctx,
 
 /* --------------------- key generation  --------------------------------*/
 
-
-/* Generates Gost_R3410_94_cp key */
-static int pkey_gost94cp_keygen(EVP_PKEY_CTX *ctx, EVP_PKEY *pkey)
+static int pkey_gost_paramgen_init(EVP_PKEY_CTX *ctx) {
+       return 1;
+}      
+static int pkey_gost94_paramgen(EVP_PKEY_CTX *ctx, EVP_PKEY *pkey) 
        {
        struct gost_pmeth_data *data = EVP_PKEY_CTX_get_data(ctx);
        DSA *dsa=NULL;
        if (data->sign_param_nid == NID_undef)
                {
-                       GOSTerr(GOST_F_PKEY_GOST94CP_KEYGEN,
+                       GOSTerr(GOST_F_PKEY_GOST94_PARAMGEN,
                                GOST_R_NO_PARAMETERS_SET);
                        return 0;
                }
@@ -257,34 +289,51 @@ static int pkey_gost94cp_keygen(EVP_PKEY_CTX *ctx, EVP_PKEY *pkey)
                DSA_free(dsa);
                return 0;
                }
-       gost_sign_keygen(dsa);
        EVP_PKEY_assign(pkey,NID_id_GostR3410_94,dsa);
        return 1;
        }
-
-/* Generates GOST_R3410 2001 key and assigns it using specified type */
-static int pkey_gost01cp_keygen(EVP_PKEY_CTX *ctx, EVP_PKEY *pkey)
+static int pkey_gost01_paramgen(EVP_PKEY_CTX *ctx, EVP_PKEY *pkey)
        {
        struct gost_pmeth_data *data = EVP_PKEY_CTX_get_data(ctx);
        EC_KEY *ec=NULL;
+
        if (data->sign_param_nid == NID_undef)
                {
-                       GOSTerr(GOST_F_PKEY_GOST01CP_KEYGEN,
+                       GOSTerr(GOST_F_PKEY_GOST01_PARAMGEN,
                                GOST_R_NO_PARAMETERS_SET);
                        return 0;
                }
-       ec = EC_KEY_new();
+       if (!ec)        
+               ec = EC_KEY_new();
        if (!fill_GOST2001_params(ec,data->sign_param_nid))
                {
                EC_KEY_free(ec);
                return 0;
                }
-       gost2001_keygen(ec);
-
        EVP_PKEY_assign(pkey,NID_id_GostR3410_2001,ec);
        return 1;
        }
 
+/* Generates Gost_R3410_94_cp key */
+static int pkey_gost94cp_keygen(EVP_PKEY_CTX *ctx, EVP_PKEY *pkey)
+       {
+       DSA *dsa;
+       if (!pkey_gost94_paramgen(ctx,pkey)) return 0;
+       dsa = EVP_PKEY_get0(pkey);
+       gost_sign_keygen(dsa);
+       return 1;
+       }
+
+/* Generates GOST_R3410 2001 key and assigns it using specified type */
+static int pkey_gost01cp_keygen(EVP_PKEY_CTX *ctx, EVP_PKEY *pkey)
+       {
+       EC_KEY *ec;
+    if (!pkey_gost01_paramgen(ctx,pkey)) return 0;
+       ec = EVP_PKEY_get0(pkey);
+       gost2001_keygen(ec);
+       return 1;
+       }
+
 
 
 /* ----------- sign callbacks --------------------------------------*/
@@ -419,6 +468,10 @@ static int pkey_gost_mac_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2)
                }
                break;
 
+               case EVP_PKEY_CTRL_GET_MD:
+               *(const EVP_MD **)p2 = data->md;
+               return 1;
+
                case EVP_PKEY_CTRL_PKCS7_ENCRYPT:
                case EVP_PKEY_CTRL_PKCS7_DECRYPT:
                case EVP_PKEY_CTRL_PKCS7_SIGN:
@@ -482,6 +535,7 @@ static int pkey_gost_mac_ctrl_str(EVP_PKEY_CTX *ctx,
                                {
                                GOSTerr(GOST_F_PKEY_GOST_MAC_CTRL_STR,
                                        GOST_R_INVALID_MAC_KEY_LENGTH);
+                               OPENSSL_free(keybuf);
                                return 0;       
                                }
                        ret= pkey_gost_mac_ctrl(ctx, EVP_PKEY_CTRL_SET_MAC_KEY,
@@ -544,6 +598,7 @@ int register_pmeth_gost(int id, EVP_PKEY_METHOD **pmeth,int flags)
                        EVP_PKEY_meth_set_decrypt(*pmeth, NULL, pkey_GOST94cp_decrypt);
                        EVP_PKEY_meth_set_derive(*pmeth,
                                pkey_gost_derive_init, pkey_gost94_derive);
+                       EVP_PKEY_meth_set_paramgen(*pmeth, pkey_gost_paramgen_init,pkey_gost94_paramgen);       
                        break;
                case NID_id_GostR3410_2001:
                        EVP_PKEY_meth_set_ctrl(*pmeth,pkey_gost_ctrl, pkey_gost_ctrl01_str);
@@ -557,6 +612,7 @@ int register_pmeth_gost(int id, EVP_PKEY_METHOD **pmeth,int flags)
                        EVP_PKEY_meth_set_decrypt(*pmeth, NULL, pkey_GOST01cp_decrypt);
                        EVP_PKEY_meth_set_derive(*pmeth,
                                pkey_gost_derive_init, pkey_gost2001_derive);
+                       EVP_PKEY_meth_set_paramgen(*pmeth, pkey_gost_paramgen_init,pkey_gost01_paramgen);       
                        break;
                case NID_id_Gost28147_89_MAC:
                        EVP_PKEY_meth_set_ctrl(*pmeth,pkey_gost_mac_ctrl, pkey_gost_mac_ctrl_str);
Unnamed repository; edit this file 'description' to name the repository.