From: Dr. Stephen Henson <steve@openssl.org>
Date: Thu, 11 Feb 2016 22:46:01 +0000 (+0000)
Subject: Typo: only return error if unrecognise bag type.
X-Git-Tag: OpenSSL_1_1_0-pre3~71
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=b3ca51559b1a6cd80dc179ee54613f00190d1cb4;p=oweals%2Fopenssl.git

Typo: only return error if unrecognise bag type.

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

diff --git a/crypto/pkcs12/p12_sbag.c b/crypto/pkcs12/p12_sbag.c
index 62703b4dc3..57e2bf43df 100644
--- a/crypto/pkcs12/p12_sbag.c
+++ b/crypto/pkcs12/p12_sbag.c
@@ -107,7 +107,7 @@ int PKCS12_SAFEBAG_get_bag_nid(PKCS12_SAFEBAG *bag)
 {
     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);
 }