From: Kurt Roeckx <kurt@roeckx.be>
Date: Thu, 4 Dec 2014 17:34:29 +0000 (+0100)
Subject: Replace GOST_R_MALLOC_FAILURE and GOST_R_NO_MEMORY with ERR_R_MALLOC_FAILURE
X-Git-Tag: master-pre-reformat~175
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=33eab3f6af51c6d7fe68ee4960930df4f1616bd5;p=openssl

Replace GOST_R_MALLOC_FAILURE and GOST_R_NO_MEMORY with ERR_R_MALLOC_FAILURE

Reviewed-by: Richard Levitte <levitte@openssl.org>
---

diff --git a/engines/ccgost/e_gost_err.c b/engines/ccgost/e_gost_err.c
index 9a79a374e2..c0c05769c9 100644
--- a/engines/ccgost/e_gost_err.c
+++ b/engines/ccgost/e_gost_err.c
@@ -137,8 +137,6 @@ static ERR_STRING_DATA GOST_str_reasons[]=
 {ERR_REASON(GOST_R_KEY_IS_NOT_INITIALIZED),"key is not initialized"},
 {ERR_REASON(GOST_R_KEY_PARAMETERS_MISSING),"key parameters missing"},
 {ERR_REASON(GOST_R_MAC_KEY_NOT_SET)      ,"mac key not set"},
-{ERR_REASON(GOST_R_MALLOC_FAILURE)       ,"malloc failure"},
-{ERR_REASON(GOST_R_NO_MEMORY)            ,"no memory"},
 {ERR_REASON(GOST_R_NO_PARAMETERS_SET)    ,"no parameters set"},
 {ERR_REASON(GOST_R_NO_PEER_KEY)          ,"no peer key"},
 {ERR_REASON(GOST_R_NO_PRIVATE_PART_OF_NON_EPHEMERAL_KEYPAIR),"no private part of non ephemeral keypair"},
diff --git a/engines/ccgost/e_gost_err.h b/engines/ccgost/e_gost_err.h
index 6049e300a3..3f17d90ac6 100644
--- a/engines/ccgost/e_gost_err.h
+++ b/engines/ccgost/e_gost_err.h
@@ -136,8 +136,6 @@ void ERR_GOST_error(int function, int reason, char *file, int line);
 #define GOST_R_KEY_IS_NOT_INITIALIZED			 114
 #define GOST_R_KEY_PARAMETERS_MISSING			 115
 #define GOST_R_MAC_KEY_NOT_SET				 116
-#define GOST_R_MALLOC_FAILURE				 117
-#define GOST_R_NO_MEMORY				 118
 #define GOST_R_NO_PARAMETERS_SET			 119
 #define GOST_R_NO_PEER_KEY				 120
 #define GOST_R_NO_PRIVATE_PART_OF_NON_EPHEMERAL_KEYPAIR	 121
diff --git a/engines/ccgost/gost2001.c b/engines/ccgost/gost2001.c
index dacd82d2b9..e8bbfdfc06 100644
--- a/engines/ccgost/gost2001.c
+++ b/engines/ccgost/gost2001.c
@@ -106,7 +106,7 @@ DSA_SIG *gost2001_do_sign(const unsigned char *dgst,int dlen, EC_KEY *eckey)
 	newsig=DSA_SIG_new();
 	if (!newsig) 
 		{
-		GOSTerr(GOST_F_GOST2001_DO_SIGN,GOST_R_NO_MEMORY);
+		GOSTerr(GOST_F_GOST2001_DO_SIGN,ERR_R_MALLOC_FAILURE);
 		goto err;
 		}	
 	group = EC_KEY_get0_group(eckey);
diff --git a/engines/ccgost/gost94_keyx.c b/engines/ccgost/gost94_keyx.c
index 0d7d3ffe6a..d48e21ae7c 100644
--- a/engines/ccgost/gost94_keyx.c
+++ b/engines/ccgost/gost94_keyx.c
@@ -199,7 +199,7 @@ int pkey_GOST94cp_encrypt(EVP_PKEY_CTX *ctx, unsigned char *out, size_t *outlen,
 			EVP_PKEY_free(mykey);
 		}	
 	GOSTerr(GOST_F_PKEY_GOST94CP_ENCRYPT,
-		GOST_R_MALLOC_FAILURE);
+		ERR_R_MALLOC_FAILURE);
 	err:		
 	GOST_KEY_TRANSPORT_free(gkt);
 	return -1;
