The branch master has been updated
via b3ca51559b1a6cd80dc179ee54613f00190d1cb4 (commit)
from de8128203a5340db397dadaee91bc504c2a539bc (commit)
- Log -----------------------------------------------------------------
commit b3ca51559b1a6cd80dc179ee54613f00190d1cb4
Author: Dr. Stephen Henson <[email protected]>
Date: Thu Feb 11 22:46:01 2016 +0000
Typo: only return error if unrecognise bag type.
Reviewed-by: Viktor Dukhovni <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
crypto/pkcs12/p12_sbag.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 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);
}
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
