putty-key 1.1.1 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7206dacd7197ee9c1344a8cbf607c72614ab3031241bb72a32648bbe62cd784a
-  data.tar.gz: d2835eaa489968b975a93c7cb89e8d7b1dde7e52dc597cc48b54c2b3d9c59c5e
+  metadata.gz: fadb6e886b5ba8f925b19e5bb0b9e6b3c3744872da4dc930cb7cbbaba410f59e
+  data.tar.gz: 8e8bff9c4354b1b72786ac66c0974d97462a5e1475b61648f563a2daf94c5244
 SHA512:
-  metadata.gz: 0bc6d6331bd8e27ebb082a3bee81b71953cc75e7eea0c80cb6aa3577b4f47a22b379683188a800321848aecffd6e5e6ead37fc1691593c717f9a5b189a03f671
-  data.tar.gz: 5e9b7f92503ba1d3ee96089d42fc20f0ab59203c80c6eca9c2e284df67dacf877356ef6a8bbadca8ac569250f9b965b290f5904bfd6885f9f1648e76c0a39dfc
+  metadata.gz: 7f6b90de7cf2771e38aab458a076e0694869772824c17167a5b7b11f62929b3651d6833fe1127a38c3fa2e5df4118b5712fd8c09815be7eacb9858ce7cc45fe8
+  data.tar.gz: bcd9f24dd8573ed23ea8aac8d2a8db7791a27afcff2c78330e96680458f8697bc1139f0203eaaefc0191bd25a4a0f5c727e83ee762e6b5273c58530d37fb6a12

data/CHANGES.md

@@ -1,5 +1,20 @@
 # Changes #
 
+## Version 1.1.3 - 18-Apr-2025 ##
+
+* Fix `Java::JavaLang::NullPointerException` being raised instead of
+  `PuTTY::Key::InvalidStateError` by `OpenSSL::PKey::EC#to_ppk` on JRuby 9.4
+  when the key is not initialized (a separate issue to the one fixed in version
+  1.1.2).
+
+
+## Version 1.1.2 - 16-Oct-2024 ##
+
+* Fix `Java::JavaLang::NullPointerException` being raised instead of
+  `PuTTY::Key::InvalidStateError` by `OpenSSL::PKey::EC#to_ppk` on JRuby 9.4
+  when the key is not initialized.
+
+
 ## Version 1.1.1 - 23-Oct-2022 ##
 
 * Add support for Ruby 3.2.

data/Gemfile

@@ -15,6 +15,22 @@ group :test do
   gem 'coveralls', git: 'https://github.com/philr/coveralls-ruby.git', require: false if RUBY_VERSION < '2.3'
   gem 'coveralls_reborn', '~> 0.13', require: false if RUBY_VERSION >= '2.3'
 
+  # term-ansicolor is a dependency of coveralls. All versions are falsely
+  # declared as compatible with any Ruby version.
+  #
+  # Limit to an earlier compatible version.
+  if RUBY_VERSION < '2.5'
+    gem 'term-ansicolor', '< 1.9'
+  end
+
+  # tins is a dependency of coveralls. From 1.33.0 it depends on bigdecimal,
+  # which can't be installed on old JRuby versions.
+  #
+  # Limit to an earlier compatible version.
+  if RUBY_ENGINE == 'jruby'
+    gem 'tins', '< 1.33'
+  end
+
   # The source version of ffi 1.15.5 is declared as compatible with Ruby >= 2.3.
   # The binary version of 1.15.5 is declared as compatible with Ruby >= 2.4, so
   # doesn't get used. The using the source version results in a segmentation

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2016-2022 Philip Ross
+Copyright (c) 2016-2024 Philip Ross
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

data/Rakefile

@@ -4,11 +4,11 @@ require 'rubygems/package_task'
 require 'rake/testtask'
 
 BASE_DIR = File.expand_path(File.dirname(__FILE__))
+GEMSPEC_PATH = File.join(BASE_DIR, 'putty-key.gemspec')
+spec = TOPLEVEL_BINDING.eval(File.read(GEMSPEC_PATH), GEMSPEC_PATH)
 
 task :default => :test
 
-spec = eval(File.read('putty-key.gemspec'))
-
 # Attempt to find the private key and return a spec with added options for
 # signing the gem if found.
 def add_signing_key(spec)

