commit 754106713fd349be267ec0dfe6f4f8a97c1b3cdb
author Alexandre Savard <alexandre.savard@savoirfairelinux.com> Wed Aug 08 09:50:01 2012 -0400
committer Alexandre Savard <alexandre.savard@savoirfairelinux.com> Wed Aug 08 09:50:01 2012 -0400
tree 767702dc681aea550f7c8c626e936e019981b7dc
parent ace91efcc58b8704c3e8e9c03e33afc1a59aecc3

#14465: Update openssl to tag android-4.0.4_r2.1

jni/openssl/crypto/objects/obj_xref.c

diff --git a/jni/openssl/crypto/objects/obj_xref.c b/jni/openssl/crypto/objects/obj_xref.c
index 9f744bc..152eca5 100644
--- a/jni/openssl/crypto/objects/obj_xref.c
+++ b/jni/openssl/crypto/objects/obj_xref.c
@@ -110,10 +110,8 @@
 #endif
 	if (rv == NULL)
 		return 0;
-	if (pdig_nid)
-		*pdig_nid = rv->hash_id;
-	if (ppkey_nid)
-		*ppkey_nid = rv->pkey_id;
+	*pdig_nid = rv->hash_id;
+	*ppkey_nid = rv->pkey_id;
 	return 1;
 	}
 
@@ -146,8 +144,7 @@
 #endif
 	if (rv == NULL)
 		return 0;
-	if (psignid)
-		*psignid = (*rv)->sign_id;
+	*psignid = (*rv)->sign_id;
 	return 1;
 	}