gpgme 2.0.22 → 2.0.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c4dc4765cd73bfd27c0ebdfff8749106341f2dd7a6c0118a4e3307798b753e84
-  data.tar.gz: 6b929a3f84144a4fdcc40382129bd6ad409e9a819c956f33941a8d650000c70c
+  metadata.gz: 8d1c8d00babf6af92b5889c2c96abc06a9a3c7d9da0b8201012970778919ea20
+  data.tar.gz: 841d821ead85e9e51ef7b239701acba33bb4d4129dc043af8f47ef0470ab6032
 SHA512:
-  metadata.gz: 387806727ae8b6d8da14fc23ce7c9a24c58373b52f79b4bce8ca1f7de2337e715c488c7af65e30ac8e6e73a18c8d31589b00f80c682f0dcbcce1f4d234cc58a3
-  data.tar.gz: bbfa653feac228f87c430fa61524625d373ff6dd0a33d5c824c50d94db59233ab6161d8ac1b6e475db21ce9908f22b45bce17fff5c6cba92f9bb959b49b297b8
+  metadata.gz: 6610600eac90798c4904825fe94c125ddf0605ce964ba6412a182e1a1817bfc5656b1090cb478ae3da6f5d0f42554bf543b02027dc25252e3dc21961869bcd3d
+  data.tar.gz: e9c9a21ffc43bb7cfe123a0055c79a556528c553c53fd6c5fa09cc3a91791633f8b0f1efa43a2782c8846da4cc8888934ff3bb533145b244e4a617c33c5856e2

data/ext/gpgme/extconf.rb

@@ -25,25 +25,28 @@ if arg_config('--clean')
 
     # clean the ports build directory
     Pathname.glob(pwd.join('tmp', '*', 'ports')) { |dir|
-      FileUtils.rm_rf(dir, { :verbose => true })
-      FileUtils.rmdir(dir.parent, { :parents => true, :verbose => true })
+      FileUtils.rm_rf(dir, verbose: true)
+      FileUtils.rmdir(dir.parent, parents: true, verbose: true)
     }
 
     # ports installation can be safely removed if statically linked.
-    FileUtils.rm_rf(root + 'ports', { :verbose => true })
+    FileUtils.rm_rf(root + 'ports', verbose: true)
   end
 
   exit
 end
 
 if arg_config('--use-system-libraries', ENV['RUBY_GPGME_USE_SYSTEM_LIBRARIES'])
-  unless find_executable('pkg-config')
-    $stderr.puts("pkg-config not found")
+  if find_executable('pkg-config') && system('pkg-config gpgme --exists')
+    $CFLAGS += ' ' << `pkg-config --cflags gpgme`.chomp
+    $libs += ' ' << `pkg-config --libs gpgme`.chomp
+  elsif find_executable('gpgme-config')
+    $CFLAGS += ' ' << `gpgme-config --cflags`.chomp
+    $libs += ' ' << `gpgme-config --libs`.chomp
+  else
+    $stderr.puts("pkg-config with gpgme.pc and gpgme-config not found")
     exit(1)
   end
-
-  $CFLAGS += ' ' << `pkg-config --cflags gpgme`.chomp
-  $libs += ' ' << `pkg-config --libs gpgme`.chomp
 else
   message <<-'EOS'
 ************************************************************************
@@ -62,11 +65,11 @@ EOS
   require 'rubygems'
   require 'mini_portile2'
 
