Commit 33eab3f6 authored by Kurt Roeckx's avatar Kurt Roeckx
Browse files

Replace GOST_R_MALLOC_FAILURE and GOST_R_NO_MEMORY with ERR_R_MALLOC_FAILURE 



Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
parent f6fa7c53

engines/ccgost/e_gost_err.c

+0 −2
Original line number Diff line number Diff line
@@ -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"},

engines/ccgost/e_gost_err.h

+0 −2
Original line number Diff line number Diff line
@@ -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

engines/ccgost/gost2001.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

engines/ccgost/gost94_keyx.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

engines/ccgost/gost_crypt.c

+4 −4
Original line number Diff line number Diff line
@@ -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);