SOFTHSM-78: Correct the attribute checks for a number of objects.
Many objects are sharing the same attribute types, but the checks
are in some cases different.
Merge pull request #59 from bellgrim/SOFTHSM-78

SOFTHSM-78: Correct the attribute checks for a number of objects.