Commit 569d0646 authored by Matt Caswell's avatar Matt Caswell
Browse files

Add some error messages for malloc fails 



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

crypto/dh/dh_err.c

+3 −0
Original line number Diff line number Diff line
@@ -30,6 +30,9 @@ static ERR_STRING_DATA DH_str_functs[] = { 
    {ERR_FUNC(DH_F_DH_CMS_DECRYPT), "dh_cms_decrypt"},

    {ERR_FUNC(DH_F_DH_CMS_SET_PEERKEY), "dh_cms_set_peerkey"},

    {ERR_FUNC(DH_F_DH_CMS_SET_SHARED_INFO), "dh_cms_set_shared_info"},

    {ERR_FUNC(DH_F_DH_METH_DUP), "DH_meth_dup"},

    {ERR_FUNC(DH_F_DH_METH_NEW), "DH_meth_new"},

    {ERR_FUNC(DH_F_DH_METH_SET1_NAME), "DH_meth_set1_name"},

    {ERR_FUNC(DH_F_DH_NEW_METHOD), "DH_new_method"},

    {ERR_FUNC(DH_F_DH_PARAM_DECODE), "dh_param_decode"},

    {ERR_FUNC(DH_F_DH_PRIV_DECODE), "dh_priv_decode"},

crypto/dh/dh_meth.c

+6 −1
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 


#include "dh_locl.h"

#include <string.h>

#include <openssl/err.h>



DH_METHOD *DH_meth_new(const char *name, int flags)

{
@@ -18,6 +19,7 @@ DH_METHOD *DH_meth_new(const char *name, int flags) 
        dhm->name = OPENSSL_strdup(name);

        if (dhm->name == NULL) {

            OPENSSL_free(dhm);

            DHerr(DH_F_DH_METH_NEW, ERR_R_MALLOC_FAILURE);

            return NULL;

        }

        dhm->flags = flags;
@@ -46,6 +48,7 @@ DH_METHOD *DH_meth_dup(const DH_METHOD *dhm) 
        ret->name = OPENSSL_strdup(dhm->name);

        if (ret->name == NULL) {

            OPENSSL_free(ret);

            DHerr(DH_F_DH_METH_DUP, ERR_R_MALLOC_FAILURE);

            return NULL;

        }

    }
@@ -63,8 +66,10 @@ int DH_meth_set1_name(DH_METHOD *dhm, const char *name) 
    char *tmpname;



    tmpname = OPENSSL_strdup(name);

    if (tmpname == NULL)

    if (tmpname == NULL) {

        DHerr(DH_F_DH_METH_SET1_NAME, ERR_R_MALLOC_FAILURE);

        return 0;

    }



    OPENSSL_free(dhm->name);

    dhm->name = tmpname;

crypto/dsa/dsa_err.c

+3 −0
Original line number Diff line number Diff line
@@ -33,6 +33,9 @@ static ERR_STRING_DATA DSA_str_functs[] = { 
    {ERR_FUNC(DSA_F_DSA_BUILTIN_PARAMGEN2), "dsa_builtin_paramgen2"},

    {ERR_FUNC(DSA_F_DSA_DO_SIGN), "DSA_do_sign"},

    {ERR_FUNC(DSA_F_DSA_DO_VERIFY), "DSA_do_verify"},

    {ERR_FUNC(DSA_F_DSA_METH_DUP), "DSA_meth_dup"},

    {ERR_FUNC(DSA_F_DSA_METH_NEW), "DSA_meth_new"},

    {ERR_FUNC(DSA_F_DSA_METH_SET1_NAME), "DSA_meth_set1_name"},

    {ERR_FUNC(DSA_F_DSA_NEW_METHOD), "DSA_new_method"},

    {ERR_FUNC(DSA_F_DSA_PARAM_DECODE), "dsa_param_decode"},

    {ERR_FUNC(DSA_F_DSA_PRINT_FP), "DSA_print_fp"},

crypto/dsa/dsa_meth.c

+6 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 


#include "dsa_locl.h"

#include <string.h>

#include <openssl/err.h>



DSA_METHOD *DSA_meth_new(const char *name, int flags)

{
@@ -26,6 +27,7 @@ DSA_METHOD *DSA_meth_new(const char *name, int flags) 
        dsam->name = OPENSSL_strdup(name);

        if (dsam->name == NULL) {

            OPENSSL_free(dsam);

            DSAerr(DSA_F_DSA_METH_NEW, ERR_R_MALLOC_FAILURE);

            return NULL;

        }

        dsam->flags = flags;
@@ -54,6 +56,7 @@ DSA_METHOD *DSA_meth_dup(const DSA_METHOD *dsam) 
        ret->name = OPENSSL_strdup(dsam->name);

        if (ret->name == NULL) {

            OPENSSL_free(ret);

            DSAerr(DSA_F_DSA_METH_DUP, ERR_R_MALLOC_FAILURE);

            return NULL;

        }

    }
@@ -71,8 +74,10 @@ int DSA_meth_set1_name(DSA_METHOD *dsam, const char *name) 
    char *tmpname;



    tmpname = OPENSSL_strdup(name);

    if (tmpname == NULL)

    if (tmpname == NULL) {

        DSAerr(DSA_F_DSA_METH_SET1_NAME, ERR_R_MALLOC_FAILURE);

        return 0;

    }



    OPENSSL_free(dsam->name);

    dsam->name = tmpname;

crypto/rsa/rsa_err.c

+7 −4
Original line number Diff line number Diff line
@@ -41,13 +41,12 @@ static ERR_STRING_DATA RSA_str_functs[] = { 
    {ERR_FUNC(RSA_F_RSA_CHECK_KEY), "RSA_check_key"},

    {ERR_FUNC(RSA_F_RSA_CHECK_KEY_EX), "RSA_check_key_ex"},

    {ERR_FUNC(RSA_F_RSA_CMS_DECRYPT), "rsa_cms_decrypt"},

    {ERR_FUNC(RSA_F_RSA_OSSL_PRIVATE_DECRYPT), "rsa_ossl_private_decrypt"},

    {ERR_FUNC(RSA_F_RSA_OSSL_PRIVATE_ENCRYPT), "rsa_ossl_private_encrypt"},

    {ERR_FUNC(RSA_F_RSA_OSSL_PUBLIC_DECRYPT), "rsa_ossl_public_decrypt"},

    {ERR_FUNC(RSA_F_RSA_OSSL_PUBLIC_ENCRYPT), "rsa_ossl_public_encrypt"},

    {ERR_FUNC(RSA_F_RSA_GENERATE_KEY), "RSA_generate_key"},

    {ERR_FUNC(RSA_F_RSA_ITEM_VERIFY), "rsa_item_verify"},

    {ERR_FUNC(RSA_F_RSA_MEMORY_LOCK), "RSA_memory_lock"},

    {ERR_FUNC(RSA_F_RSA_METH_DUP), "RSA_meth_dup"},

    {ERR_FUNC(RSA_F_RSA_METH_NEW), "RSA_meth_new"},

    {ERR_FUNC(RSA_F_RSA_METH_SET1_NAME), "RSA_meth_set1_name"},

    {ERR_FUNC(RSA_F_RSA_MGF1_TO_MD), "rsa_mgf1_to_md"},

    {ERR_FUNC(RSA_F_RSA_NEW_METHOD), "RSA_new_method"},

    {ERR_FUNC(RSA_F_RSA_NULL), "RSA_NULL"},
@@ -57,6 +56,10 @@ static ERR_STRING_DATA RSA_str_functs[] = { 
    {ERR_FUNC(RSA_F_RSA_NULL_PUBLIC_DECRYPT), "RSA_null_public_decrypt"},

    {ERR_FUNC(RSA_F_RSA_NULL_PUBLIC_ENCRYPT), "RSA_null_public_encrypt"},

    {ERR_FUNC(RSA_F_RSA_OAEP_TO_CTX), "RSA_OAEP_TO_CTX"},

    {ERR_FUNC(RSA_F_RSA_OSSL_PRIVATE_DECRYPT), "rsa_ossl_private_decrypt"},

    {ERR_FUNC(RSA_F_RSA_OSSL_PRIVATE_ENCRYPT), "rsa_ossl_private_encrypt"},

    {ERR_FUNC(RSA_F_RSA_OSSL_PUBLIC_DECRYPT), "rsa_ossl_public_decrypt"},

    {ERR_FUNC(RSA_F_RSA_OSSL_PUBLIC_ENCRYPT), "rsa_ossl_public_encrypt"},

    {ERR_FUNC(RSA_F_RSA_PADDING_ADD_NONE), "RSA_padding_add_none"},

    {ERR_FUNC(RSA_F_RSA_PADDING_ADD_PKCS1_OAEP), "RSA_padding_add_PKCS1_OAEP"},

    {ERR_FUNC(RSA_F_RSA_PADDING_ADD_PKCS1_OAEP_MGF1),