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 9a79a374e28101fefa9482f4e692589ddf40d9d6..c0c05769c916df610ace9a0389d083e26af4815a 100644 (file)
--- 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 6049e300a37898f6057bb465e104a8a8054461ed..3f17d90ac6556fce89348a39f1353ff2626c987a 100644 (file)
--- 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 dacd82d2b92aad29a3088e354b32fe5c3627ad6d..e8bbfdfc061ce734bed038823a3576c956a6279b 100644 (file)
--- 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 0d7d3ffe6aa7484a03a2965c99828b97e6b63f7b..d48e21ae7ccb7dfb700f10060e5986e8eba8af51 100644 (file)
--- 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 15ab02aabb79135eddcc0f181dffce9140b0c954..e640414ae3585e2e71bf50d185fb7c9f5613ff5a 100644 (file)
--- 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 4095654358fac8537db90b956effe9bbeed0a716..c0224fd3fb8f92e48dde093fc01470697364ea29 100644 (file)
--- 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);