Added sign_data2 to libykpiv to disable padding.

ykcs11/mechanisms.c

@@ -85,14 +85,18 @@ CK_BBOOL is_RSA_mechanism(CK_MECHANISM_TYPE m) {
   return CK_FALSE;
 }
 
-CK_RV do_sign_padding(CK_MECHANISM_PTR m, CK_BYTE_PTR in, CK_ULONG in_len,
-                      CK_BYTE_PTR out, CK_ULONG out_len, CK_ULONG key_len) {
+CK_RV apply_sign_mechanism(CK_MECHANISM_PTR m, CK_BYTE_PTR in, CK_ULONG in_len,
+                           CK_BYTE_PTR out, CK_ULONG out_len, CK_ULONG key_len) {
   switch (m->mechanism) {
   case CKM_RSA_PKCS:
     return do_pkcs_t1(in, in_len, out, out_len, key_len);
 
   case CKM_RSA_PKCS_PSS:
+    return CKR_FUNCTION_FAILED;
+    
   case CKM_RSA_X_509:
+    return CKR_OK;
+
   case CKM_SHA1_RSA_PKCS:
   case CKM_SHA256_RSA_PKCS:
   case CKM_SHA384_RSA_PKCS:

ykcs11/mechanisms.h

@@ -7,7 +7,7 @@
 CK_RV check_sign_mechanism(const ykcs11_session_t *s, CK_MECHANISM_PTR m);
 CK_BBOOL is_RSA_mechanism(CK_MECHANISM_TYPE m);
 
-CK_RV do_sign_padding(CK_MECHANISM_PTR m, CK_BYTE_PTR in, CK_ULONG in_len,
-                      CK_BYTE_PTR out, CK_ULONG out_len, CK_ULONG key_len);
+CK_RV apply_sign_mechanism(CK_MECHANISM_PTR m, CK_BYTE_PTR in, CK_ULONG in_len,
+                           CK_BYTE_PTR out, CK_ULONG out_len, CK_ULONG key_len);
 
 #endif

ykcs11/openssl_utils.c

@@ -130,7 +130,7 @@ CK_RV free_key(EVP_PKEY *key) {
 CK_RV do_pkcs_t1(CK_BYTE_PTR in, CK_ULONG in_len, CK_BYTE_PTR out, CK_ULONG out_len, CK_ULONG key_len) {
   fprintf(stderr, "Apply padding to %lu bytes and get %lu\n", in_len, key_len);
 
-  // TODO: rand must be seeded first
+  // TODO: rand must be seeded first (should be automatic)
   if (out_len < key_len)
     CKR_BUFFER_TOO_SMALL;
 

ykcs11/ykcs11.c

@@ -814,7 +814,8 @@ CK_DEFINE_FUNCTION(CK_RV, C_GetAttributeValue)(
 )
 {
   DIN;
-  CK_RV rv;
+  CK_ULONG i;
+  CK_RV rv, rv_final;
 
   if (piv_state == NULL) {
     DBG(("libykpiv is not initialized or already finalized"));
@@ -835,24 +836,20 @@ CK_DEFINE_FUNCTION(CK_RV, C_GetAttributeValue)(
   if (find_obj.active != CK_TRUE)
     return CKR_OPERATION_NOT_INITIALIZED;
 
-  if (pTemplate[0].pValue == NULL_PTR) {
-    DBG(("Just get size"));
-    rv = get_attribute(&session, hObject, pTemplate);
+  rv_final = CKR_OK;
+  for (i = 0; i < ulCount; i++) {
 
+    rv = get_attribute(&session, hObject, pTemplate + i);
+
+    // TODO: this function has some complex cases for return vlaue. Make sure to check them.
     if (rv != CKR_OK) {
-      DBG(("Unable to get size for attribute %lu of object %lu", pTemplate->type, hObject));
+      DBG(("Unable to get attribute %lu of object %lu", (pTemplate + i)->type, hObject));
+      rv_final = rv;
     }
-    DOUT;
-    return CKR_OK;
   }
-  DBG(("Trying to get %lu attribute(s) for object %lu", ulCount, hObject));
-  DBG(("Type: 0x%lx Value: %lu Len: %lu", pTemplate[0].type, *((CK_ULONG_PTR)pTemplate[0].pValue), pTemplate[0].ulValueLen));
-  // TODO: here for i in ulCount (get all the attributes)
-
-  return get_attribute(&session, hObject, pTemplate);
 
   DOUT;
-  return CKR_OK;
+  return rv_final;
 }
 
 CK_DEFINE_FUNCTION(CK_RV, C_SetAttributeValue)(
@@ -1339,10 +1336,10 @@ CK_DEFINE_FUNCTION(CK_RV, C_Sign)(
   DBG(("Sending %lu bytes to sign", ulDataLen));
   dump_hex(pData, ulDataLen, stderr, CK_TRUE);
 
-/*  if (do_sign_padding(&sign_info.mechanism, pData, ulDataLen, buf, buf_len, 2048 / 8) != CKR_OK) {
+  if (apply_sign_mechanism(&sign_info.mechanism, pData, ulDataLen, buf, buf_len, 2048 / 8) != CKR_OK) {
     DBG(("Unable to apply padding scheme"));
     return CKR_FUNCTION_FAILED;
-    }*/
+  }
   memcpy(buf, pData, ulDataLen); // ykpiv does padding already
   //dump_hex(buf, 256, stderr, CK_TRUE);
   //*pulSignatureLen = 256;
@@ -1353,8 +1350,7 @@ CK_DEFINE_FUNCTION(CK_RV, C_Sign)(
   }
   DBG(("Got %lu bytes back", *pulSignatureLen));
   dump_hex(pSignature, *pulSignatureLen, stderr, CK_TRUE);
-/*  memcpy(pSignature, sig_buf, sig_len_out);
- *pulSignatureLen = sig_len_out;*/
+
   DOUT;
   return CKR_OK;
 }