Commit 5b37fef0 authored by Andy Polyakov's avatar Andy Polyakov
Browse files

Harmonize use of sk_TYPE_find's return value. 



In some cases it's about redundant check for return value, in some
cases it's about replacing check for -1 with comparison to 0.
Otherwise compiler might generate redundant check for <-1. [Even
formatting and readability fixes.]

Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6860)
parent 28ad7318

crypto/asn1/asn_mime.c

+0 −4
Original line number Diff line number Diff line
@@ -883,8 +883,6 @@ static MIME_HEADER *mime_hdr_find(STACK_OF(MIME_HEADER) *hdrs, const char *name) 
    htmp.params = NULL;



    idx = sk_MIME_HEADER_find(hdrs, &htmp);

    if (idx < 0)

        return NULL;

    return sk_MIME_HEADER_value(hdrs, idx);

}
@@ -896,8 +894,6 @@ static MIME_PARAM *mime_param_find(MIME_HEADER *hdr, const char *name) 
    param.param_name = (char *)name;

    param.param_value = NULL;

    idx = sk_MIME_PARAM_find(hdr->params, &param);

    if (idx < 0)

        return NULL;

    return sk_MIME_PARAM_value(hdr->params, idx);

}

crypto/evp/evp_pbe.c

+2 −3
Original line number Diff line number Diff line
@@ -217,9 +217,8 @@ int EVP_PBE_find(int type, int pbe_nid, 
    pbelu.pbe_type = type;

    pbelu.pbe_nid = pbe_nid;



    if (pbe_algs) {

    if (pbe_algs != NULL) {

        i = sk_EVP_PBE_CTL_find(pbe_algs, &pbelu);

        if (i != -1)

        pbetmp = sk_EVP_PBE_CTL_value(pbe_algs, i);

    }

    if (pbetmp == NULL) {

crypto/objects/obj_xref.c

+2 −3
Original line number Diff line number Diff line
@@ -46,9 +46,8 @@ int OBJ_find_sigid_algs(int signid, int *pdig_nid, int *ppkey_nid) 
    const nid_triple *rv = NULL;

    tmp.sign_id = signid;



    if (sig_app) {

    if (sig_app != NULL) {

        int idx = sk_nid_triple_find(sig_app, &tmp);

        if (idx >= 0)

        rv = sk_nid_triple_value(sig_app, idx);

    }

#ifndef OBJ_XREF_TEST2

crypto/x509/by_dir.c

+3 −7
Original line number Diff line number Diff line
@@ -329,10 +329,7 @@ static int get_cert_by_subject(X509_LOOKUP *xl, X509_LOOKUP_TYPE type, 
         */

        CRYPTO_THREAD_write_lock(ctx->lock);

        j = sk_X509_OBJECT_find(xl->store_ctx->objs, &stmp);

        if (j != -1)

        tmp = sk_X509_OBJECT_value(xl->store_ctx->objs, j);

        else

            tmp = NULL;

        CRYPTO_THREAD_unlock(ctx->lock);



        /* If a CRL, update the last file suffix added for this */
@@ -343,10 +340,9 @@ static int get_cert_by_subject(X509_LOOKUP *xl, X509_LOOKUP_TYPE type, 
             * Look for entry again in case another thread added an entry

             * first.

             */

            if (!hent) {

            if (hent == NULL) {

                htmp.hash = h;

                idx = sk_BY_DIR_HASH_find(ent->hashes, &htmp);

                if (idx >= 0)

                hent = sk_BY_DIR_HASH_value(ent->hashes, idx);

            }

            if (hent == NULL) {

crypto/x509/x509_lu.c

+6 −5
Original line number Diff line number Diff line
@@ -619,17 +619,18 @@ STACK_OF(X509_CRL) *X509_STORE_CTX_get1_crls(X509_STORE_CTX *ctx, X509_NAME *nm) 
X509_OBJECT *X509_OBJECT_retrieve_match(STACK_OF(X509_OBJECT) *h,

                                        X509_OBJECT *x)

{

    int idx, i;

    int idx, i, num;

    X509_OBJECT *obj;



    idx = sk_X509_OBJECT_find(h, x);

    if (idx == -1)

    if (idx < 0)

        return NULL;

    if ((x->type != X509_LU_X509) && (x->type != X509_LU_CRL))

        return sk_X509_OBJECT_value(h, idx);

    for (i = idx; i < sk_X509_OBJECT_num(h); i++) {

    for (i = idx, num = sk_X509_OBJECT_num(h); i < num; i++) {

        obj = sk_X509_OBJECT_value(h, i);

        if (x509_object_cmp

            ((const X509_OBJECT **)&obj, (const X509_OBJECT **)&x))

        if (x509_object_cmp((const X509_OBJECT **)&obj,

                            (const X509_OBJECT **)&x))

            return NULL;

        if (x->type == X509_LU_X509) {

            if (!X509_cmp(obj->data.x509, x->data.x509))