Fixes for attempted Data and KeyID allocations of zero length

Author: dgarske

src/crypto.c

@@ -660,7 +660,9 @@ static CK_RV SetAttributeValue(WP11_Session* session, WP11_Object* obj,
         }
         ret = WP11_Object_SetAttr(obj, attr->type, (byte*)attr->pValue,
                                                               attr->ulValueLen);
-        if (ret == BAD_FUNC_ARG)
+        if (ret == MEMORY_E)
+            return CKR_DEVICE_MEMORY;
+        else if (ret == BAD_FUNC_ARG)
             return CKR_ATTRIBUTE_VALUE_INVALID;
         else if (ret == BUFFER_E)
             return CKR_BUFFER_TOO_SMALL;

src/internal.c

@@ -8320,10 +8320,12 @@ static int WP11_Object_SetKeyId(WP11_Object* object, unsigned char* keyId,
 
     if (object->keyId != NULL)
         XFREE(object->keyId, NULL, DYNAMIC_TYPE_TMP_BUFFER);
-    object->keyId = (unsigned char*)XMALLOC(keyIdLen, NULL,
-        DYNAMIC_TYPE_TMP_BUFFER);
-    if (object->keyId == NULL)
-        ret = MEMORY_E;
+    if (keyIdLen > 0) {
+        object->keyId = (unsigned char*)XMALLOC(keyIdLen, NULL,
+            DYNAMIC_TYPE_TMP_BUFFER);
+        if (object->keyId == NULL)
+            ret = MEMORY_E;
+    }
     if (ret == 0) {
         XMEMCPY(object->keyId, keyId, keyIdLen);
         object->keyIdLen = keyIdLen;
@@ -8349,10 +8351,12 @@ static int WP11_Object_SetData(byte** attribute, int* attributeLen, byte* data,
 
     if (*attribute != NULL)
         XFREE(*attribute, NULL, DYNAMIC_TYPE_TMP_BUFFER);
-    *attribute = (byte*)XMALLOC(dataLen, NULL,
-        DYNAMIC_TYPE_TMP_BUFFER);
-    if (*attribute == NULL)
-        ret = MEMORY_E;
+    if (dataLen > 0) {
+        *attribute = (byte*)XMALLOC(dataLen, NULL,
+            DYNAMIC_TYPE_TMP_BUFFER);
+        if (*attribute == NULL)
+            ret = MEMORY_E;
+    }
     if (ret == 0) {
         XMEMCPY(*attribute, data, dataLen);
         *attributeLen = dataLen;
@@ -8571,7 +8575,7 @@ int WP11_Object_SetAttr(WP11_Object* object, CK_ATTRIBUTE_TYPE type, byte* data,
                 case CKK_HKDF:
 #endif
                 case CKK_GENERIC_SECRET:
-                   break;
+                    break;
                 default:
                     ret = BAD_FUNC_ARG;
                     break;