diff --git a/engines/ccgost/gost_crypt.c b/engines/ccgost/gost_crypt.c
index 15ab02aabb..e640414ae3 100644
--- a/engines/ccgost/gost_crypt.c
+++ b/engines/ccgost/gost_crypt.c
@@ -426,13 +426,13 @@ int gost89_set_asn1_parameters(EVP_CIPHER_CTX *ctx,ASN1_TYPE *params)
 	ASN1_OCTET_STRING *os = NULL;
 	if (!gcp)
 		{
-		GOSTerr(GOST_F_GOST89_SET_ASN1_PARAMETERS, GOST_R_NO_MEMORY);
+		GOSTerr(GOST_F_GOST89_SET_ASN1_PARAMETERS, ERR_R_MALLOC_FAILURE);
 		return 0;
 		}
 	if (!ASN1_OCTET_STRING_set(gcp->iv, ctx->iv, ctx->cipher->iv_len))
 		{
 		GOST_CIPHER_PARAMS_free(gcp);
-		GOSTerr(GOST_F_GOST89_SET_ASN1_PARAMETERS, GOST_R_NO_MEMORY);
+		GOSTerr(GOST_F_GOST89_SET_ASN1_PARAMETERS, ERR_R_MALLOC_FAILURE);
 		return 0;
 		}
 	ASN1_OBJECT_free(gcp->enc_param_set);
@@ -443,7 +443,7 @@ int gost89_set_asn1_parameters(EVP_CIPHER_CTX *ctx,ASN1_TYPE *params)
 	if (!buf)
 		{
 		GOST_CIPHER_PARAMS_free(gcp);
-		GOSTerr(GOST_F_GOST89_SET_ASN1_PARAMETERS, GOST_R_NO_MEMORY);
+		GOSTerr(GOST_F_GOST89_SET_ASN1_PARAMETERS, ERR_R_MALLOC_FAILURE);
 		return 0;
 		}
 	i2d_GOST_CIPHER_PARAMS(gcp, &p);
@@ -454,7 +454,7 @@ int gost89_set_asn1_parameters(EVP_CIPHER_CTX *ctx,ASN1_TYPE *params)
 	if(!os || !ASN1_OCTET_STRING_set(os, buf, len))
 		{
 		OPENSSL_free(buf);
-		GOSTerr(GOST_F_GOST89_SET_ASN1_PARAMETERS, GOST_R_NO_MEMORY);
+		GOSTerr(GOST_F_GOST89_SET_ASN1_PARAMETERS, ERR_R_MALLOC_FAILURE);
 		return 0;
 		}
 	OPENSSL_free(buf);
diff --git a/engines/ccgost/gost_sign.c b/engines/ccgost/gost_sign.c
index 4095654358..c0224fd3fb 100644
--- a/engines/ccgost/gost_sign.c
+++ b/engines/ccgost/gost_sign.c
@@ -58,7 +58,7 @@ DSA_SIG *gost_do_sign(const unsigned char *dgst,int dlen, DSA *dsa)
 	BN_CTX_start(ctx);
 	if (!newsig)
 		{
-		GOSTerr(GOST_F_GOST_DO_SIGN,GOST_R_NO_MEMORY);
+		GOSTerr(GOST_F_GOST_DO_SIGN,ERR_R_MALLOC_FAILURE);
 		goto err;
 		}	
 	tmp=BN_CTX_get(ctx);
@@ -254,7 +254,7 @@ DSA_SIG *unpack_cc_signature(const unsigned char *sig,size_t siglen)
 	s = DSA_SIG_new();
 	if (s == NULL)
 		{
-		GOSTerr(GOST_F_UNPACK_CC_SIGNATURE,GOST_R_NO_MEMORY);
+		GOSTerr(GOST_F_UNPACK_CC_SIGNATURE,ERR_R_MALLOC_FAILURE);
 		return(NULL);
 		}
 	s->r = getbnfrombuf(sig, siglen/2);
@@ -270,7 +270,7 @@ DSA_SIG *unpack_cp_signature(const unsigned char *sig,size_t siglen)
 	s = DSA_SIG_new();
 	if (s == NULL)
 		{
-		GOSTerr(GOST_F_UNPACK_CP_SIGNATURE,GOST_R_NO_MEMORY);
+		GOSTerr(GOST_F_UNPACK_CP_SIGNATURE,ERR_R_MALLOC_FAILURE);
 		return NULL;
 		}
 	s->s = getbnfrombuf(sig , siglen/2);