pkcs11 0.2.5 → 0.2.6

data/lib/pkcs11/helper.rb

@@ -53,7 +53,8 @@ module PKCS11
       CKM_SSL3_KEY_AND_MAC_DERIVE => CK_SSL3_KEY_MAT_OUT,
       CKM_SSL3_KEY_AND_MAC_DERIVE => CK_SSL3_KEY_MAT_PARAMS,
       CKM_TLS_MASTER_KEY_DERIVE => CK_SSL3_MASTER_KEY_DERIVE_PARAMS,
-      CKM_TLS_PRF => CK_TLS_PRF_PARAMS,
+      CKM_TLS_MAC => CK_TLS_MAC_PARAMS,
+      CKM_TLS_KDF => CK_TLS_KDF_PARAMS,
       CKM_WTLS_MASTER_KEY_DERIVE => CK_WTLS_RANDOM_DATA,
       CKM_WTLS_MASTER_KEY_DERIVE => CK_WTLS_MASTER_KEY_DERIVE_PARAMS,
       CKM_WTLS_PRF => CK_WTLS_PRF_PARAMS,

data/pkcs11_luna/Manifest.txt

@@ -0,0 +1,24 @@
+.gemtest
+.yardopts
+Manifest.txt
+README_LUNA.rdoc
+Rakefile
+ext/extconf.rb
+ext/generate_constants.rb
+ext/generate_structs.rb
+ext/pk11l.c
+lib/pkcs11_luna.rb
+lib/pkcs11_luna/extensions.rb
+test/luna_helper.rb
+test/app_id_helper.rb
+test/test_pkcs11_luna.rb
+test/test_pkcs11_luna_crypt.rb
+examples/config.rb
+examples/derive_aes_ecdh_key.rb
+examples/sign_verify.rb
+examples/encrypt_decrypt_aes.rb
+examples/encrypt_decrypt_rsa.rb
+examples/mechanism_list.rb
+examples/multithread.rb
+examples/objects_list.rb
+examples/slot_info.rb

data/pkcs11_luna/README_LUNA.rdoc

