msroots: Use clippy's suggested logic simplification

Also the same one @str4d made originally, guess I should've listened!

https://github.com/tarcieri/yubikey-piv.rs/pull/17#discussion_r349964456
This commit is contained in:
Tony Arcieri
2019-11-25 08:36:30 -08:00
parent c54f66acb4
commit 67ed32cbf9
+2 -2
View File
@@ -79,8 +79,8 @@ impl MsRoots {
ptr = ptr.add(1); ptr = ptr.add(1);
} }
if ((TAG_MSROOTS_MID != tag) && (TAG_MSROOTS_END != tag)) if (TAG_MSROOTS_MID != tag || YKPIV_OBJ_MSROOTS5 == object_id)
|| ((YKPIV_OBJ_MSROOTS5 == object_id) && (TAG_MSROOTS_END != tag)) && (TAG_MSROOTS_END != tag)
{ {
// the current object doesn't contain a valid part of a msroots file // the current object doesn't contain a valid part of a msroots file