From 90d4a4eef2b7d8b8f45fbaa5423ed8f8d574ed9b Mon Sep 17 00:00:00 2001
From: jsg <>
Date: Thu, 17 Apr 2014 10:56:25 +0000
Subject: remove duplicated tests in if statements ok krw@ sthen@ deraadt@
---
src/lib/libcrypto/store/str_lib.c | 8 ++++----
src/lib/libssl/src/crypto/store/str_lib.c | 8 ++++----
2 files changed, 8 insertions(+), 8 deletions(-)
(limited to 'src')
diff --git a/src/lib/libcrypto/store/str_lib.c b/src/lib/libcrypto/store/str_lib.c
index f1dbcbd0e0..e92dc1f51c 100644
--- a/src/lib/libcrypto/store/str_lib.c
+++ b/src/lib/libcrypto/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);
diff --git a/src/lib/libssl/src/crypto/store/str_lib.c b/src/lib/libssl/src/crypto/store/str_lib.c
index f1dbcbd0e0..e92dc1f51c 100644
--- a/src/lib/libssl/src/crypto/store/str_lib.c
+++ b/src/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);
--
cgit v1.2.3-55-g6feb