diff options
| author |   jsg <jsg@openbsd.org> | 2014-04-17 10:56:25 +0000 |
|---|---|---|
| committer | jsg <jsg@openbsd.org> | 2014-04-17 10:56:25 +0000 |
| commit | 59a4cbf0543109e6c430d2676766f88349f405ce (patch) | |
| tree | 158a61d85c81c889d1617d90cfbc492bb1a5e7dd /lib/libssl/src | |
| parent | Fix for ", " issue in jsing's knf script (diff) | |
| download | wireguard-openbsd-59a4cbf0543109e6c430d2676766f88349f405ce.tar.xz wireguard-openbsd-59a4cbf0543109e6c430d2676766f88349f405ce.zip | |
remove duplicated tests in if statements
ok krw@ sthen@ deraadt@
Diffstat (limited to 'lib/libssl/src')
| -rw-r--r-- | lib/libssl/src/crypto/store/str_lib.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/libssl/src/crypto/store/str_lib.c b/lib/libssl/src/crypto/store/str_lib.c index f1dbcbd0e0c..e92dc1f51c2 100644 --- a/lib/libssl/src/crypto/store/str_lib.c +++ b/lib/libssl/src/crypto/store/str_lib.c @@ -472,7 +472,7 @@ EVP_PKEY *STORE_get_private_key(STORE *s, OPENSSL_ITEM attributes[], object = s->meth->get_object(s, STORE_OBJECT_TYPE_PRIVATE_KEY, attributes, parameters); - if (!object || !object->data.key || !object->data.key) + if (!object || !object->data.key) { STOREerr(STORE_F_STORE_GET_PRIVATE_KEY, STORE_R_FAILED_GETTING_KEY); @@ -613,7 +613,7 @@ EVP_PKEY *STORE_list_private_key_next(STORE *s, void *handle) list_object_next,STORE_R_NO_LIST_OBJECT_NEXT_FUNCTION); object = s->meth->list_object_next(s, handle); - if (!object || !object->data.key || !object->data.key) + if (!object || !object->data.key) { STOREerr(STORE_F_STORE_LIST_PRIVATE_KEY_NEXT, STORE_R_FAILED_LISTING_KEYS); @@ -667,7 +667,7 @@ EVP_PKEY *STORE_get_public_key(STORE *s, OPENSSL_ITEM attributes[], object = s->meth->get_object(s, STORE_OBJECT_TYPE_PUBLIC_KEY, attributes, parameters); - if (!object || !object->data.key || !object->data.key) + if (!object || !object->data.key) { STOREerr(STORE_F_STORE_GET_PUBLIC_KEY, STORE_R_FAILED_GETTING_KEY); @@ -808,7 +808,7 @@ EVP_PKEY *STORE_list_public_key_next(STORE *s, void *handle) list_object_next,STORE_R_NO_LIST_OBJECT_NEXT_FUNCTION); object = s->meth->list_object_next(s, handle); - if (!object || !object->data.key || !object->data.key) + if (!object || !object->data.key) { STOREerr(STORE_F_STORE_LIST_PUBLIC_KEY_NEXT, STORE_R_FAILED_LISTING_KEYS); |