Commit 638c2dd0 authored by Matt Caswell's avatar Matt Caswell
Browse files

Updates following feedback on OPENSSL_assert() removal 



Reviewed-by: default avatarAndy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3740)
parent 42d7d7dd

crypto/bio/b_addr.c

+0 −3
Original line number Diff line number Diff line
@@ -566,9 +566,6 @@ static int addrinfo_wrap(int family, int socktype, 
                         unsigned short port,

                         BIO_ADDRINFO **bai)

{

    if (bai == NULL)

        return 0;



    *bai = OPENSSL_zalloc(sizeof(**bai));

    if (*bai == NULL)

        return 0;

crypto/ec/ec_key.c

+0 −2
Original line number Diff line number Diff line
@@ -191,8 +191,6 @@ int EC_KEY_generate_key(EC_KEY *eckey) 


int ossl_ec_key_gen(EC_KEY *eckey)

{

    if (!ossl_assert(eckey->group->meth->keygen != NULL))

        return 0;

    return eckey->group->meth->keygen(eckey);

}

crypto/ec/ec_lib.c

+0 −2
Original line number Diff line number Diff line
@@ -330,8 +330,6 @@ const BIGNUM *EC_GROUP_get0_order(const EC_GROUP *group) 


int EC_GROUP_order_bits(const EC_GROUP *group)

{

    if (!ossl_assert(group->meth->group_order_bits != NULL))

        return 0;

    return group->meth->group_order_bits(group);

}

crypto/x509v3/v3_addr.c

+0 −2
Original line number Diff line number Diff line
@@ -430,8 +430,6 @@ static int make_addressRange(IPAddressOrRange **result, 
    if ((aor = IPAddressOrRange_new()) == NULL)

        return 0;

    aor->type = IPAddressOrRange_addressRange;

    if (!ossl_assert(aor->u.addressRange == NULL))

        return 0;

    if ((aor->u.addressRange = IPAddressRange_new()) == NULL)

        goto err;

    if (aor->u.addressRange->min == NULL &&

crypto/x509v3/v3_asid.c

+1 −5
Original line number Diff line number Diff line
@@ -168,8 +168,6 @@ int X509v3_asid_add_inherit(ASIdentifiers *asid, int which) 
    if (*choice == NULL) {

        if ((*choice = ASIdentifierChoice_new()) == NULL)

            return 0;

        if (!ossl_assert((*choice)->u.inherit == NULL))

            return 0;

        if (((*choice)->u.inherit = ASN1_NULL_new()) == NULL)

            return 0;

        (*choice)->type = ASIdentifierChoice_inherit;
@@ -202,8 +200,6 @@ int X509v3_asid_add_id_or_range(ASIdentifiers *asid, 
    if (*choice == NULL) {

        if ((*choice = ASIdentifierChoice_new()) == NULL)

            return 0;

        if (!ossl_assert((*choice)->u.asIdsOrRanges == NULL))

            return 0;

        (*choice)->u.asIdsOrRanges = sk_ASIdOrRange_new(ASIdOrRange_cmp);

        if ((*choice)->u.asIdsOrRanges == NULL)

            return 0;
@@ -238,7 +234,7 @@ int X509v3_asid_add_id_or_range(ASIdentifiers *asid, 
static int extract_min_max(ASIdOrRange *aor,

                           ASN1_INTEGER **min, ASN1_INTEGER **max)

{

    if (!ossl_assert(aor != NULL && min != NULL && max != NULL))

    if (!ossl_assert(aor != NULL))

        return 0;

    switch (aor->type) {

    case ASIdOrRange_id: