gpgme 2.0.18 → 2.0.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: a49b16c07c13ffabf1863cda30eaedde8a0f20c7d4d43b0a720d2a1c4a5b0e5e
-  data.tar.gz: 8b6b8eadee6e26459aea02072630407a61c2115a23b12f093404f674f2804c7c
+SHA1:
+  metadata.gz: 85da3b0448319c6fd01c1004e64b2dc9956bc162
+  data.tar.gz: 843c3a9d2d6dc2c22e88c97fda497c36fc107f9e
 SHA512:
-  metadata.gz: 02c849c3ff6422f5d83aa9ceec3c18e588fbff50f3fb58ed77524aacd563a3d9b8d6d6772723bdc213eb2af38fe5f341ff8177521e7575f3c9285e580e866f8c
-  data.tar.gz: 384b74ba60aee10134d4dada885cb34b1c4b509026b8fb6e77f2e7bf5b06bd982797f123670780e2cf2ac933158d4cb442ffe704d84d2796e1ba42a13705b92b
+  metadata.gz: 8c7e91e339472d57de455c3e3f38fc37f7fcdfaf0cd003053eca160f48e4c459ddfa09c4d559fa6aaaef2596da5be450114986539ea6168a25802c852bd95065
+  data.tar.gz: dc5de7e968adea666fc353be5e7368b7087fbccc4d301fb07aacba0d22ba309cb5256269118c69b8565bd721c872fdf89cf217c988f523dcbf7919b445d3c7e0

data/lib/gpgme/ctx.rb

@@ -370,8 +370,8 @@ module GPGME
     #
     # If passed, the key will be exported to +keydata+, which must be
     # a {GPGME::Data} object.
-    def export_keys(recipients, keydata = Data.new)
-      err = GPGME::gpgme_op_export(self, recipients, 0, keydata)
+    def export_keys(recipients, keydata = Data.new, mode=0)
+      err = GPGME::gpgme_op_export(self, recipients, mode, keydata)
       exc = GPGME::error_to_exception(err)
       raise exc if exc
       keydata

data/lib/gpgme/data.rb

@@ -165,8 +165,16 @@ module GPGME
     end
 
     ##
-    # Sets the encoding for this buffer. Accepts only values in one of the
-    # DATA_ENCODING_* constants.
+    # Sets the encoding for this buffer. Accepts only integer values 0 to 7:
+    #
+    # 0 = GPGME_DATA_ENCODING_NONE   (Not specified)
+    # 1 = GPGME_DATA_ENCODING_BINARY
+    # 2 = GPGME_DATA_ENCODING_BASE64
+    # 3 = GPGME_DATA_ENCODING_ARMOR  (Either PEM or OpenPGP Armor)
+    # 4 = GPGME_DATA_ENCODING_URL    (LF delimited URL list)
+    # 5 = GPGME_DATA_ENCODING_URLESC (Ditto, but percent escaped)
+    # 6 = GPGME_DATA_ENCODING_URL0   (Nul delimited URL list)
+    # 7 = GPGME_DATA_ENCODING_MIME   (Data is a MIME part)
     #
     # @raise [GPGME::Error::InvalidValue] if the value isn't accepted.
     def encoding=(encoding)

data/lib/gpgme/key.rb

@@ -81,6 +81,7 @@ module GPGME
       # @param [Hash] options
       #   * +:output+ specify where to write the key to. It will be converted to
       #     a {GPGME::Data}, so it could be a file, for example.
+      #   * +:minimal+ set to true to let the export mode be 'minimal'.
       #   * Any other option accepted by {GPGME::Ctx.new}
       #
       # @return [GPGME::Data] the exported key.
@@ -94,9 +95,14 @@ module GPGME
       #
       def export(pattern, options = {})
         output = Data.new(options[:output])
+        if options.delete(:minimal) == true
+          export_mode = 4
+        else
+          export_mode = 0
+        end
 
         GPGME::Ctx.new(options) do |ctx|
-          ctx.export_keys(pattern, output)
+          ctx.export_keys(pattern, output, export_mode)
         end
 
         output.seek(0)
@@ -122,6 +128,12 @@ module GPGME
           ctx.import_result
         end
       end
+
+      # Checks if a key is valid
+      def valid?(key)
+        GPGME::Key.import(key).considered == 1
+      end
+
     end
 
     ##

data/lib/gpgme/version.rb

@@ -1,4 +1,4 @@
 module GPGME
   # The version of GPGME ruby binding you are using
