Commit f90bc6c5 authored by Rich Salz's avatar Rich Salz
Browse files

Add missing malloc-return-null instance 



Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6071)
parent 208056b2

crypto/err/openssl.txt

+1 −0
Original line number Diff line number Diff line
@@ -1696,6 +1696,7 @@ X509_F_X509_TO_X509_REQ:126:X509_to_X509_REQ 
X509_F_X509_TRUST_ADD:133:X509_TRUST_add

X509_F_X509_TRUST_SET:141:X509_TRUST_set

X509_F_X509_VERIFY_CERT:127:X509_verify_cert

X509_F_X509_VERIFY_PARAM_NEW:159:X509_VERIFY_PARAM_new



#Reason codes

ASN1_R_ADDING_OBJECT:171:adding object

crypto/x509/x509_err.c

+2 −0
Original line number Diff line number Diff line
@@ -103,6 +103,8 @@ static const ERR_STRING_DATA X509_str_functs[] = { 
    {ERR_PACK(ERR_LIB_X509, X509_F_X509_TRUST_ADD, 0), "X509_TRUST_add"},

    {ERR_PACK(ERR_LIB_X509, X509_F_X509_TRUST_SET, 0), "X509_TRUST_set"},

    {ERR_PACK(ERR_LIB_X509, X509_F_X509_VERIFY_CERT, 0), "X509_verify_cert"},

    {ERR_PACK(ERR_LIB_X509, X509_F_X509_VERIFY_PARAM_NEW, 0),

     "X509_VERIFY_PARAM_new"},

    {0, NULL}

};

crypto/x509/x509_vpm.c

+4 −5
Original line number Diff line number Diff line
@@ -84,13 +84,12 @@ X509_VERIFY_PARAM *X509_VERIFY_PARAM_new(void) 
    X509_VERIFY_PARAM *param;



    param = OPENSSL_zalloc(sizeof(*param));

    if (param == NULL)

    if (param == NULL) {

        X509err(X509_F_X509_VERIFY_PARAM_NEW, ERR_R_MALLOC_FAILURE);

        return NULL;

    }

    param->trust = X509_TRUST_DEFAULT;

    /*

     * param->inh_flags = X509_VP_FLAG_DEFAULT;

     */

    param->inh_flags = 0;

    /* param->inh_flags = X509_VP_FLAG_DEFAULT; */

    param->depth = -1;

    param->auth_level = -1; /* -1 means unset, 0 is explicit */

    return param;

include/openssl/x509err.h

+1 −0
Original line number Diff line number Diff line
@@ -78,6 +78,7 @@ int ERR_load_X509_strings(void); 
# define X509_F_X509_TRUST_ADD                            133

# define X509_F_X509_TRUST_SET                            141

# define X509_F_X509_VERIFY_CERT                          127

# define X509_F_X509_VERIFY_PARAM_NEW                     159



/*

 * X509 reason codes.