@@ -0,0 +1,103 @@
+= PKCS #11/Ruby Interface for Safenet Luna HSM
+
+* Homepage: http://github.com/larskanis/pkcs11
+* API documentation: http://pkcs11.rubyforge.org/pkcs11/
+* Safenet[http://www.safenet-inc.com] - Luna HSM
+
+This ruby gem is an add-on to ruby-pkcs11[http://github.com/larskanis/pkcs11] .
+It allows to use Luna specific extensions, which are beyond the PKCS#11 standard.
+The module works on the Unix like operating systems and win32.
+
+== Requirements
+
+* Luna Client installed including the Luna Sofware Development Kit (SDK)
+* pkcs11 gem installed (use: <tt>gem install pkcs11</tt> )
+
+== Installation
+
+First check the permissions for the directories in the sdk.  It may be required to run:
+  chmod a+x <luna client include dir>
+  chmod a+x <luna client include dir>/RSA
+
+  gem install pkcs11_luna -- --with-luna-dir-include=<luna client include dir>
+
+This installs the Luna-PKCS#11 extension either by compiling (Unix)
+or by using the precompiled gem for Win32.
+
+  git clone git://github.com/larskanis/pkcs11.git
+  cd pkcs11_luna
+  gem install hoe rake-compiler minitest
+  rake gem LUNA_INCLUDE_DIR=<luna client include dir>
+  gem install --verbose  pkg/pkcs11_luna-<version>.gem -- --with-luna-dir-include=<luna client include dir>
+  
+  rake test
+  cd ../
+  rake test
+
+Downloads and installs the gem from git source.  If LUNA_INCLUDE_DIR and --with-luna-dir-include are not specified,
+  The default of /usr/safenet/lunaclient/samples/include is used.
+  
+
+== Usage
+
+Open the software emulation library and login to a session:
+
+  require "rubygems"
+  require "pkcs11_luna"
+
+  pkcs11 = PKCS11::Luna::Library.new
+  p pkcs11.info
+  session = pkcs11.active_slots.last.open
+  session.login(:USER, "1234")
+  # ... crypto operations
+  session.logout
+  session.close
+  
+  Look in the examples directories for some more usage examples.
+
+{PKCS11::Luna::Library#initialize} reads the crystoki.ini or /etc/Chrystoki.conf
+and parses the configuration file to determine what .so or .dll to use.  You may pass 
+the full path to the .dll or .so file.
+
+== Cross compiling for mswin32
+
+Using rake-compiler a cross compiled pkcs11_luna.gem can be build on a linux host for
+the win32 platform. There are no runtime dependencies to any but the standard Windows DLLs.
+
+Install mingw32. On a debian based system this should work:
+
+  apt-get install mingw32
+
+On MacOS X, if you have MacPorts installed:
+
+  port install i386-mingw32-gcc
+
+Install the rake-compiler:
+
+  gem install rake-compiler
+
+Download and cross compile ruby for win32:
+
+  rake-compiler cross-ruby VERSION=1.8.7-p352
+  rake-compiler cross-ruby VERSION=1.9.2-p290
+
+Download and cross compile pkcs11_luna for win32:
+
+  rake cross native gem LUNA_CLIENT_DIR=<luna client dir>
+
+If everything works, there should be pkcs11_luna-VERSION-x86-mswin32.gem in the pkg
+directory.
+
+
+== ToDo
+
+* implement Luna specific function calls
+* implement possibility to use callbacks
+* add all structs and constants
+
+== Authors
+* Lars Kanis <kanis@comcard.de>
+* Jonathan Patchell
+
+== Copying
+See MIT-LICENSE included in the package.

data/test/helper.rb

@@ -54,7 +54,13 @@ def softokn_params_string
 end
 
 def open_softokn(so_path=nil)
-  PKCS11.open(so_path || find_softokn, :flags=>0, :pReserved=>softokn_params_string)
+  so = so_path || find_softokn
+  if $first_open
+    $stderr.puts "Using #{so} with params #{softokn_params_string.inspect}"
+    $first_open = false
+  end
+  PKCS11.open(so, :flags=>0, :pReserved=>softokn_params_string)
 end
 
 $pkcs11 = nil
+$first_open = true

data/test/test_pkcs11_thread.rb

@@ -30,7 +30,6 @@ class TestPkcs11Thread < Minitest::Test
     th = Thread.new{
       loop do
         count += 1
-        sleep 0.01
       end
     }
     # This should take some seconds:
@@ -38,7 +37,7 @@ class TestPkcs11Thread < Minitest::Test
       {:MODULUS_BITS=>2048, :PUBLIC_EXPONENT=>[3].pack("N"), :TOKEN=>false},
       {})
     th.kill
-    assert_operator count, :>, 10, "The second thread should count further concurrent to the key generation"
+    assert_operator count, :>, 100000, "The second thread should count further concurrent to the key generation"
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pkcs11
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - Ryosuke Kutsuna
@@ -9,86 +9,107 @@ authors:
 - Lars Kanis
 autorequire: 
 bindir: bin
-cert_chain:
-- |
-  -----BEGIN CERTIFICATE-----
-  MIIDLjCCAhagAwIBAgIBAjANBgkqhkiG9w0BAQUFADA9MQ4wDAYDVQQDDAVrYW5p
-  czEXMBUGCgmSJomT8ixkARkWB2NvbWNhcmQxEjAQBgoJkiaJk/IsZAEZFgJkZTAe
-  Fw0xNDAyMjYwOTMzMDBaFw0xNTAyMjYwOTMzMDBaMD0xDjAMBgNVBAMMBWthbmlz
-  MRcwFQYKCZImiZPyLGQBGRYHY29tY2FyZDESMBAGCgmSJomT8ixkARkWAmRlMIIB
-  IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApop+rNmg35bzRugZ21VMGqI6
-  HGzPLO4VHYncWn/xmgPU/ZMcZdfj6MzIaZJ/czXyt4eHpBk1r8QOV3gBXnRXEjVW
-  9xi+EdVOkTV2/AVFKThcbTAQGiF/bT1n2M+B1GTybRzMg6hyhOJeGPqIhLfJEpxn
-  lJi4+ENAVT4MpqHEAGB8yFoPC0GqiOHQsdHxQV3P3c2OZqG+yJey74QtwA2tLcLn
-  Q53c63+VLGsOjODl1yPn/2ejyq8qWu6ahfTxiIlSar2UbwtaQGBDFdb2CXgEufXT
-  L7oaPxlmj+Q2oLOfOnInd2Oxop59HoJCQPsg8f921J43NCQGA8VHK6paxIRDLQID
-  AQABozkwNzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUvgTdT7fe
-  x17ugO3IOsjEJwW7KP4wDQYJKoZIhvcNAQEFBQADggEBAFmIAhRT0awqLQN9e4Uv
-  ZEk+jUWv4zkb+TWiKFJXlwjPyjGbZY9gVfOwAwMibYOK/t/+57ZzW3d0L12OUwvo
-  on84NVvYtIr1/iskJFWFkMoIquAFCdi9p68stSPMQK2XcrJJuRot29fJtropsZBa
-  2cpaNd/sRYdK4oep2usdKifA1lI0hIkPb3r5nLfwG2lAqBH7WZsUICHcTgR0VEbG
-  z9Ug5qQp9Uz73xC9YdGvGiuOX53LYobHAR4MWi2xxDlHI+ER8mRz0eY2FUuNu/Wj
-  GrqF74zpLl7/KFdHC8VmzwZS18hvDjxeLVuVI2gIGnBInqnlqv05g/l4/1pISh5j
-  dS4=
-  -----END CERTIFICATE-----
-date: 2015-01-26 00:00:00.000000000 Z
+cert_chain: []
+date: 2017-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rdoc
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.6'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.6'
+- !ruby/object:Gem::Dependency
+  name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: yard
+  name: rake-compiler-dock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: 0.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
-  name: rake-compiler
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '5.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.7'
+- !ruby/object:Gem::Dependency
+  name: hoe-bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: hoe
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.13'
+        version: '3.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.13'
+        version: '3.16'
 description: 'This module allows Ruby programs to interface with "RSA Security Inc.
   PKCS #11 Cryptographic Token Interface (Cryptoki)".'
 email:
@@ -100,20 +121,23 @@ extensions:
 - ext/extconf.rb
 extra_rdoc_files:
 - History.txt
-- Manifest.txt
 - README.rdoc
+- pkcs11_luna/Manifest.txt
+- pkcs11_luna/README_LUNA.rdoc
 - pkcs11_protect_server/Manifest.txt
 - pkcs11_protect_server/README_PROTECT_SERVER.rdoc
 - ext/pk11.c
 files:
 - ".autotest"
 - ".gemtest"
+- ".travis.yml"
 - ".yardopts"
+- Gemfile
 - History.txt
 - MIT-LICENSE
-- Manifest.txt
 - README.rdoc
 - Rakefile
+- appveyor.yml
 - ext/extconf.rb
 - ext/generate_constants.rb
 - ext/generate_structs.rb
@@ -144,6 +168,8 @@ files:
 - lib/pkcs11/object.rb
 - lib/pkcs11/session.rb
 - lib/pkcs11/slot.rb
+- pkcs11_luna/Manifest.txt
+- pkcs11_luna/README_LUNA.rdoc
 - pkcs11_protect_server/Manifest.txt
 - pkcs11_protect_server/README_PROTECT_SERVER.rdoc
 - test/fixtures/softokn/cert8.db
@@ -179,15 +205,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: PKCS#11 binding for Ruby
-test_files:
-- test/test_pkcs11_crypt.rb
-- test/test_pkcs11_structs.rb
-- test/test_pkcs11_object.rb
-- test/test_pkcs11_thread.rb
-- test/test_pkcs11_session.rb
-- test/test_pkcs11_slot.rb
-- test/test_pkcs11.rb
+test_files: []

data/Manifest.txt

@@ -1,57 +0,0 @@
-.autotest
-.gemtest
-.yardopts
-History.txt
-MIT-LICENSE
-Manifest.txt
-README.rdoc
-Rakefile
-ext/extconf.rb
-ext/generate_constants.rb
-ext/generate_structs.rb
-ext/generate_thread_funcs.rb
-ext/include/cryptoki.h
-ext/include/ct-kip.h
-ext/include/otp-pkcs11.h
-ext/include/pkcs-11v2-20a3.h
-ext/include/pkcs11.h
-ext/include/pkcs11f.h
-ext/include/pkcs11t.h
-ext/pk11.c
-ext/pk11.h
-ext/pk11_const.c
-ext/pk11_const_macros.h
-ext/pk11_struct_macros.h
-ext/pk11_version.h
-lib/pkcs11.rb
-lib/pkcs11/extensions.rb
-lib/pkcs11/helper.rb
-lib/pkcs11/library.rb
-lib/pkcs11/object.rb
-lib/pkcs11/session.rb
-lib/pkcs11/slot.rb
-pkcs11_protect_server/.gemtest
-pkcs11_protect_server/.yardopts
-pkcs11_protect_server/Manifest.txt
-pkcs11_protect_server/README_PROTECT_SERVER.rdoc
-pkcs11_protect_server/Rakefile
-pkcs11_protect_server/ext/extconf.rb
-pkcs11_protect_server/ext/generate_constants.rb
-pkcs11_protect_server/ext/generate_structs.rb
-pkcs11_protect_server/ext/pk11s.c
-pkcs11_protect_server/lib/pkcs11_protect_server.rb
-pkcs11_protect_server/lib/pkcs11_protect_server/extensions.rb
-pkcs11_protect_server/test/helper.rb
-pkcs11_protect_server/test/test_pkcs11_protect_server.rb
-pkcs11_protect_server/test/test_pkcs11_protect_server_crypt.rb
-test/fixtures/softokn/cert8.db
-test/fixtures/softokn/key3.db
-test/fixtures/softokn/secmod.db
-test/helper.rb
-test/test_pkcs11.rb
-test/test_pkcs11_crypt.rb
-test/test_pkcs11_object.rb
-test/test_pkcs11_session.rb
-test/test_pkcs11_slot.rb
-test/test_pkcs11_structs.rb
-test/test_pkcs11_thread.rb