Check GOST parameters are not NULL (CVE-2012-0027)

[oweals/openssl.git] / engines / ccgost / gost_ameth.c

diff --git a/engines/ccgost/gost_ameth.c b/engines/ccgost/gost_ameth.c
index 7b3ba5048b4b2667374c5044eb481d79e2244556..e6c2839e5fac63e35bb390c9341f8813432afdcb 100644 (file)
--- a/engines/ccgost/gost_ameth.c
+++ b/engines/ccgost/gost_ameth.c
@@ -39,7 +39,7 @@ static ASN1_STRING  *encode_gost_algor_params(const EVP_PKEY *key)
        ASN1_STRING *params = ASN1_STRING_new();
        GOST_KEY_PARAMS *gkp = GOST_KEY_PARAMS_new();
        int pkey_param_nid = NID_undef;
-       int cipher_param_nid = NID_undef;
+
        if (!params || !gkp) 
                {
                GOSTerr(GOST_F_ENCODE_GOST_ALGOR_PARAMS,
@@ -52,7 +52,6 @@ static ASN1_STRING  *encode_gost_algor_params(const EVP_PKEY *key)
                {
                case NID_id_GostR3410_2001:
                        pkey_param_nid = EC_GROUP_get_curve_name(EC_KEY_get0_group(EVP_PKEY_get0((EVP_PKEY *)key)));
-                       cipher_param_nid = get_encryption_params(NULL)->nid;
                        break;
                case NID_id_GostR3410_94:
                        pkey_param_nid = (int) gost94_nid_by_params(EVP_PKEY_get0((EVP_PKEY *)key));
@@ -64,7 +63,6 @@ static ASN1_STRING  *encode_gost_algor_params(const EVP_PKEY *key)
                                params=NULL;
                                goto err;
                                }       
-                       cipher_param_nid = get_encryption_params(NULL)->nid;
                        break;
                }       
        gkp->key_params = OBJ_nid2obj(pkey_param_nid);
@@ -801,24 +799,24 @@ static int mac_ctrl_gost(EVP_PKEY *pkey, int op, long arg1, void *arg2)
        switch (op)
                {
                case ASN1_PKEY_CTRL_DEFAULT_MD_NID:
-                       *(int *)arg2 = NID_undef;
+                       *(int *)arg2 = NID_id_Gost28147_89_MAC;
                        return 2;
                }
        return -2;
 }      
 
-int gost94_param_encode(const EVP_PKEY *pkey, unsigned char **pder) 
+static int gost94_param_encode(const EVP_PKEY *pkey, unsigned char **pder) 
 {
    int nid=gost94_nid_by_params(EVP_PKEY_get0((EVP_PKEY *)pkey));
    return i2d_ASN1_OBJECT(OBJ_nid2obj(nid),pder);
 }
-int gost2001_param_encode(const EVP_PKEY *pkey, unsigned char **pder) 
+static int gost2001_param_encode(const EVP_PKEY *pkey, unsigned char **pder) 
 {
    int nid = EC_GROUP_get_curve_name(EC_KEY_get0_group(EVP_PKEY_get0((EVP_PKEY *)pkey)));
    return i2d_ASN1_OBJECT(OBJ_nid2obj(nid),pder);
 }
 
-int gost94_param_decode(EVP_PKEY *pkey, const unsigned char **pder, int derlen)
+static int gost94_param_decode(EVP_PKEY *pkey, const unsigned char **pder, int derlen)
 {
        ASN1_OBJECT *obj=NULL;
        DSA *dsa = EVP_PKEY_get0(pkey);
@@ -837,7 +835,7 @@ int gost94_param_decode(EVP_PKEY *pkey, const unsigned char **pder, int derlen)
        return 1;
 }      
 
-int gost2001_param_decode(EVP_PKEY *pkey, const unsigned char **pder, int derlen) {
+static int gost2001_param_decode(EVP_PKEY *pkey, const unsigned char **pder, int derlen) {
        ASN1_OBJECT *obj=NULL;
        int nid;
        EC_KEY *ec = EVP_PKEY_get0(pkey);