Commit d2a56999 authored by FdaSilvaYY's avatar FdaSilvaYY Committed by Matt Caswell
Browse files

Few nit's 



Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1618)
parent 28b86f31

crypto/x509/x509_att.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -56,7 +56,7 @@ X509_ATTRIBUTE *X509at_get_attr(const STACK_OF(X509_ATTRIBUTE) *x, int loc) 
{

{

    if (x == NULL || sk_X509_ATTRIBUTE_num(x) <= loc || loc < 0)

    if (x == NULL || sk_X509_ATTRIBUTE_num(x) <= loc || loc < 0)

        return NULL;

        return NULL;

    else



    return sk_X509_ATTRIBUTE_value(x, loc);

    return sk_X509_ATTRIBUTE_value(x, loc);

}

}

crypto/x509/x509name.c

+8 −6
Original line number Original line Diff line number Diff line
@@ -86,9 +86,9 @@ X509_NAME_ENTRY *X509_NAME_get_entry(const X509_NAME *name, int loc) 
{

{

    if (name == NULL || sk_X509_NAME_ENTRY_num(name->entries) <= loc

    if (name == NULL || sk_X509_NAME_ENTRY_num(name->entries) <= loc

        || loc < 0)

        || loc < 0)

        return (NULL);

        return NULL;

    else



        return (sk_X509_NAME_ENTRY_value(name->entries, loc));

    return sk_X509_NAME_ENTRY_value(name->entries, loc);

}

}





X509_NAME_ENTRY *X509_NAME_delete_entry(X509_NAME *name, int loc)

X509_NAME_ENTRY *X509_NAME_delete_entry(X509_NAME *name, int loc)
@@ -99,13 +99,14 @@ X509_NAME_ENTRY *X509_NAME_delete_entry(X509_NAME *name, int loc) 




    if (name == NULL || sk_X509_NAME_ENTRY_num(name->entries) <= loc

    if (name == NULL || sk_X509_NAME_ENTRY_num(name->entries) <= loc

        || loc < 0)

        || loc < 0)

        return (NULL);

        return NULL;



    sk = name->entries;

    sk = name->entries;

    ret = sk_X509_NAME_ENTRY_delete(sk, loc);

    ret = sk_X509_NAME_ENTRY_delete(sk, loc);

    n = sk_X509_NAME_ENTRY_num(sk);

    n = sk_X509_NAME_ENTRY_num(sk);

    name->modified = 1;

    name->modified = 1;

    if (loc == n)

    if (loc == n)

        return (ret);

        return ret;





    /* else we need to fixup the set field */

    /* else we need to fixup the set field */

    if (loc != 0)

    if (loc != 0)
@@ -127,7 +128,7 @@ X509_NAME_ENTRY *X509_NAME_delete_entry(X509_NAME *name, int loc) 
    if (set_prev + 1 < set_next)

    if (set_prev + 1 < set_next)

        for (i = loc; i < n; i++)

        for (i = loc; i < n; i++)

            sk_X509_NAME_ENTRY_value(sk, i)->set--;

            sk_X509_NAME_ENTRY_value(sk, i)->set--;

    return (ret);

    return ret;

}

}





int X509_NAME_add_entry_by_OBJ(X509_NAME *name, const ASN1_OBJECT *obj, int type,

int X509_NAME_add_entry_by_OBJ(X509_NAME *name, const ASN1_OBJECT *obj, int type,
@@ -136,6 +137,7 @@ int X509_NAME_add_entry_by_OBJ(X509_NAME *name, const ASN1_OBJECT *obj, int type 
{

{

    X509_NAME_ENTRY *ne;

    X509_NAME_ENTRY *ne;

    int ret;

    int ret;



    ne = X509_NAME_ENTRY_create_by_OBJ(NULL, obj, type, bytes, len);

    ne = X509_NAME_ENTRY_create_by_OBJ(NULL, obj, type, bytes, len);

    if (!ne)

    if (!ne)

        return 0;

        return 0;

crypto/x509v3/v3_alt.c

+4 −3
Original line number Original line Diff line number Diff line
@@ -303,10 +303,12 @@ static int copy_email(X509V3_CTX *ctx, GENERAL_NAMES *gens, int move_p) 
    ASN1_IA5STRING *email = NULL;

    ASN1_IA5STRING *email = NULL;

    X509_NAME_ENTRY *ne;

    X509_NAME_ENTRY *ne;

    GENERAL_NAME *gen = NULL;

    GENERAL_NAME *gen = NULL;

    int i;

    int i = -1;



    if (ctx != NULL && ctx->flags == CTX_TEST)

    if (ctx != NULL && ctx->flags == CTX_TEST)

        return 1;

        return 1;

    if (!ctx || (!ctx->subject_cert && !ctx->subject_req)) {

    if (ctx == NULL 

        || (ctx->subject_cert == NULL && ctx->subject_req == NULL)) {

        X509V3err(X509V3_F_COPY_EMAIL, X509V3_R_NO_SUBJECT_DETAILS);

        X509V3err(X509V3_F_COPY_EMAIL, X509V3_R_NO_SUBJECT_DETAILS);

        goto err;

        goto err;

    }

    }
@@ -317,7 +319,6 @@ static int copy_email(X509V3_CTX *ctx, GENERAL_NAMES *gens, int move_p) 
        nm = X509_REQ_get_subject_name(ctx->subject_req);

        nm = X509_REQ_get_subject_name(ctx->subject_req);





    /* Now add any email address(es) to STACK */

    /* Now add any email address(es) to STACK */

    i = -1;

    while ((i = X509_NAME_get_index_by_NID(nm,

    while ((i = X509_NAME_get_index_by_NID(nm,

                                           NID_pkcs9_emailAddress, i)) >= 0) {

                                           NID_pkcs9_emailAddress, i)) >= 0) {

        ne = X509_NAME_get_entry(nm, i);

        ne = X509_NAME_get_entry(nm, i);

crypto/x509v3/v3_ncons.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -247,6 +247,7 @@ int NAME_CONSTRAINTS_check_CN(X509 *x, NAME_CONSTRAINTS *nc) 
    for (i = -1;;) {

    for (i = -1;;) {

        X509_NAME_ENTRY *ne;

        X509_NAME_ENTRY *ne;

        ASN1_STRING *hn;

        ASN1_STRING *hn;



        i = X509_NAME_get_index_by_NID(nm, NID_commonName, i);

        i = X509_NAME_get_index_by_NID(nm, NID_commonName, i);

        if (i == -1)

        if (i == -1)

            break;

            break;

crypto/x509v3/v3_utl.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -424,11 +424,11 @@ static STACK_OF(OPENSSL_STRING) *get_email(X509_NAME *name, 
{

{

    STACK_OF(OPENSSL_STRING) *ret = NULL;

    STACK_OF(OPENSSL_STRING) *ret = NULL;

    X509_NAME_ENTRY *ne;

    X509_NAME_ENTRY *ne;

    ASN1_IA5STRING *email;

    const ASN1_IA5STRING *email;

    GENERAL_NAME *gen;

    GENERAL_NAME *gen;

    int i;

    int i = -1;



    /* Now add any email address(es) to STACK */

    /* Now add any email address(es) to STACK */

    i = -1;

    /* First supplied X509_NAME */

    /* First supplied X509_NAME */

    while ((i = X509_NAME_get_index_by_NID(name,

    while ((i = X509_NAME_get_index_by_NID(name,

                                           NID_pkcs9_emailAddress, i)) >= 0) {

                                           NID_pkcs9_emailAddress, i)) >= 0) {