CK_ULONG is platform dependent, where the number of bytes used to store a

CK_ULONG in the token is not.


git-svn-id: http://svn.fedorahosted.org/svn/coolkey/trunk@48 fba4d07e-fe0f-4d7f-8147-e0026e666dc0

1 files changed, 4 insertions, 2 deletions

diff --git a/src/coolkey/object.cpp b/src/coolkey/object.cpp
index d471c6e..bcf44c6 100644
--- a/src/coolkey/object.cpp
+++ b/src/coolkey/object.cpp
@@ -105,7 +105,9 @@ PKCS11Object::parseOldObject(const CKYBuffer *data)
 	if ((attrib.getType() == CKA_CLASS) || 
 	    (attrib.getType() == CKA_CERTIFICATE_TYPE) ||
 	    (attrib.getType() == CKA_KEY_TYPE)) {
-	    if (attrLen != sizeof (CK_ULONG)) {
+	    /* ulongs are 4 bytes on the token, even if they are 8 or
+	     * more in the pkcs11 module */
+	    if (attrLen != 4) {
                 throw PKCS11Exception(CKR_DEVICE_ERROR,
                 "Invalid attribute length %d\n", attrLen);
 	    }
@@ -183,7 +185,7 @@ PKCS11Object::expandAttributes(unsigned long fixedAttrs)
     if (!attributeExists(CKA_CLASS)) {
 	PKCS11Attribute attrib;
 	attrib.setType(CKA_CLASS);
-	attrib.setValue((CKYByte *)&objectType, 4);
+	attrib.setValue((CKYByte *)&objectType, sizeof(CK_ULONG));
         attributes.push_back(attrib);
     }