gpgme 2.0.7 → 2.0.8

data/ext/gpgme/extconf.rb

@@ -62,7 +62,7 @@ EOS
   require 'rubygems'
   require 'mini_portile'
 
-  libgpg_error_recipe = MiniPortile.new('libgpg-error', '1.13').tap do |recipe|
+  libgpg_error_recipe = MiniPortile.new('libgpg-error', '1.17').tap do |recipe|
     recipe.target = File.join(ROOT, "ports")
     recipe.files = ["ftp://ftp.gnupg.org/gcrypt/#{recipe.name}/#{recipe.name}-#{recipe.version}.tar.bz2"]
     recipe.configure_options = [
@@ -79,7 +79,7 @@ EOS
     recipe.activate
   end
 
-  libassuan_recipe = MiniPortile.new('libassuan', '2.1.2').tap do |recipe|
+  libassuan_recipe = MiniPortile.new('libassuan', '2.2.0').tap do |recipe|
     recipe.target = File.join(ROOT, "ports")
     recipe.files = ["ftp://ftp.gnupg.org/gcrypt/#{recipe.name}/#{recipe.name}-#{recipe.version}.tar.bz2"]
     recipe.configure_options = [
@@ -96,7 +96,7 @@ EOS
     recipe.activate
   end
 
-  gpgme_recipe = MiniPortile.new('gpgme', '1.5.1').tap do |recipe|
+  gpgme_recipe = MiniPortile.new('gpgme', '1.5.3').tap do |recipe|
     recipe.target = File.join(ROOT, "ports")
     recipe.files = ["ftp://ftp.gnupg.org/gcrypt/#{recipe.name}/#{recipe.name}-#{recipe.version}.tar.bz2"]
     recipe.configure_options = [

data/ext/gpgme/gpgme_n.c

@@ -1205,6 +1205,9 @@ rb_s_gpgme_op_import_result (VALUE dummy, VALUE vctx)
     rb_raise (rb_eArgError, "released ctx");
 
   result = gpgme_op_import_result (ctx);
+  if (!result)
+    rb_raise (rb_eArgError, "no result");
+
   vresult = rb_class_new_instance (0, NULL, cImportResult);
   rb_iv_set (vresult, "@considered", INT2NUM(result->considered));
   rb_iv_set (vresult, "@no_user_id", INT2NUM(result->no_user_id));
@@ -1517,6 +1520,9 @@ rb_s_gpgme_op_decrypt_result (VALUE dummy, VALUE vctx)
     rb_raise (rb_eArgError, "released ctx");
 
   result = gpgme_op_decrypt_result (ctx);
+  if (!result)
+    rb_raise (rb_eArgError, "no result");
+
   vresult = rb_class_new_instance (0, NULL, cDecryptResult);
   if (result->unsupported_algorithm)
     rb_iv_set (vresult, "@unsupported_algorithm",
@@ -1532,7 +1538,8 @@ rb_s_gpgme_op_decrypt_result (VALUE dummy, VALUE vctx)
       rb_iv_set (vrecipient, "@status", UINT2NUM(recipient->status));
       rb_ary_push (vrecipients, vrecipient);
     }
-  rb_iv_set (vresult, "@file_name", rb_str_new2 (result->file_name));
+  if (result->file_name)
+    rb_iv_set (vresult, "@file_name", rb_str_new2 (result->file_name));
   return vresult;
 }
 
@@ -1595,6 +1602,9 @@ rb_s_gpgme_op_verify_result (VALUE dummy, VALUE vctx)
     rb_raise (rb_eArgError, "released ctx");
 
   verify_result = gpgme_op_verify_result (ctx);
+  if (!verify_result)
+    rb_raise (rb_eArgError, "no result");
+
   vverify_result = rb_class_new_instance(0, NULL, cVerifyResult);
   rb_iv_set (vverify_result, "@signatures", vsignatures);
   for (signature = verify_result->signatures; signature;
@@ -1778,6 +1788,9 @@ rb_s_gpgme_op_sign_result (VALUE dummy, VALUE vctx)
     rb_raise (rb_eArgError, "released ctx");
 
   result = gpgme_op_sign_result (ctx);
+  if (!result)
+    rb_raise (rb_eArgError, "no result");
+
   vresult = rb_class_new_instance (0, NULL, cSignResult);
   vinvalid_signers = rb_ary_new ();
   rb_iv_set (vresult, "@invalid_signers", vinvalid_signers);
@@ -1893,6 +1906,9 @@ rb_s_gpgme_op_encrypt_result (VALUE dummy, VALUE vctx)
     rb_raise (rb_eArgError, "released ctx");
 
   result = gpgme_op_encrypt_result (ctx);
+  if (!result)
+    rb_raise (rb_eArgError, "no result");
+
   vresult = rb_class_new_instance (0, NULL, cEncryptResult);
   vinvalid_recipients = rb_ary_new ();
   rb_iv_set (vresult, "@invalid_recipients", vinvalid_recipients);

data/lib/gpgme/key.rb

@@ -151,6 +151,12 @@ module GPGME
       end
     end
 
+    ##
+    # Returns true if the key has an expiry date else false
+    def expires?
+      primary_subkey.expires?
+    end
+
     ##
     # Returns the expiry date for this key
     def expires

data/lib/gpgme/sub_key.rb

@@ -8,16 +8,25 @@ module GPGME
     include KeyCommon
 
     def timestamp
-      Time.at(@timestamp)
+      case @timestamp
+      when -1, 0
+        # FIXME: add a special value for invalid timestamp, or throw an error
+        return nil
+      else
+        return Time.at(@timestamp)
+      end
+    end
+
+    def expires?
+      @expires != 0
     end
 
     def expires
-      Time.at(@expires)
+      expires? ? Time.at(@expires) : nil
     end
 
     def expired
-      return false if @expires == 0
-      @expires < Time.now.to_i
+      expires? && @expires < Time.now.to_i
     end
 
     def sha

data/test/ctx_test.rb

@@ -127,6 +127,29 @@ describe GPGME::Ctx do
     # it ":progress_callback_value"
   end
 
+  describe :decrypt_result do
+    it "returns the list of encyption recipients" do
+      cipher = GPGME::Data.new(KEY_1_ENCRYPTED)
+      output = GPGME::Data.new
+
+      GPGME::Ctx.new do |ctx|
+        ctx.decrypt_verify(cipher, output)
+        assert_equal 1, ctx.decrypt_result.recipients.size
+      end
+    end
+
+    it "should not segfault" do
+      cipher = GPGME::Data.new(KEY_1_ENCRYPTED)
+      ouput = GPGME::Data.new
+      
+      GPGME::Ctx.new do |ctx|
+        assert_raises ArgumentError do
+          ctx.decrypt_result
+        end
+      end
+    end
+  end
+
   describe :armor do
     it "sets false by default" do
       ctx = GPGME::Ctx.new

data/test/support/resources.rb

@@ -492,6 +492,8 @@ KEYS << { :sha => 'test2@example.com', :public => key2_public, :secret => key2_s
 KEYS << { :sha => 'test3@example.com', :public => key3_public, :secret => key3_secret}
 KEYS << { :sha => 'test4@example.com', :public => key4_public, :secret => key4_secret}
 
+PLAIN_KEY = { :sha => 'test1@example.com', :public => key1_public, :secret => key1_secret }
+
 PASSWORD_KEY = {
   :sha    => 'test_with_password@example.com',
   :public => password_key_public,
@@ -514,3 +516,17 @@ TEXT = {
   :passwored        => passwored.chomp,
   :expired_key_sign => signed_with_expired_key_text.chomp
 }
+
+KEY_1_ENCRYPTED = <<-RUBY
+-----BEGIN PGP MESSAGE-----
+Version: GnuPG v1
+
+hIwDbJ4P+uQnvtQBBACOzUqiKHRS8cEDPpQl1dQznpxcWW3Md8X3eFRx3+qD0X7+
+aEadz/cUXf7nO9KimeO7qhqNBJoPQEzZTqirebLgq2pq+Rtp2zGCvU1hUnAmVm27
+CZE/quNaBV33V0haddWm4Y8AD7e7T2a2LBDrMNGsD9eKjREJ+g/Pmm5WLRDx69JP
+AaXe0Msjfyapj07hCPZptE8iP2/tCSvRDmiSgidPAZM4NnL2ANwfT6kslVha0mos
+MH+qcPlxAMrMnjuWs+wFiVnWLEYfIqNzH7Z2irC2NA==
+=O59i
+-----END PGP MESSAGE-----
+RUBY
+

data/test/test_helper.rb

@@ -16,9 +16,14 @@ require 'minitest/autorun'
 require 'minitest/spec'
 require 'minitest/pride'
 require 'mocha'
-require 'ruby-debug'
 require 'gpgme'
 
+if RUBY_VERSION.split('.').first.to_i > 1
+  require 'byebug'
+else
+  require 'ruby-debug'
+end
+
 require File.dirname(__FILE__) + "/support/resources"
 
 

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: gpgme
 version: !ruby/object:Gem::Version
-  version: 2.0.7
+  version: 2.0.8
+  prerelease: 
 platform: ruby
 authors:
 - Daiki Ueno
@@ -9,31 +10,28 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-09 00:00:00.000000000 Z
+date: 2014-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mini_portile
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.5.0
-    - - <=
-      - !ruby/object:Gem::Version
-        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.5.0
-    - - <=
-      - !ruby/object:Gem::Version
-        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -41,6 +39,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -48,6 +47,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -55,6 +55,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,6 +63,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -69,6 +71,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -76,20 +79,23 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: debugger
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -97,86 +103,87 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.6.6
-description: |-
-  Ruby-GPGME is a Ruby language binding of GPGME (GnuPG
+description: ! 'Ruby-GPGME is a Ruby language binding of GPGME (GnuPG
+
   Made Easy). GnuPG Made Easy (GPGME) is a library designed to make access to
+
   GnuPG easier for applications. It provides a High-Level Crypto API for
-  encryption, decryption, signing, signature verification and key management.
+
+  encryption, decryption, signing, signature verification and key management.'
 email: ueno@gnu.org
 executables: []
 extensions:
 - ext/gpgme/extconf.rb
 extra_rdoc_files: []
 files:
-- lib/gpgme.rb
-- lib/gpgme/error.rb
+- lib/gpgme/ctx.rb
+- lib/gpgme/io_callbacks.rb
+- lib/gpgme/crypto.rb
+- lib/gpgme/user_id.rb
 - lib/gpgme/version.rb
-- lib/gpgme/signature.rb
-- lib/gpgme/engine.rb
-- lib/gpgme/key.rb
-- lib/gpgme/misc.rb
 - lib/gpgme/data.rb
-- lib/gpgme/io_callbacks.rb
-- lib/gpgme/key_sig.rb
-- lib/gpgme/constants.rb
+- lib/gpgme/misc.rb
 - lib/gpgme/sub_key.rb
-- lib/gpgme/compat.rb
+- lib/gpgme/error.rb
+- lib/gpgme/key.rb
+- lib/gpgme/constants.rb
+- lib/gpgme/signature.rb
+- lib/gpgme/engine.rb
 - lib/gpgme/key_common.rb
-- lib/gpgme/ctx.rb
-- lib/gpgme/crypto.rb
-- lib/gpgme/user_id.rb
-- ext/gpgme/gpgme_n.c
+- lib/gpgme/compat.rb
+- lib/gpgme/key_sig.rb
+- lib/gpgme.rb
 - ext/gpgme/extconf.rb
-- test/key_test.rb
-- test/sub_key_test.rb
-- test/test_helper.rb
-- test/data_test.rb
-- test/crypto_test.rb
+- ext/gpgme/gpgme_n.c
 - test/gpgme_test.rb
+- test/data_test.rb
+- test/files/testkey_pub.gpg
+- test/files/testkey_sec.gpg
 - test/signature_test.rb
-- test/support/resources.rb
+- test/crypto_test.rb
 - test/ctx_test.rb
-- test/files/testkey_sec.gpg
-- test/files/testkey_pub.gpg
-- examples/sign.rb
+- test/support/resources.rb
+- test/test_helper.rb
+- test/sub_key_test.rb
+- test/key_test.rb
+- examples/keylist.rb
+- examples/edit.rb
 - examples/roundtrip.rb
 - examples/verify.rb
 - examples/genkey.rb
-- examples/keylist.rb
-- examples/edit.rb
-- ports/archives/libassuan-2.1.2.tar.bz2.sig
-- ports/archives/libgpg-error-1.13.tar.bz2
-- ports/archives/gpgme-1.5.1.tar.bz2
-- ports/archives/libassuan-2.1.2.tar.bz2
-- ports/archives/gpgme-1.5.1.tar.bz2.sig
+- examples/sign.rb
+- ports/archives/libassuan-2.2.0.tar.bz2
+- ports/archives/libgpg-error-1.17.tar.bz2
+- ports/archives/gpgme-1.5.3.tar.bz2
 homepage: http://github.com/ueno/ruby-gpgme
 licenses:
 - LGPL-2.1+
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 - ext
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: ruby-gpgme
-rubygems_version: 2.1.11
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Ruby binding of GPGME.
 test_files: []
-has_rdoc: true

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: ddad2098d7948b2270488e28182d4cb8caab2dcf
-  data.tar.gz: f7df6a6384be5d81de6695158a5cf1b858f9402d
-SHA512:
-  metadata.gz: ddc16711b30e02461dbf3d570e88aa48b97993b7741baf5354ce79a7d1f17789cd430a68d25244e3b4f212f77c2b93a204385e26957f23c9413f4b6e6aae4629
-  data.tar.gz: 21112836148bf1a1f976c8b3890b27a38e69506e69b21dfd09b00c74bec3dae93f561c1ef4c70d71bbac381b3cd039cde9294e7ea95d40f6fb024f3b8d16f09a