Improvement on sign and object handling.

ykcs11/openssl_utils.c

@@ -7,7 +7,7 @@ CK_RV do_store_cert(CK_BYTE_PTR data, CK_ULONG len, X509 **cert) {
 
   const unsigned char *p = data; // Mandatory temp variable required by OpenSSL
   int                 cert_len;
-  
+
   /**cert = X509_new();
   if (*cert == NULL)
   return CKR_HOST_MEMORY;*/
@@ -50,24 +50,87 @@ CK_RV do_store_pubk(X509 *cert, EVP_PKEY **key) {
     return CKR_FUNCTION_FAILED;
 
   return CKR_OK;
-  
+
+}
+
+CK_KEY_TYPE do_get_key_type(EVP_PKEY *key) {
+
+  switch (key->type) {
+  case EVP_PKEY_RSA:
+  case EVP_PKEY_RSA2:
+    return CKK_RSA;
+
+  case EVP_PKEY_EC:
+    return CKK_ECDSA;
+
+  default:
+    return CKK_VENDOR_DEFINED; // Actually an error
+  }
+}
+
+CK_ULONG do_get_rsa_modulus_length(EVP_PKEY *key) {
+
+  CK_ULONG key_len = 0;
+  RSA *rsa;
+
+  rsa = EVP_PKEY_get1_RSA(key);
+  if (rsa == NULL)
+    return 0;
+
+  return RSA_size(rsa) * 8; // There is also RSA_bits but only in >= 1.1.0
+
+}
+
+/* #include <stdio.h> */
+/* #include <openssl/err.h> */
+/*   ERR_load_crypto_strings(); */
+/* //SSL_load_error_strings(); */
+/*   fprintf(stderr, "ERROR %s\n", ERR_error_string(ERR_get_error(), NULL)); */
+CK_RV do_get_public_key(EVP_PKEY *key, CK_BYTE_PTR data, CK_ULONG_PTR len) {
+
+  RSA *rsa;
+  EC_KEY *eck;
+  const EC_GROUP *ecg; // Alternatice solution is to get i2d_PUBKEY and manually offset
+  const EC_POINT *ecp;
+  point_conversion_form_t pcf = POINT_CONVERSION_UNCOMPRESSED;
+
+  switch(key->type) {
+  case EVP_PKEY_RSA:
+  case EVP_PKEY_RSA2:
+
+    rsa = EVP_PKEY_get1_RSA(key);
+    return CKR_FUNCTION_FAILED; // TODO;
+    break;
+
+  case EVP_PKEY_EC:
+    eck = EVP_PKEY_get1_EC_KEY(key);
+    ecg = EC_KEY_get0_group(eck);
+    ecp = EC_KEY_get0_public_key(eck);
+
+    if ((*len = EC_POINT_point2oct(ecg, ecp, pcf, data, *len, NULL)) == 0)
+      return CKR_FUNCTION_FAILED;
+    break;
+
+  default:
+    return CKR_FUNCTION_FAILED;
+  }
+
+    return CKR_OK;
+
 }
 
 CK_RV free_key(EVP_PKEY *key) {
 
   EVP_PKEY_free(key);
-  
+
   return CKR_OK;
-  
+
 }
-/* #include <stdio.h> */
-/* #include <openssl/err.h> */
-/*   ERR_load_crypto_strings(); */
-/* //SSL_load_error_strings(); */
+
 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
   if (out_len < key_len)
     CKR_BUFFER_TOO_SMALL;