Commit 13f74c66 authored by FdaSilvaYY's avatar FdaSilvaYY Committed by Rich Salz
Browse files

Constify s2i_ASN1_IA5STRING 



Return directly NULL after ASN1_STRING_set, as it already has set an error code.

Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
Reviewed-by: default avatarKurt Roeckx <kurt@openssl.org>
Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1074)
parent 2b91da96

crypto/x509v3/v3_ia5.c

+3 −4
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ char *i2s_ASN1_IA5STRING(X509V3_EXT_METHOD *method, ASN1_IA5STRING *ia5) 
}



ASN1_IA5STRING *s2i_ASN1_IA5STRING(X509V3_EXT_METHOD *method,

                                   X509V3_CTX *ctx, char *str)

                                   X509V3_CTX *ctx, const char *str)

{

    ASN1_IA5STRING *ia5;

    if (!str) {
@@ -51,10 +51,9 @@ ASN1_IA5STRING *s2i_ASN1_IA5STRING(X509V3_EXT_METHOD *method, 
    }

    if ((ia5 = ASN1_IA5STRING_new()) == NULL)

        goto err;

    if (!ASN1_STRING_set((ASN1_STRING *)ia5, (unsigned char *)str,

                         strlen(str))) {

    if (!ASN1_STRING_set((ASN1_STRING *)ia5, str, strlen(str))) {

        ASN1_IA5STRING_free(ia5);

        goto err;

        return NULL;

    }

#ifdef CHARSET_EBCDIC

    ebcdic2ascii(ia5->data, ia5->data, ia5->length);

include/openssl/x509v3.h

+1 −1
Original line number Diff line number Diff line
@@ -481,7 +481,7 @@ STACK_OF(CONF_VALUE) *i2v_ASN1_BIT_STRING(X509V3_EXT_METHOD *method, 
                                          STACK_OF(CONF_VALUE) *extlist);

char *i2s_ASN1_IA5STRING(X509V3_EXT_METHOD *method, ASN1_IA5STRING *ia5);

ASN1_IA5STRING *s2i_ASN1_IA5STRING(X509V3_EXT_METHOD *method,

                                   X509V3_CTX *ctx, char *str);

                                   X509V3_CTX *ctx, const char *str);



STACK_OF(CONF_VALUE) *i2v_GENERAL_NAME(X509V3_EXT_METHOD *method,

                                       GENERAL_NAME *gen,