diff options
| author | Pauli <paul.dale@oracle.com> | 2017-07-06 09:10:28 +1000 |
|---|---|---|
| committer | Pauli <paul.dale@oracle.com> | 2017-07-14 07:31:29 +1000 |
| commit | 9e206ce5f80172136b503ca23fbd8e53b78eb4b7 (patch) | |
| tree | d3942855040ebee306a234140f9f62b5d33177f3 /test/pbelutest.c | |
| parent | d72a00416a0691bfd4920008767221bb4082a2ed (diff) | |
| download | openssl-new-9e206ce5f80172136b503ca23fbd8e53b78eb4b7.tar.gz | |
Fix some issues raise by coverity in the tests.
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3846)
Diffstat (limited to 'test/pbelutest.c')
| -rw-r--r-- | test/pbelutest.c | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/test/pbelutest.c b/test/pbelutest.c index c6ce58677c..84cb2631ac 100644 --- a/test/pbelutest.c +++ b/test/pbelutest.c @@ -17,12 +17,12 @@ static int test_pbelu(void) { - int i, failed = 0, ok; + int i, failed = 0; int pbe_type, pbe_nid, last_type = -1, last_nid = -1; for (i = 0; EVP_PBE_get(&pbe_type, &pbe_nid, i) != 0; i++) { if (!TEST_true(EVP_PBE_find(pbe_type, pbe_nid, NULL, NULL, 0))) { - TEST_info("i=%d, pbe_type=%d, pbe_nid=%d", i, pbe_type, pbe_nid); + TEST_note("i=%d, pbe_type=%d, pbe_nid=%d", i, pbe_type, pbe_nid); failed = 1; break; } @@ -33,20 +33,14 @@ static int test_pbelu(void) /* Error: print out whole table */ for (i = 0; EVP_PBE_get(&pbe_type, &pbe_nid, i) != 0; i++) { - if (pbe_type > last_type) - ok = 0; - else if (pbe_type < last_type || pbe_nid < last_nid) - ok = 1; - else - ok = 0; - if (!ok) - failed = 1; - TEST_info("PBE type=%d %d (%s): %s\n", pbe_type, pbe_nid, - OBJ_nid2sn(pbe_nid), ok ? "ERROR" : "OK"); + failed = pbe_type < last_type + || (pbe_type == last_type && pbe_nid < last_nid); + TEST_note("PBE type=%d %d (%s): %s\n", pbe_type, pbe_nid, + OBJ_nid2sn(pbe_nid), failed ? "ERROR" : "OK"); last_type = pbe_type; last_nid = pbe_nid; } - return failed ? 0 : 1; + return 0; } void register_tests(void) |