krypt-provider-openssl 0.0.1 → 0.0.2.rc1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 4a49d108af14bfc93b37ddfd78f793d818e0e4fc
+  data.tar.gz: 47c086c1bec091c894b284b03722df3ce70779d4
+SHA512:
+  metadata.gz: ec45052585088c6cdbccf9f667ebe70e7de9f87fafb8fead511d5b2294a4d6395d0d859d1d40e0ff3f57dc021cfe5d67095c4c609274d6397fe19e815c081b3a
+  data.tar.gz: 4cd0973daa001f597b511e625748841c228bf7554d041022cebc152003934c244be9764ddae4103daf813c5bcb338e9a82ed79a38d6ebfb5e897fbf127b7a990

data/ext/krypt/provider/openssl/krypt-provider-ossl.h

@@ -49,9 +49,12 @@ extern "C" {
 #include <openssl/ssl.h>
 
 extern krypt_provider krypt_provider_ossl;
+krypt_provider *krypt_ossl_provider_get(void);
 
-krypt_md * krypt_ossl_md_new_oid(krypt_provider *provider, const char *oid);
-krypt_md * krypt_ossl_md_new_name(krypt_provider *provider, const char *name);
+void krypt_ossl_init(krypt_provider *provider, void *args);
+void krypt_ossl_finalize(krypt_provider *provider);
+krypt_md *krypt_ossl_md_new_oid(krypt_provider *provider, const char *oid);
+krypt_md *krypt_ossl_md_new_name(krypt_provider *provider, const char *name);
 
 #if defined(__cplusplus)
 }

data/ext/krypt/provider/openssl/krypt-provider.h

@@ -72,15 +72,11 @@ struct krypt_interface_md_st {
 /* Provider */
 struct krypt_provider_st {
     const char *name;
+    void (*init)(krypt_provider *provider, void *args);
+    void (*finalize)(krypt_provider *provider);
     krypt_md *(*md_new_oid)(krypt_provider *provider, const char *oid);
     krypt_md *(*md_new_name)(krypt_provider *provider, const char *name);
 };
 
-/* Can be called from within a provider implementation to indicate errors */
-extern void krypt_error_add(const char * format, ...);
-
-/* May be used to register a singleton provider upon initialization */
-extern void krypt_provider_register(krypt_provider *provider);
-
 #endif /* _KRYPT_PROVIDER_H_ */
 

data/ext/krypt/provider/openssl/krypt_provider_ossl.c

@@ -31,17 +31,35 @@
 
 krypt_provider krypt_provider_ossl = {
     "openssl",
+    krypt_ossl_init,
+    krypt_ossl_finalize,
     krypt_ossl_md_new_oid,
     krypt_ossl_md_new_name
 };
 
+krypt_provider *
+krypt_ossl_get_provider(void) {
+    return &krypt_provider_ossl;
+}
+
 void
-Init_kryptprovideropenssl(void)
+krypt_ossl_init(krypt_provider *provider, void *args)
 {
     OpenSSL_add_ssl_algorithms();
     OpenSSL_add_all_algorithms();
     ERR_load_crypto_strings();
     SSL_load_error_strings();
+}
+
+void
+krypt_ossl_finalize(krypt_provider *provider)
+{
+    /* do nothing */
+}
 
-    krypt_provider_register(&krypt_provider_ossl);
+void
+Init_kryptprovideropenssl(void)
+{
+    /* do nothing */
 }
+

data/lib/{krypt-provider-openssl.rb → krypt/provider/openssl.rb}

@@ -30,5 +30,32 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 =end
 
-require 'kryptprovideropenssl.so'
+require 'ffi'
+
+module Krypt
+  module Provider
+
+    class OpenSSL < Krypt::FFI::Provider
+
+      def initialize
+        super(Handle.krypt_ossl_get_provider)
+      end
+
+      module Handle
+        extend ::FFI::Library
+  
+        # We cannot require the C extension in JRuby by default
+        if RUBY_PLATFORM =~ /java/
+          ffi_lib File.expand_path('../../kryptprovideropenssl.so', File.dirname(__FILE__))
+        else
+          require'kryptprovideropenssl.so'
+          ffi_lib ::FFI::CURRENT_PROCESS
+        end
+
+        attach_function :krypt_ossl_get_provider, [], :pointer
+      end
+    end
+
+  end
+end
 

metadata

@@ -1,16 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: krypt-provider-openssl
 version: !ruby/object:Gem::Version
-  version: 0.0.1
-  prerelease: 
+  version: 0.0.2.rc1
 platform: ruby
 authors:
 - Hiroshi Nakamura, Martin Bosslet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-27 00:00:00.000000000 Z
-dependencies: []
+date: 2014-02-23 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: ffi
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Implementation of the krypt-provider API using OpenSSL
 email: Martin.Bosslet@gmail.com
 executables: []
@@ -19,36 +32,34 @@ extensions:
 extra_rdoc_files: []
 files:
 - LICENSE
-- ext/krypt/provider/openssl/krypt_ossl_digest.c
 - ext/krypt/provider/openssl/extconf.rb
-- ext/krypt/provider/openssl/krypt_provider_ossl.c
 - ext/krypt/provider/openssl/krypt-provider-ossl.h
 - ext/krypt/provider/openssl/krypt-provider.h
-- lib/kryptprovideropenssl.so
-- lib/krypt-provider-openssl.rb
+- ext/krypt/provider/openssl/krypt_ossl_digest.c
+- ext/krypt/provider/openssl/krypt_provider_ossl.c
+- lib/krypt/provider/openssl.rb
 homepage: https://github.com/krypt/krypt-provider-openssl
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Default provider for C(++)-based Rubies
 test_files: []