ffi-pkcs11 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cd6f4b5ce9c4b6b6fe51184c11b052bfb278b1e8
-  data.tar.gz: c12881078bb7be5e5b68762e6a73a7faad9732bc
+  metadata.gz: 5cd973b3cb1028c6b59975bf3facfe532b214763
+  data.tar.gz: 1c96f3ea73b70127d4c70522000ca29743887aff
 SHA512:
-  metadata.gz: 770748cb742be5064d4043ef88b61bf15cb38cec59bc1af3e0a8084d07305f3436d5da23d08b41983185b872dc92a87c16f9e056a8f47bc6a2d499ea97686909
-  data.tar.gz: 5242f88b5094743287650c56c49903de2bc2be684d8cf3eb70345a0f2ecfa8c4ce53a5c0dd4b8810bbbfaf9a8388f8d6df18c083b2fa0c53fe95b6dc4d73e46d
+  metadata.gz: 25f284e9df5e6ae7114493b6182b540a2cd18f8ad08e68ee7a4089fb153b96a816f859be8059354492e0f04474843636f528e4a61fb7cbc6060cc49206f53240
+  data.tar.gz: 505e7c278da451261e2a4eb404fde4df17f46d67900d079d340b9958bb7848e2360b109f3c15d69fe8f43b2bfd30e679bc4b5617f3187c219778458153f93b66

data/README.md

@@ -32,7 +32,18 @@ if result == Pkcs11::CKR_OK
 
 ### High-level API
 
-Coming soon (TM).
+```ruby
+session = Pkcs11::Session.new
+session.open(slot_id) do |_|
+  session.login(pin) do |_|
+    return_value = Pkcs11::C_Digest(session.session_handle,
+                                    some_data,
+                                    some_data_size,
+                                    digest_data,
+                                    digest_data_length)
+    if return_value.ok?
+    [...]
+```
 
 ## Development
 

data/lib/ffi-pkcs11.rb

@@ -1,6 +1,11 @@
 require "ffi-pkcs11/version"
 
 require 'ffi-pkcs11/error'
+
+require 'ffi'
+
+require 'ffi-pkcs11/pkcs11'
 require 'ffi-pkcs11/return_value'
+require 'ffi-pkcs11/types'
 require 'ffi-pkcs11/functions'
 require 'ffi-pkcs11/session'

data/lib/ffi-pkcs11/functions.rb

@@ -1,62 +1,29 @@
-require 'ffi'
-
 module Pkcs11
-  extend FFI::Library
-
-  ffi_lib 'cryptoki'
-
-  typedef :ulong, :CK_RV
-
-  CKS_RO_PUBLIC_SESSION = 0
-  CKS_RO_USER_FUNCTIONS = 1
-  CKS_RW_PUBLIC_SESSION = 2
-  CKS_RW_USER_FUNCTIONS = 3
-  CKS_RW_SO_FUNCTIONS =  4
-
-  class CK_SESSION_INFO < FFI::Struct
-    layout :slot_id, :ulong,
-      :state, :ulong,
-      :flags, :ulong,
-      :u_device_error, :ulong
-  end
-
-  enum :CK_ATTRIBUTE_TYPE, [
-    :CKA_CLASS,  0x00000000,
-    :CKA_TOKEN,  0x00000001,
-    :CKA_PRIVATE,  0x00000002,
-    :CKA_LABEL,  0x00000003
-  ]
-
-  class CK_ATTRIBUTE < FFI::Struct
-    layout :type, :CK_ATTRIBUTE_TYPE,
-      :value, :pointer,
-      :value_len, :ulong
-  end
-
-  CKF_RW_SESSION = 0x00000002
-  CKF_SERIAL_SESSION = 0x00000004
-
-  CKM_MD5 = 0x00000210
-  CKM_SHA_1 = 0x00000220
-  CKM_VENDOR_DEFINED = 0x80000000
-
-  CKU_SO = 0
-  CKU_USER = 1
-  CKU_CONTEXT_SPECIFIC = 2
-
   def self.import_function(function_name, *args)
     function_symbol = "native_#{function_name}".to_sym
     attach_function(function_symbol, function_name, *args)
 
     self.class.send(:define_method, function_name) do |*arguments|