-  VERSION = "2.0.18"
+  VERSION = "2.0.19"
 end

data/test/crypto_test.rb

@@ -128,6 +128,11 @@ describe GPGME::Crypto do
   end
 
   describe "symmetric encryption/decryption" do
+    before do
+      info = GPGME::Engine.info.first
+      skip if /\A2\.[01]|\A1\./ === info.version
+    end
+
     it "requires a password to encrypt" do
       assert_raises GPGME::Error::BadPassphrase do
         GPGME::Crypto.new.encrypt TEXT[:plain], :symmetric => true

data/test/ctx_test.rb

@@ -27,6 +27,11 @@ describe GPGME::Ctx do
   end
 
   describe :new do
+    before do
+      info = GPGME::Engine.info.first
+      skip if /\A2\.[01]|\A1\./ === info.version
+    end
+
     # We consider :armor, :protocol, :textmode and :keylist_mode as tested
     # with the other tests of this file. Here we test the rest
 
@@ -399,6 +404,26 @@ RUBY
       import_keys # If the test fails for some reason, it won't break others.
     end
 
+    it "exports a minimal key if given the mode" do
+      remove_all_keys
+      GPGME::Key.import(KEY_WITH_SIGNATURE[:public])
+      key = GPGME::Key.find(KEY_WITH_SIGNATURE[:sha]).first
+      output_normal = GPGME::Data.new
+      output_minimal = GPGME::Data.new
+      ctx = GPGME::Ctx.new
+
+      ctx.export_keys(key.sha, output_normal)
+      ctx.export_keys(key.sha, output_minimal, 4)
+
+      output_normal.seek(0)
+      output_minimal.seek(0)
+
+      assert_equal output_normal.read.size, 849
+      assert_equal output_minimal.read.size, 668
+
+      import_keys # If the test fails for some reason, it won't break others.
+    end
+
     it "exports only one key" do
       original_keys = GPGME::Key.find(:public)
       key           = original_keys.first

data/test/files/testkey_pub_invalid.gpg