data/lib/putty/key/openssl.rb

@@ -25,6 +25,11 @@ module PuTTY
 
       private_constant :SSH_CURVES
 
+      # Either a real JRuby NullPointerException, or a fake class that won't be
+      # raised. Can be rescued to handle NullPointerException on jruby.
+      JavaNullPointerException = RUBY_ENGINE == 'jruby' ? Java::JavaLang::NullPointerException : Class.new(Exception)
+      private_constant :JavaNullPointerException
+
       # OpenSSL version helper methods.
       #
       # @private
@@ -355,7 +360,12 @@ module PuTTY
         # @raise [UnsupportedCurveError] If the key uses a curve that is not
         #   supported by PuTTY.
         def to_ppk
-          curve = group && group.curve_name
+          curve = begin
+            g = group
+            g && g.curve_name
+          rescue JavaNullPointerException
+            nil
+          end
           raise InvalidStateError, 'The key has not been fully initialized (a curve name must be assigned)' unless curve
           ssh_curve = SSH_CURVES[curve]
           raise UnsupportedCurveError, "The curve '#{curve}' is not supported" unless ssh_curve

data/lib/putty/key/version.rb

@@ -3,6 +3,6 @@
 module PuTTY
   module Key
     # The PuTTY::Key version number.
-    VERSION = '1.1.1'
+    VERSION = '1.1.3'
   end
 end

data/putty-key.gemspec

@@ -1,4 +1,4 @@
-require File.expand_path(File.join('..', 'lib', 'putty', 'key', 'version'), __FILE__)
+require_relative 'lib/putty/key/version'
 
 Gem::Specification.new do |s|
   s.name = 'putty-key'

metadata

@@ -1,11 +1,10 @@
 --- !ruby/object:Gem::Specification
 name: putty-key
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.3
 platform: ruby
 authors:
 - Philip Ross
-autorequire: 
 bindir: bin
 cert_chain:
 - |
@@ -29,7 +28,7 @@ cert_chain:
   J3Zn/kSTjTekiaspyGbczC3PUaeJNxr+yCvR4sk71Xmk/GaKKGOHedJ1uj/LAXrA
   MR0mpl7b8zCg0PFC1J73uw==
   -----END CERTIFICATE-----
-date: 2022-10-23 00:00:00.000000000 Z
+date: 2025-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -139,10 +138,9 @@ licenses:
 metadata:
   bug_tracker_uri: https://github.com/philr/putty-key/issues
   changelog_uri: https://github.com/philr/putty-key/blob/master/CHANGES.md
-  documentation_uri: https://rubydoc.info/gems/putty-key/1.1.1
+  documentation_uri: https://rubydoc.info/gems/putty-key/1.1.3
   homepage_uri: https://github.com/philr/putty-key
-  source_code_uri: https://github.com/philr/putty-key/tree/v1.1.1
-post_install_message: 
+  source_code_uri: https://github.com/philr/putty-key/tree/v1.1.3
 rdoc_options:
 - "--title"
 - PuTTY::Key
@@ -164,8 +162,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - libargon2 to handle format 3 .ppk files
-rubygems_version: 3.3.7
-signing_key: 
+rubygems_version: 3.6.2
 specification_version: 4
 summary: PuTTY private key (.ppk) library. Supports reading and writing with a refinement
   to OpenSSL::PKey to allow key conversion.

metadata.gz.sig

@@ -1,2 +1,2 @@
-
-����z@
����@������{�����[�⢉{`�n�����(�r�gP��-�r�ч�v��EpAt5�c�u��3�0SK�A��SU����e��fw�h#]�4�ϼC=H���
����I� n9]�mmq�ž����
+c�\+!�|�bV�.0��l��uq��u攸qX�xKz�[4�����gP���V��Wx�F ��_dB�_�c���C�A��Cƚ��.j#EH��Th�.u7�<n
~/�e���*v�1{�Q�&n3���
+!w!`��߻��¦�j�����O��y@�٭���~�ݸ>CG���y��(槌p�Q��m�ϊ9c[N�&���WT��ܨ0��"�FOm��;Q]0y_d��R�\E�r<��md��w6��%a|����ό