Commit 2d2fe424 authored by Richard Levitte's avatar Richard Levitte Committed by Matt Caswell
Browse files

i2d_ASN1_BOOLEAN(): correct error module 



Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6957)
parent c24e2f18

crypto/asn1/a_bool.c

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ int i2d_ASN1_BOOLEAN(int a, unsigned char **pp) 


    if (*pp == NULL) {

        if ((p = allocated = OPENSSL_malloc(r)) == NULL) {

            ASN1err(ASN1_F_I2D_ASN1_OBJECT, ERR_R_MALLOC_FAILURE);

            ASN1err(ASN1_F_I2D_ASN1_BOOLEAN, ERR_R_MALLOC_FAILURE);

            return 0;

        }

    } else {

crypto/asn1/asn1.h

+1 −0
Original line number Diff line number Diff line
@@ -1267,6 +1267,7 @@ void ERR_load_ASN1_strings(void); 
# define ASN1_F_D2I_X509_PKEY                             159

# define ASN1_F_DO_BUF                                    221

# define ASN1_F_I2D_ASN1_BIO_STREAM                       211

# define ASN1_F_I2D_ASN1_BOOLEAN                          223

# define ASN1_F_I2D_ASN1_OBJECT                           222

# define ASN1_F_I2D_ASN1_SET                              188

# define ASN1_F_I2D_ASN1_TIME                             160

crypto/asn1/asn1_err.c

+1 −0
Original line number Diff line number Diff line
@@ -168,6 +168,7 @@ static ERR_STRING_DATA ASN1_str_functs[] = { 
    {ERR_FUNC(ASN1_F_D2I_X509_PKEY), "d2i_X509_PKEY"},

    {ERR_FUNC(ASN1_F_DO_BUF), "DO_BUF"},

    {ERR_FUNC(ASN1_F_I2D_ASN1_BIO_STREAM), "i2d_ASN1_bio_stream"},

    {ERR_FUNC(ASN1_F_I2D_ASN1_BOOLEAN), "i2d_ASN1_BOOLEAN"},

    {ERR_FUNC(ASN1_F_I2D_ASN1_OBJECT), "i2d_ASN1_OBJECT"},

    {ERR_FUNC(ASN1_F_I2D_ASN1_SET), "i2d_ASN1_SET"},

    {ERR_FUNC(ASN1_F_I2D_ASN1_TIME), "I2D_ASN1_TIME"},