@@ -0,0 +1,52 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.11 (Darwin)
+
+QmSuBE1tOWYRDAC0MiL/mUsW1I18H9TZzurEXM0HMxFcQ5LlGm+0Zk+tSI/AVk4G
+mZRppURYAFPyOQLOT6sm4vPXJ29uRJ8WSHtryg1HqPvIPauZVB9tSW10K7gmpdSd
+pty2/QGa8dNEnlMIJN8Kti0qaU72jfBH1r3mdpZ+P4KNFIKgYTbavzJ3GOtrypBz
+K52nH/baQM3wBQ31JKsM8qJy3Vf5jmc1vD3bim3QMarjKRPeE3e6T3iwrtc9MG8N
+ayD/taUUeunkEIMO6B1iRykSF+7i8RlOVv9ubJEi92VfMGw5QEnmjKJf/v/GRsFt
+82Y7zQ7x4MmZgUITubePKRrYnF1BSBAwk4Mn6r8lXjmEN+xNQlR7T69WiSbEi3NM
+dcSP+kBNZIqY20szsjb+0MrA1A9/H7cS7ITZ3eQmCw5b77lzA2n588D6cw/EBgvf
+jiepPhh5az/La1OFVeSKXUJeLrWbJQyxZ312INWe0IctmMy8Y8jmdtsZSQ7oKbDR
+zF1+Rx9DCYD+vIsBAPp4UUg+SMV4KKgco36G69hXOY0smR8MUD0VnwUNyWE9C/9k
+tzK6s6z7MDd1uruGemxPRCHnxs520IFPcgStTNpc6KpmncZEL1/GWZeXYcs+Syn/
+c0GhB4wkvvXNP9zKEmXRE+qVX2ogxcuC4Ckfor9qvYcCc2ANRn6YhTlebftLf5F/
+G/fg1oLE0OU7nDha5773LptXomchK11yeDXlMWfS5LOV/KlqNoLJrOlcvvQmnVhT
+tIBNuRYAF86cfI2hegRvshGOEEEzeq0UvNy6487jC9y6lSR5vLa6IfT63EeqJ0mP
+5WOrE4NW2CYoDlsQhq37WNaeYTDXhqVDlgMhrbvNCL2L6XYp8qeat1KAx8lwiiay
+KGa9/2AEJy4/WBB2n14y/g4/cQCHgcT+jQuLwD5iI52+jWo97a3+EUUYyUbYLPAc
+qWybT2qKMB6i4DlnBFsCgaCkASEYGtcslRo1m+LABosiz/CyNyeo4QkyH+zWEPfj
+uANKuKK6HFHFhef3YWknPsRM3TA/GkMhQ2t5Tvow1VyOMaRRKiiCyGXt+WZoG3YL
+/2+v3W/le6SJ0cQYXxwp1KDOniWh7it8Ao7F+Iwyj9qxTTGWcPM0pISZnvj37H0k
+n6xpHLOnGed8jbI4UwFgNOvxSR2RFfRepkbxijq9U0sHsf1HQr/vH8knlaP4ABR+
+g8aKgh6wUmUJx0Mv9pUHZGPpp5KK4258p13mih5aNv5qsItmKB7Aeyz10G8K/9dk
+jTK3FOrY322+jdqbsFUnxtGPdfERHw7J2x5b0nPoZfJY+OhP14s6M3lt2QJzdckH
+y5+Y7xu57xZcNzsfdnIAguLNOf++eWF9YLcJaISnUnHPLa33VWxydtqGoOkAyEsK
+MqrPUpjifKjp7qXW1PDK5nAt7TjlB2azvvU7ufNgUsuBMa+dVlQAqVlLdpelLJmO
+iIP/kbrvNPZyhNN9cAF5fPf6hgDKeDntClZRamm8eYsCsXVfDp2DS7mtaMz+JJix
+U1FbEqeZ4J0mVaVVjhTK0Jxf/h350vhtpI3BYBoZV2bKKDo5AU3lIi/ddqs5w0XW
+DrQeQWxiZXJ0IExsb3AgPG1yc2ltb0BnbWFpbC5jb20+iHoEExEIACIFAk1tOWYC
+GwMGCwkIBwMCBhUIAgkKCwQWAgMBAh4BAheAAAoJEMtSkEI32/chiKgA/187q1bG
+FdtPf0olhUhK1CUqBqVMjZe11zMhDpdCXZq3AP9rtghGL4D7ns5l7bGRYUJsM9Yf
+3JMcyjoGF+JMtUm9HLkDDQRNbTlmEAwAg4yYYYb3COMNMyL2y+czsPn8Cq4OsaLy
+s5P5e5hM4c7StjwebJS2PjRyv2Iez7d2ZPDgNE/zvTOFv9XVALGMjZlXlEssYrDu
+/CNgboeSdU1ZmPO9WCHp1ig3UB8ySS/KayW1N6FXCDazp1WGXke7YIO8H+VeLHaA
+E7XDluJa8Cw9Wwz2i0BlUSHQLuMw0k1wHIV/t0XBBOONeGg3aJB97th0ifg6Pd1P
+IEDhmzpGyPwlg+HZEobqNdLfIQd34HIuXa5UeHaXAFhUFD2mIaIl6CiXRRf9EDcu
+QmPUs4IXZJDsWC4mS5T9PHgyHRP5geml6IAtN2627eaKDPx5VeC8DSG/6oMrFzNB
+VxCd5t3Exzi+3ZOOTJnECMABZc6lK7rIOiQHHLW6vHIy5MggT/Dz6NuQuT9ID2uO
+wzx6w9XMdRXJ0uuEJlhTZtcjlKu+B8i9hHgj1zqNT67Zkkz0/YTVHtNYDpOzjc7A
+c+m/Qok/ERUjVcYS6dIJnJU+3V4L5APTAAMFC/sHCYUR5oa/uCktq//r09xRc/bu
+4uuzNJvsLzHcUA4udFSq2AneqrH/HCkrE0G4U79GMVpSddb+IamNWgJwfk4YHfNV
+Vx2NhAWoCAIve0q+ueXGTGKkHyb0QobT/AmM/4Mtuln7cUfrkEmI8N8YIwPDqCGz
+rWxvoPaOSUSxNfkyrV6IX8vjotx3NKm9n/6f5l/ncDrNSNruSywMq0fiLYS1+bCb
+jsrTfWJKcM284ZwazKgcuhcCkXombkNQtQv7uD8FveWNVhC+LXtsyLGrzFNJVbNr
+khKYfUFyoMY50PdvF4Ai1uJ0IYXQvIPnHbxPXMWa5PezrTWzlIXaVvVfgypC/tCY
+p1QgiS+ln60NoK1m2ZFrUO3rklM44L1BNO9qjrUjYFVlmRd+qEBoXWGJLFp1g7Nh
+1mijiKdrwmCzWsnRSmPRYtOujeojP8bH4ca9RekwqLbRVeX/dLi02GD0pOp6SI6B
+Bk3J0Wzp2Ko47Vj8v03hdBozKZT93a4NeyrNZdiIYQQYEQgACQUCTW05ZgIbDAAK
+CRDLUpBCN9v3ISGmAP0VXwY7BH81NRpwAYp/eeSGP1vxBCdqVAHMc4o3TUoWHAEA
+vioivJ/Qvnb7nlHwagl5rLNXhiz/H71jmFS9x0x7FLg=
+=T/Ce
+-----END PGP PUBLIC KEY BLOCK-----