-      result = send(function_symbol, *arguments)
-      ReturnValue[result]
+      if ENV['PKCS11_DEBUG']
+        start_time = Time.now
+        begin
+          result = send(function_symbol, *arguments)
+        ensure
+          end_time = Time.now
+          puts "#{function_name} - #{result} - #{end_time - start_time}"
+        end
+        ReturnValue[result]
+      else
+        result = send(function_symbol, *arguments)
+        ReturnValue[result]
+      end
     end
   end
 
   import_function :C_Initialize, [:pointer], :CK_RV
   import_function :C_Finalize, [:pointer], :CK_RV
 
+  import_function :C_GetInfo, [:pointer], :CK_RV
   import_function :C_GetSlotList, [:bool, :pointer, :pointer], :CK_RV
 
   import_function :C_GetSessionInfo, [:ulong, :pointer], :CK_RV

data/lib/ffi-pkcs11/pkcs11.rb

@@ -0,0 +1,7 @@
+module Pkcs11
+  extend FFI::Library
+
+  ffi_lib 'cryptoki'
+
+  typedef :ulong, :CK_RV
+end

data/lib/ffi-pkcs11/session.rb

@@ -16,6 +16,18 @@ module Pkcs11
       @session_pointer.read_ulong == 0
     end
 
+    def info
+      session_info = Pkcs11::CK_SESSION_INFO.new
+      result = Pkcs11::C_GetSessionInfo(session_handle, session_info)
+      check result
+      {
+        slot_id: session_info[:slot_id],
+        state: session_info[:state],
+        flags: session_info[:flags],
+        u_device_error: session_info[:u_device_error]
+      }
+    end
+
     def login(pin)
       result = Pkcs11.C_Login(session_handle, Pkcs11::CKU_USER, pin, pin.size)
       check result

data/lib/ffi-pkcs11/types.rb

@@ -0,0 +1,46 @@
+module Pkcs11
+  CKS_RO_PUBLIC_SESSION = 0
+  CKS_RO_USER_FUNCTIONS = 1
+  CKS_RW_PUBLIC_SESSION = 2
+  CKS_RW_USER_FUNCTIONS = 3
+  CKS_RW_SO_FUNCTIONS =  4
+
+  CKF_RW_SESSION = 0x00000002
+  CKF_SERIAL_SESSION = 0x00000004
+
+  CKM_MD5 = 0x00000210
+  CKM_SHA_1 = 0x00000220
+  CKM_VENDOR_DEFINED = 0x80000000
+
+  CKU_SO = 0
+  CKU_USER = 1
+  CKU_CONTEXT_SPECIFIC = 2
+
+  class CK_INFO < FFI::Struct
+    layout :cryptoki_version, [:uchar, 2],
+      :manufacturer_id, [:uchar, 32],
+      :flags, :ulong,
+      :library_description, [:uchar, 32],
+      :library_version, [:uchar, 2]
+  end
+
+  class CK_SESSION_INFO < FFI::Struct
+    layout :slot_id, :ulong,
+      :state, :ulong,
+      :flags, :ulong,
+      :u_device_error, :ulong
+  end
+
+  enum :CK_ATTRIBUTE_TYPE, [
+    :CKA_CLASS,  0x00000000,
+    :CKA_TOKEN,  0x00000001,
+    :CKA_PRIVATE,  0x00000002,
+    :CKA_LABEL,  0x00000003
+  ]
+
+  class CK_ATTRIBUTE < FFI::Struct
+    layout :type, :CK_ATTRIBUTE_TYPE,
+      :value, :pointer,
+      :value_len, :ulong
+  end
+end

data/lib/ffi-pkcs11/version.rb

@@ -1,3 +1,3 @@
 module Pkcs11
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ffi-pkcs11
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Vincent Touchard
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-09 00:00:00.000000000 Z
+date: 2017-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -100,8 +100,10 @@ files:
 - lib/ffi-pkcs11.rb
 - lib/ffi-pkcs11/error.rb
 - lib/ffi-pkcs11/functions.rb
+- lib/ffi-pkcs11/pkcs11.rb
 - lib/ffi-pkcs11/return_value.rb
 - lib/ffi-pkcs11/session.rb
+- lib/ffi-pkcs11/types.rb
 - lib/ffi-pkcs11/version.rb
 homepage: https://github.com/touchardv/ffi-pkcs11
 licenses: []