-  libgpg_error_recipe = MiniPortile.new('libgpg-error', '1.46').tap do |recipe|
+  libgpg_error_recipe = MiniPortile.new('libgpg-error', '1.47').tap do |recipe|
     recipe.target = File.join(ROOT, "ports")
     recipe.files = [{
       :url => "https://www.gnupg.org/ftp/gcrypt/#{recipe.name}/#{recipe.name}-#{recipe.version}.tar.bz2",
-      :sha256 => 'b7e11a64246bbe5ef37748de43b245abd72cfcd53c9ae5e7fc5ca59f1c81268d'
+      :sha256 => '9e3c670966b96ecc746c28c2c419541e3bcb787d1a73930f5e5f5e1bcbbb9bdb'
     }]
     recipe.configure_options = [
       '--enable-install-gpg-error-config',
@@ -83,11 +86,11 @@ EOS
     recipe.activate
   end
 
-  libassuan_recipe = MiniPortile.new('libassuan', '2.5.5').tap do |recipe|
+  libassuan_recipe = MiniPortile.new('libassuan', '2.5.6').tap do |recipe|
     recipe.target = File.join(ROOT, "ports")
     recipe.files = [{
       :url => "https://www.gnupg.org/ftp/gcrypt/#{recipe.name}/#{recipe.name}-#{recipe.version}.tar.bz2",
-      :sha256 => '8e8c2fcc982f9ca67dcbb1d95e2dc746b1739a4668bc20b3a3c5be632edb34e4'
+      :sha256 => 'e9fd27218d5394904e4e39788f9b1742711c3e6b41689a31aa3380bd5aa4f426'
     }]
     recipe.configure_options = [
       '--disable-shared',
@@ -103,11 +106,11 @@ EOS
     recipe.activate
   end
 
-  gpgme_recipe = MiniPortile.new('gpgme', '1.18.0').tap do |recipe|
+  gpgme_recipe = MiniPortile.new('gpgme', '1.21.0').tap do |recipe|
     recipe.target = File.join(ROOT, "ports")
     recipe.files = [{
       :url => "https://www.gnupg.org/ftp/gcrypt/#{recipe.name}/#{recipe.name}-#{recipe.version}.tar.bz2",
-      :sha256 => '361d4eae47ce925dba0ea569af40e7b52c645c4ae2e65e5621bf1b6cdd8b0e9e'
+      :sha256 => '416e174e165734d84806253f8c96bda2993fd07f258c3aad5f053a6efd463e88'
     }]
     recipe.configure_options = [
       '--disable-shared',
@@ -123,7 +126,7 @@ EOS
       '--disable-g13-test',
       # We only need the C API.
       '--disable-languages',
-      "CFLAGS=-fPIC #{ENV["CFLAGS"]}",
+      "CFLAGS=-D_LARGEFILE64_SOURCE -fPIC #{ENV["CFLAGS"]}",
     ]
     checkpoint = "#{recipe.target}/#{recipe.name}-#{recipe.version}-#{recipe.host}.installed"
     unless File.exist?(checkpoint)

data/ext/gpgme/gpgme_n.c

@@ -514,6 +514,46 @@ rb_s_gpgme_release (VALUE dummy, VALUE vctx)
   return Qnil;
 }
 
+static VALUE
+rb_s_gpgme_set_ctx_flag (VALUE dummy, VALUE vctx, VALUE vname, VALUE vstr)
+{
+  gpgme_ctx_t ctx;
+  gpgme_error_t err;
+  char* name;
+  char* str;
+
+  name = StringValueCStr(vname);
+  str = StringValueCStr(vstr);
+
+  UNWRAP_GPGME_CTX(vctx, ctx);
+  if (!ctx)
+    rb_raise (rb_eArgError, "released ctx");
+
+  err = gpgme_set_ctx_flag(ctx, name, str);
+  return LONG2NUM(err);
+}
+
+static VALUE
+rb_s_gpgme_get_ctx_flag (VALUE dummy, VALUE vctx, VALUE vname)
+{
+  gpgme_ctx_t ctx;
+  const char* name;
+  int yes;
+
+  name = StringValueCStr(vname);
+
+  UNWRAP_GPGME_CTX(vctx, ctx);
+  if (!ctx)
+    rb_raise (rb_eArgError, "released ctx");
+
+  const char* result;
+  result = gpgme_get_ctx_flag(ctx, name);
+  if (result == NULL)
+    rb_raise (rb_eArgError, "incorrect ctx flag name");
+
+  return rb_str_new_cstr(result);
+}
+
 static VALUE
 rb_s_gpgme_set_protocol (VALUE dummy, VALUE vctx, VALUE vproto)
 {
@@ -566,6 +606,42 @@ rb_s_gpgme_get_armor (VALUE dummy, VALUE vctx)
   return INT2FIX(yes);
 }
 
+static VALUE
+rb_s_gpgme_set_ignore_mdc_error (VALUE dummy, VALUE vctx, VALUE vyes)
+{
+  gpgme_ctx_t ctx;
+  gpgme_error_t err;
+  int yes;
+
+  yes = NUM2INT(vyes);
+
+  UNWRAP_GPGME_CTX(vctx, ctx);
+  if (!ctx)
+    rb_raise (rb_eArgError, "released ctx");
+
+  err = gpgme_set_ctx_flag(ctx, "ignore-mdc-error", yes ? "1" : "");
+  return LONG2NUM(err);
+}
+
+static VALUE
+rb_s_gpgme_get_ignore_mdc_error (VALUE dummy, VALUE vctx)
+{
+  gpgme_ctx_t ctx;
+  int yes;
+
+  UNWRAP_GPGME_CTX(vctx, ctx);
+  if (!ctx)
+    rb_raise (rb_eArgError, "released ctx");
+
+  const char* result;
+  result = gpgme_get_ctx_flag(ctx, "ignore-mdc-error");
+  if (result == NULL)
+    rb_raise (rb_eArgError, "incorrect ctx flag name");
+
+  yes = (result && *result)? !!atoi (result) : 0;
+  return INT2FIX(yes);
+}
+
 static VALUE
 rb_s_gpgme_set_textmode (VALUE dummy, VALUE vctx, VALUE vyes)
 {
@@ -876,6 +952,7 @@ rb_s_gpgme_op_keylist_start (VALUE dummy, VALUE vctx, VALUE vpattern,
   return LONG2NUM(err);
 }
 
+// https://github.com/rwinlib/gpgme/blob/v1.16.0/include/gpgme.h#L2013-L2015
 static VALUE
 rb_s_gpgme_op_keylist_ext_start (VALUE dummy, VALUE vctx, VALUE vpattern,
                                  VALUE vsecret_only)
@@ -2372,6 +2449,10 @@ Init_gpgme_n (void)
                              rb_s_gpgme_release, 1);
 
   /* Context Attributes */
+  rb_define_module_function (mGPGME, "gpgme_set_ctx_flag",
+                             rb_s_gpgme_set_ctx_flag, 3);
+  rb_define_module_function (mGPGME, "gpgme_get_ctx_flag",
+                             rb_s_gpgme_get_ctx_flag, 2);
   rb_define_module_function (mGPGME, "gpgme_set_protocol",
                              rb_s_gpgme_set_protocol, 2);
   rb_define_module_function (mGPGME, "gpgme_get_protocol",
@@ -2380,6 +2461,10 @@ Init_gpgme_n (void)
                              rb_s_gpgme_set_armor, 2);
   rb_define_module_function (mGPGME, "gpgme_get_armor",
                              rb_s_gpgme_get_armor, 1);
+  rb_define_module_function (mGPGME, "gpgme_set_ignore_mdc_error",
+                             rb_s_gpgme_set_ignore_mdc_error, 2);
+  rb_define_module_function (mGPGME, "gpgme_get_ignore_mdc_error",
+                             rb_s_gpgme_get_ignore_mdc_error, 1);
   rb_define_module_function (mGPGME, "gpgme_set_textmode",
                              rb_s_gpgme_set_textmode, 2);
   rb_define_module_function (mGPGME, "gpgme_get_textmode",
@@ -2423,7 +2508,7 @@ Init_gpgme_n (void)
   rb_define_module_function (mGPGME, "gpgme_op_keylist_start",
                              rb_s_gpgme_op_keylist_start, 3);
   rb_define_module_function (mGPGME, "gpgme_op_keylist_ext_start",
-                             rb_s_gpgme_op_keylist_ext_start, 4);
+                             rb_s_gpgme_op_keylist_ext_start, 3);
   rb_define_module_function (mGPGME, "gpgme_op_keylist_next",
                              rb_s_gpgme_op_keylist_next, 2);
   rb_define_module_function (mGPGME, "gpgme_op_keylist_end",

data/lib/gpgme/ctx.rb

@@ -49,12 +49,13 @@ module GPGME
       raise exc if exc
       ctx = rctx[0]
 
-      ctx.protocol      = options[:protocol]      if options[:protocol]
-      ctx.armor         = options[:armor]         if options[:armor]
-      ctx.textmode      = options[:textmode]      if options[:textmode]
-      ctx.keylist_mode  = options[:keylist_mode]  if options[:keylist_mode]
-      ctx.pinentry_mode = options[:pinentry_mode] if options[:pinentry_mode]
-      ctx.offline       = options[:offline]       if options[:offline]
+      ctx.protocol          = options[:protocol]          if options[:protocol]
+      ctx.armor             = options[:armor]             if options[:armor]
+      ctx.textmode          = options[:textmode]          if options[:textmode]
+      ctx.keylist_mode      = options[:keylist_mode]      if options[:keylist_mode]
+      ctx.pinentry_mode     = options[:pinentry_mode]     if options[:pinentry_mode]
+      ctx.offline           = options[:offline]           if options[:offline]
+      ctx.ignore_mdc_error  = options[:ignore_mdc_error]  if options[:ignore_mdc_error]
 
       if options[:password]
         ctx.set_passphrase_callback GPGME::Ctx.method(:pass_function),
@@ -103,6 +104,43 @@ module GPGME
     # Getters and setters
     ##
 
+    # Get the value of the Ctx flag with the given name.
+    #
+    # Allowed flag names may include:
+    # - 'redraw'
+    # - 'full-status'
+    # - 'raw-description'
+    # - 'export-session-key'
+    # - 'override-session-key'
+    # - 'include-key-block'
+    # - 'auto-key-import'
+    # - 'auto-key-retrieve'
+    # - 'request-origin'
+    # - 'no-symkey-cache'
+    # - 'ignore-mdc-error'
+    # - 'auto-key-locate'
+    # - 'trust-model'
+    # - 'extended-edit'
+    # - 'cert-expire'
+    # - 'key-origin'
+    # - 'import-filter'
+    # - 'no-auto-check-trustdb'
+    #
+    # Please consult the GPGPME documentation for more details
+    #
+    def get_ctx_flag(flag_name)
+      GPGME::gpgme_get_ctx_flag(self, flag_name.to_s)
+    end
+
+    # Set the Ctx flag with the given name
+    # to the given value.
+    def set_ctx_flag(flag_name, val)
+      err = GPGME::gpgme_set_ctx_flag(self, flag_name.to_s, val.to_s)
+      exc = GPGME::error_to_exception(err)
+      raise exc if exc
+      val
+    end
+
     # Set the +protocol+ used within this context. See {GPGME::Ctx.new} for
     # possible values.
     def protocol=(proto)
@@ -128,6 +166,22 @@ module GPGME
       GPGME::gpgme_get_armor(self) == 1 ? true : false
     end
 
+    # This option ignores a MDC integrity protection failure.
+    # It is required to decrypt old messages which did not use an MDC.
+    # It may also be useful if a message is partially garbled,
+    # but it is necessary to get as much data as possible out of that garbled message.
+    # Be aware that a missing or failed MDC can be an indication of an attack.
+    # Use with great caution.
+    def ignore_mdc_error=(yes)
+      GPGME::gpgme_set_ignore_mdc_error(self, yes ? 1 : 0)
+      yes
+    end
+
+    # Return true if the MDC integrity protection is disabled.
+    def ignore_mdc_error
+      GPGME::gpgme_get_ignore_mdc_error(self) == 1 ? true : false
+    end
+
     # Tell whether canonical text mode should be used.
     def textmode=(yes)
       GPGME::gpgme_set_textmode(self, yes ? 1 : 0)

data/lib/gpgme/version.rb

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

data/lib/gpgme.rb

@@ -1,5 +1,3 @@
-$:.push File.expand_path("../..", __FILE__) # C extension is in the root
-
 require 'gpgme_n'
 
 # TODO without this call one can't GPGME::Ctx.new, find out why

data/test/ctx_test.rb

@@ -81,6 +81,70 @@ describe GPGME::Ctx do
     end
   end
 
+  describe :get_ctx_flag do
+    it "reads flags with getters and setters" do
+      ctx = GPGME::Ctx.new
+
+      refute ctx.ignore_mdc_error
+      assert_equal "", ctx.get_ctx_flag("ignore-mdc-error")
+
+      ctx.ignore_mdc_error = true
+
+      assert ctx.ignore_mdc_error
+      assert_equal "1", ctx.get_ctx_flag("ignore-mdc-error")
+    end
+
+    it "can get flags without getters and setters" do
+      ctx = GPGME::Ctx.new
+
+      assert_equal "", ctx.get_ctx_flag("auto-key-locate")
+      ctx.set_ctx_flag("auto-key-locate", "cert")
+      assert_equal "cert", ctx.get_ctx_flag("auto-key-locate")
+    end
+
+    it "raises an error when a flag doesn't exist" do
+      ctx = GPGME::Ctx.new
+
+      assert_raises ArgumentError do
+        ctx.get_ctx_flag("foo")
+      end
+    end
+  end
+
+  describe :set_ctx_flag do
+    it "sets the value for a flag with a getter" do
+      ctx = GPGME::Ctx.new
+      refute ctx.ignore_mdc_error
+
+      ctx.set_ctx_flag("ignore-mdc-error", "1")
+      assert ctx.ignore_mdc_error
+    end
+
+    it "unsets the value for a flag with a getter" do
+      ctx = GPGME::Ctx.new(ignore_mdc_error: true)
+      assert ctx.ignore_mdc_error
+
+      ctx.set_ctx_flag("ignore-mdc-error", "0")
+      refute ctx.ignore_mdc_error
+    end
+
+    it "can set flags without getters and setters" do
+      ctx = GPGME::Ctx.new
+
+      assert_equal "", ctx.get_ctx_flag("auto-key-locate")
+      ctx.set_ctx_flag("auto-key-locate", "cert")
+      assert_equal "cert", ctx.get_ctx_flag("auto-key-locate")
+    end
+
+    it "raises an error when a flag doesn't exist" do
+      ctx = GPGME::Ctx.new
+
+      assert_raises GPGME::Error do
+        ctx.set_ctx_flag("foo", "bar")
+      end
+    end
+  end
+
   describe :armor do
     it "sets false by default" do
       ctx = GPGME::Ctx.new
@@ -101,6 +165,36 @@ describe GPGME::Ctx do
     end
   end
 
+  describe :ignore_mdc_error do
+    it "sets false by default" do
+      ctx = GPGME::Ctx.new
+      refute ctx.ignore_mdc_error
+    end
+
+    it "can set" do
+      ctx = GPGME::Ctx.new
+
+      ctx.ignore_mdc_error = true
+      assert ctx.ignore_mdc_error
+    end
+
+    it "can unset" do
+      ctx = GPGME::Ctx.new(ignore_mdc_error: true)
+      assert ctx.ignore_mdc_error
+
+      ctx.ignore_mdc_error = false
+      refute ctx.ignore_mdc_error
+    end
+
+    it "can set and get in constructor" do
+      ctx = GPGME::Ctx.new(:ignore_mdc_error => false)
+      refute ctx.ignore_mdc_error
+
+      ctx = GPGME::Ctx.new(:ignore_mdc_error => true)
+      assert ctx.ignore_mdc_error
+    end
+  end
+
   describe :protocol do
     it "sets 0 by default" do
       ctx = GPGME::Ctx.new

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gpgme
 version: !ruby/object:Gem::Version
-  version: 2.0.22
+  version: 2.0.24
 platform: ruby
 authors:
 - Daiki Ueno
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-25 00:00:00.000000000 Z
+date: 2024-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mini_portile2
@@ -131,9 +131,9 @@ files:
 - lib/gpgme/sub_key.rb
 - lib/gpgme/user_id.rb
 - lib/gpgme/version.rb
-- ports/archives/gpgme-1.18.0.tar.bz2
-- ports/archives/libassuan-2.5.5.tar.bz2
-- ports/archives/libgpg-error-1.46.tar.bz2
+- ports/archives/gpgme-1.21.0.tar.bz2
+- ports/archives/libassuan-2.5.6.tar.bz2
+- ports/archives/libgpg-error-1.47.tar.bz2
 - test/crypto_test.rb
 - test/ctx_test.rb
 - test/data_test.rb
@@ -167,7 +167,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Ruby binding of GPGME.