data/test/key_test.rb

@@ -66,13 +66,13 @@ describe GPGME::Key do
     # Testing the lazy way with expectations. I think tests in
     # the Ctx class are enough.
     it "exports any key that matches the pattern" do
-      GPGME::Ctx.any_instance.expects(:export_keys).with("", anything)
+      GPGME::Ctx.any_instance.expects(:export_keys).with("", anything, 0)
       GPGME::Key.export("")
     end
 
     it "exports any key that matches the pattern, can specify output" do
       data = GPGME::Data.new
-      GPGME::Ctx.any_instance.expects(:export_keys).with("wadus", data)
+      GPGME::Ctx.any_instance.expects(:export_keys).with("wadus", data, 0)
       ret = GPGME::Key.export("wadus", :output => data)
       assert_equal data, ret
     end
@@ -81,6 +81,11 @@ describe GPGME::Key do
       GPGME::Ctx.expects(:new).with(:armor => true).yields(mock(:export_keys => true))
       GPGME::Key.export("wadus", :armor => true)
     end
+
+    it "can export a minimal key" do
+      GPGME::Ctx.any_instance.expects(:export_keys).with("wadus", anything, 4)
+      GPGME::Key.export("wadus", :minimal => true)
+    end
   end
 
   describe "#export" do
@@ -180,7 +185,7 @@ describe GPGME::Key do
 
     with_key EXPIRED_KEY do
       key = GPGME::Key.find(:secret, EXPIRED_KEY[:sha]).first
-      assert key.expired
+      assert key.expired if key
     end
   end
 
@@ -199,6 +204,18 @@ describe GPGME::Key do
     end
   end
 
+  describe :valid? do
+    it "returns true on a valid key" do
+      valid_key = File.read("test/files/testkey_pub.gpg")
+      assert GPGME::Key.valid?(valid_key)
+    end
+
+    it "returns false on an invalid key" do
+      invalid_key = File.read("test/files/testkey_pub_invalid.gpg")
+      assert !GPGME::Key.valid?(invalid_key)
+    end
+  end
+
   describe :to_s do
     it "can be coerced into a String" do
       key = GPGME::Key.find(:secret).first
@@ -206,4 +223,3 @@ describe GPGME::Key do
     end
   end
 end
-

data/test/pinentry

@@ -0,0 +1,22 @@
+#! /bin/bash
+# Dummy pinentry
+# 
+# Copyright 2008 g10 Code GmbH
+# 
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+# 
+# This file is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+# PURPOSE.
+
+echo OK Your orders please
+
+while read cmd; do
+  case $cmd in
+    GETPIN) echo D gpgme; echo OK;;
+    *) echo OK;;
+  esac
+done

data/test/sub_key_test.rb

@@ -26,8 +26,11 @@ describe GPGME::SubKey do
     refute subkey.expired
 
     with_key EXPIRED_KEY do
-      subkey = GPGME::Key.find(:secret, EXPIRED_KEY[:sha]).first.primary_subkey
-      assert subkey.expired
+      key = GPGME::Key.find(:secret, EXPIRED_KEY[:sha]).first
+      if key
+        subkey = key.primary_subkey
+        assert subkey.expired
+      end
     end
   end
 

data/test/support/resources.rb

@@ -386,6 +386,31 @@ HyEbgNA=
 -----END PGP PRIVATE KEY BLOCK-----
 RUBY
 
