commit b3ca51559b1a6cd80dc179ee54613f00190d1cb4
author Dr. Stephen Henson <steve@openssl.org> Thu Feb 11 22:46:01 2016 +0000
committer Dr. Stephen Henson <steve@openssl.org> Thu Feb 11 23:27:30 2016 +0000
tree a87984ec17181bb32b9f47ee2c4e1bf68b26db5e
parent de8128203a5340db397dadaee91bc504c2a539bc

Typo: only return error if unrecognise bag type.

Reviewed-by: Viktor Dukhovni <viktor@openssl.org>

crypto/pkcs12/p12_sbag.c

diff --git a/crypto/pkcs12/p12_sbag.c b/crypto/pkcs12/p12_sbag.c
index 62703b4..57e2bf4 100644
--- a/crypto/pkcs12/p12_sbag.c
+++ b/crypto/pkcs12/p12_sbag.c
@@ -107,7 +107,7 @@
 {
     int btype = PKCS12_SAFEBAG_get_nid(bag);
 
-    if (btype != NID_certBag || btype != NID_crlBag || btype != NID_secretBag)
+    if (btype != NID_certBag && btype != NID_crlBag && btype != NID_secretBag)
         return -1;
     return OBJ_obj2nid(bag->value.bag->type);
 }