diff options
| author | Daiki Ueno <ueno@gnu.org> | 2021-09-09 09:46:04 +0200 |
|---|---|---|
| committer | Daiki Ueno <ueno@gnu.org> | 2021-09-09 09:54:59 +0200 |
| commit | 3abd9cac341340b3dddc9c2ab3af42140d402d2e (patch) | |
| tree | aaa2327d5649e8b14226afaaf3b5bd7aced25d32 /lib | |
| parent | dd61f8475b25ca3efa9a390aba96fc024f41d63d (diff) | |
| download | gnutls-3abd9cac341340b3dddc9c2ab3af42140d402d2e.tar.gz | |
build: remove tautological if conditions
Spotted by LGTM.
Signed-off-by: Daiki Ueno <ueno@gnu.org>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/hello_ext.c | 3 | ||||
| -rw-r--r-- | lib/x509/name_constraints.c | 3 | ||||
| -rw-r--r-- | lib/x509/privkey.c | 8 | ||||
| -rw-r--r-- | lib/x509/verify.c | 2 | ||||
| -rw-r--r-- | lib/x509/x509_ext.c | 8 |
5 files changed, 13 insertions, 11 deletions
diff --git a/lib/hello_ext.c b/lib/hello_ext.c index 32385f4c0e..bb63623efb 100644 --- a/lib/hello_ext.c +++ b/lib/hello_ext.c @@ -790,7 +790,8 @@ gnutls_ext_register(const char *name, int id, gnutls_ext_parse_type_t parse_poin gid = extfunc[i]->gid + 1; } - if (gid > GNUTLS_EXTENSION_MAX_VALUE || gid >= sizeof(extfunc)/sizeof(extfunc[0])) + assert(gid < sizeof(extfunc)/sizeof(extfunc[0])); + if (gid > GNUTLS_EXTENSION_MAX_VALUE) return gnutls_assert_val(GNUTLS_E_MEMORY_ERROR); tmp_mod = gnutls_calloc(1, sizeof(*tmp_mod)); diff --git a/lib/x509/name_constraints.c b/lib/x509/name_constraints.c index 9b71853c6d..6c1546ea81 100644 --- a/lib/x509/name_constraints.c +++ b/lib/x509/name_constraints.c @@ -165,7 +165,8 @@ int _gnutls_extract_name_constraints(asn1_node c2, const char *vstr, tmp.data = NULL; } - if (ret < 0 && ret != GNUTLS_E_REQUESTED_DATA_NOT_AVAILABLE) { + assert(ret < 0); + if (ret != GNUTLS_E_REQUESTED_DATA_NOT_AVAILABLE) { gnutls_assert(); goto cleanup; } diff --git a/lib/x509/privkey.c b/lib/x509/privkey.c index 570e5e425c..3aa088ecff 100644 --- a/lib/x509/privkey.c +++ b/lib/x509/privkey.c @@ -736,11 +736,9 @@ gnutls_x509_privkey_import2(gnutls_x509_privkey_t key, if (ret >= 0) return ret; - if (ret < 0) { - gnutls_assert(); - saved_ret = ret; - /* fall through to PKCS #8 decoding */ - } + gnutls_assert(); + saved_ret = ret; + /* fall through to PKCS #8 decoding */ } if ((password != NULL || (flags & GNUTLS_PKCS_NULL_PASSWORD)) diff --git a/lib/x509/verify.c b/lib/x509/verify.c index ac1b268f11..c7e35f7cae 100644 --- a/lib/x509/verify.c +++ b/lib/x509/verify.c @@ -1715,7 +1715,7 @@ gnutls_x509_crl_verify(gnutls_x509_crl_t crl, if (verify) *verify |= GNUTLS_CERT_INVALID; goto cleanup; - } else if (result >= 0) { + } else { result = 0; /* everything ok */ } } diff --git a/lib/x509/x509_ext.c b/lib/x509/x509_ext.c index c43bb172c3..41b38bd85b 100644 --- a/lib/x509/x509_ext.c +++ b/lib/x509/x509_ext.c @@ -947,8 +947,9 @@ int gnutls_x509_ext_import_authority_key_id(const gnutls_datum_t * ext, break; } + assert(ret < 0); aki->cert_issuer.size = i; - if (ret < 0 && ret != GNUTLS_E_REQUESTED_DATA_NOT_AVAILABLE + if (ret != GNUTLS_E_REQUESTED_DATA_NOT_AVAILABLE && ret != GNUTLS_E_ASN1_ELEMENT_NOT_FOUND) { gnutls_assert(); gnutls_free(san.data); @@ -2864,8 +2865,9 @@ static int parse_aia(asn1_node c2, gnutls_x509_aia_t aia) return gnutls_assert_val(GNUTLS_E_MEMORY_ERROR); } } - - if (ret < 0 && ret != GNUTLS_E_REQUESTED_DATA_NOT_AVAILABLE) { + + assert(ret < 0); + if (ret != GNUTLS_E_REQUESTED_DATA_NOT_AVAILABLE) { return ret; } |