+key_with_signature = <<-RUBY
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mI0ETbL4sAEEANBs/WsOxRCLdsW1h8LKGT6eJpAs6omGV/G7TJnMsk92BUIub3oZ
+9oRC1L0l4EKB6o8/vULziT815dbbVxwQIOyDXEqP4sokRxjSNNkpPb+RuIjdmP6e
+SJ2NxCxV/GxLhjZZTHG5SPH4Gei3TtdiHMHoar0rwEcVdS693K/6Ww8ZABEBAAG0
+IVRlc3QgbnVtYmVyIDEgPHRlc3QxQGV4YW1wbGUuY29tPoi4BBMBAgAiBQJNsviw
+AhsDBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAKCRD7yLd2W11cdyxOA/4gPEK1
+qF8bp0YJfc91Ob/J70N5gNuO06AeBa8o6MHTUheCp5CMFD8RISDegsiYey3O+Wvk
+rg+BmIQWqGTglDIDOM8B1Bmc+T+C0sRwIwmHqDo5a9mR2QnlcFqZ3SNV5MdxDUa4
+GJk4LbUj/JwU2nR8Z4eA7OC1LjOexFKAfLX654izBBABCAAdFiEEVsoxCW7JMuDZ
+Ydv9OSviynfWZWYFAl1ziQcACgkQOSviynfWZWYScwP/a/shuIWvLCZLllW0YWy8
+NUPgTZ4TnJogOp4zm9+uNla9GJepM1Wj7+m1ZNzXskqESoAB00k2dYOGwek0hPHp
+1MwpcMJvAu7m+LrfGVcG6IAkjQWvifsP8QIe05yNW3jsK+qQJpy1dejzgaHt7dLL
+/rS6ySBxhIvpo5tsfe+C8PO4jQRNsviwAQQAvVKqiSoVA6oQ8nT3zLEGDgNeED3M
+fHMeYbFMi7GTpvURsTXcPH0SLXzGVn8Aevaa+ConFWMQuWMsTPiqVQR6/kKE8RJ/
+ynDHbnXuOGNdOBd96GdsIgqTMwrtWVvzhSKFrhDB1y8iFyQ9QlVTJG4jo8EcaN6L
+T0hoo64XJktD5CUAEQEAAYifBBgBAgAJBQJNsviwAhsMAAoJEPvIt3ZbXVx3X/8E
+AIiCsyWlIOUvhFN5a/V2TyA2XjXEKSn9iWi7uLhVT7ShrWSGGhdNBwiqJuDh5KxX
+3VXa9fePMXrfbALdj1fRqCAFfKZAcKrNNls+psSaYLJwLhCUzD8Ht9M+LrGeZDPz
+wzAqTfgPb5M2Inssarr5Lpdlu1X8y37cfNVHscqBZyfS
+=KOQt
+-----END PGP PUBLIC KEY BLOCK-----
+RUBY
+
 encrypted_text = <<-RUBY
 -----BEGIN PGP MESSAGE-----
 Version: GnuPG v1.4.11 (Darwin)
@@ -506,6 +531,11 @@ EXPIRED_KEY = {
   :secret => expired_key_secret
 }
 
+KEY_WITH_SIGNATURE = {
+  :sha    => 'test1@example.com',
+  :public => key_with_signature
+}
+
 TEXT = {
   :plain            => "Hi there",
   :encrypted        => encrypted_text.chomp,

data/test/test_helper.rb

@@ -99,11 +99,17 @@ def ensure_keys(proto)
     # We use a different home directory for the keys to not disturb current
     # installation
     require 'tmpdir'
+    require 'pathname'
 
     if DIRS.empty?
       dir = Dir.mktmpdir
       GPGME::Engine.home_dir = dir
       DIRS.push(dir)
+      pinentry = Pathname.new(__FILE__).dirname + 'pinentry'
+      gpg_agent_conf = Pathname.new(dir) + 'gpg-agent.conf'
+      gpg_agent_conf.open('w+') {|io|
+        io.write("pinentry-program #{pinentry}\n")
+      }
       remove_all_keys
       import_keys
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gpgme
 version: !ruby/object:Gem::Version
-  version: 2.0.18
+  version: 2.0.19
 platform: ruby
 authors:
 - Daiki Ueno
@@ -141,9 +141,11 @@ files:
 - test/ctx_test.rb
 - test/data_test.rb
 - test/files/testkey_pub.gpg
+- test/files/testkey_pub_invalid.gpg
 - test/files/testkey_sec.gpg
 - test/gpgme_test.rb
 - test/key_test.rb
+- test/pinentry
 - test/signature_test.rb
 - test/sub_key_test.rb
 - test/support/resources.rb
@@ -169,7 +171,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: ruby-gpgme
-rubygems_version: 2.7.3
+rubygems_version: 2.6.14.3
 signing_key: 
 specification_version: 4
 summary: Ruby binding of GPGME.