putty-key 1.0.1 → 1.1.0

data/lib/putty/key/util.rb

@@ -9,17 +9,17 @@ module PuTTY
     #
     # @private
     module Util
-      # Encodes a list of values (String and OpenSSL::BN instances) according
-      # to RFC 4251 section 5 (as strings and mpints).
+      # Encodes a list of values (`String` and `OpenSSL::BN` instances)
+      # according to RFC 4251 section 5 (as strings and mpints).
       #
-      # No encoding conversion is performed on Strings.
+      # No encoding conversion is performed on `String` instances.
       #
-      # @param [Array] values An Array of String and OpenSSL::BN instances to
-      #   be encoded.
+      # @param [Array] values An Array of `String` and `OpenSSL::BN` instances
+      #   to be encoded.
       #
-      # @return [String] A binary String containing the encoded values.
+      # @return [String] A binary `String` containing the encoded values.
       #
-      # @raise NilValueError If a value is `nil`.
+      # @raise [NilValueError] If a value is `nil`.
       def self.ssh_pack(*values)
         return ''.b if values.empty?
 
@@ -62,11 +62,11 @@ module PuTTY
       # Decodes a string containing RFC 4251 section 5 encoded string and
       # mpint values.
       #
-      # @param [String] encoded A binary {String} containing the encoded values.
-      # @param [Array<Symbol>] spec An array consisting of :string or :mpint
+      # @param [String] encoded A binary `String` containing the encoded values.
+      # @param [Array<Symbol>] spec An array consisting of `:string` or `:mpint`
       #   elements describing the contents of encoded.
       #
-      # @return [Array] An array of decoded (binary) {String} and {OpenSSL::BN}
+      # @return [Array] An array of decoded (binary) `String` and `OpenSSL::BN`
       #   instances.
       #
       # @raise [ArgumentError] If `encoded` is `nil`.

data/lib/putty/key/version.rb

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

data/putty-key.gemspec

@@ -3,9 +3,9 @@ require File.expand_path(File.join('..', 'lib', 'putty', 'key', 'version'), __FI
 Gem::Specification.new do |s|
   s.name = 'putty-key'
   s.version = PuTTY::Key::VERSION
-  s.summary = 'Reads and writes PuTTY private key (.ppk) files. Refines OpenSSL::PKey to allow key conversion.'
+  s.summary = 'PuTTY private key (.ppk) library. Supports reading and writing with a refinement to OpenSSL::PKey to allow key conversion.'
   s.description = <<-EOF
-PuTTY::Key is a pure-Ruby implementation of the PuTTY private key (ppk) format,
+PuTTY::Key is a Ruby implementation of the PuTTY private key (ppk) format,
 handling reading and writing .ppk files. It includes a refinement to Ruby's
 OpenSSL library to add support for converting DSA, EC and RSA private keys to
 and from PuTTY private key files. This allows OpenSSH ecdsa, ssh-dss and ssh-rsa
@@ -15,6 +15,13 @@ private keys to be converted to and from PuTTY's private key format.
   s.email = 'phil.ross@gmail.com'
   s.homepage = 'https://github.com/philr/putty-key'
   s.license = 'MIT'
+  s.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/#{s.name}/#{s.version}",
+    'homepage_uri' => s.homepage,
+    'source_code_uri' => "https://github.com/philr/putty-key/tree/v#{s.version}"
+  }
   s.files = %w(CHANGES.md Gemfile LICENSE README.md Rakefile putty-key.gemspec .yardopts) +
             Dir['lib/**/*.rb'] +
             Dir['test/**/*.rb'] +
@@ -26,4 +33,6 @@ private keys to be converted to and from PuTTY's private key format.
                     '--markup' << 'markdown'
   s.extra_rdoc_files = ['CHANGES.md', 'LICENSE', 'README.md']
   s.required_ruby_version = '>= 2.1.0'
+  s.add_runtime_dependency 'ffi', '~> 1.0'
+  s.requirements = ['libargon2 to handle format 3 .ppk files']
 end

data/test/argon2_params_test.rb

@@ -0,0 +1,144 @@
+# frozen_string_literal: true
+
+require_relative 'test_helper'
+
+class Argon2ParamsTest < Minitest::Test
+  [:d, :i, :id].each do |type|
+    define_method("test_valid_type_#{type}") do
+      params = PuTTY::Key::Argon2Params.new(type: type)
+      assert_equal(type, params.type)
+    end
+  end
+
+  [nil, :x, 'd'].each do |type|
+    define_method("test_invalid_type_#{type.class.name.downcase}_#{type || 'nil'}") do
+      assert_raises(ArgumentError) { PuTTY::Key::Argon2Params.new(type: type) }
+    end
+  end
+
+  [0, 1024, 16384, 2**32].each do |memory|
+    define_method("test_valid_memory_#{memory}") do
+      params = PuTTY::Key::Argon2Params.new(memory: memory)
+      assert_equal(memory, params.memory)
+    end
+  end
+
+  [-1, 2**32 + 1, 1024.1, '1024', nil].each do |memory|
+    define_method("test_invalid_memory_#{memory.class.name.downcase}_#{memory}") do
+      assert_raises(ArgumentError) { PuTTY::Key::Argon2Params.new(memory: memory) }
+    end
+  end
+
+  [nil, 0, 10, 2**32].each do |passes|
+    define_method("test_valid_passes_#{passes || 'nil'}") do
+      params = PuTTY::Key::Argon2Params.new(passes: passes)
+      if passes
+        assert_equal(passes, params.passes)
+      else
+        assert_nil(params.passes)
+      end
+    end
+  end
+
+  [-1, 2**32 + 1, 1.1, '1'].each do |passes|
+    define_method("test_invalid_passes_#{passes.class.name.downcase}_#{passes}") do
+      assert_raises(ArgumentError) { PuTTY::Key::Argon2Params.new(passes: passes) }
+    end
+  end
+
+  [0, 2, 2**32].each do |parallelism|
+    define_method("test_valid_parallelism_#{parallelism}") do
+      params = PuTTY::Key::Argon2Params.new(parallelism: parallelism)
+      assert_equal(parallelism, params.parallelism)
+    end
+  end
+
+  [nil, -1, 2**32 + 1, 2.1, '2'].each do |parallelism|
+    define_method("test_invalid_parallelism_#{parallelism.class.name.downcase}_#{parallelism || 'nil'}") do
+      assert_raises(ArgumentError) { PuTTY::Key::Argon2Params.new(parallelism: parallelism) }
+    end
+  end
+
+  [nil, '', "\x00".b, 'salt'].each do |salt|
+    define_method("test_valid_salt_#{salt || 'nil'}") do
+      params = PuTTY::Key::Argon2Params.new(salt: salt)
+      if salt
+        assert_equal(salt, params.salt)
+      else
+        assert_nil(params.salt)
+      end
+    end
+  end
+
+  [0, :salt].each do |salt|
+    define_method("test_invalid_salt_#{salt.class.name.downcase}_#{salt}") do
+      assert_raises(ArgumentError) { PuTTY::Key::Argon2Params.new(salt: salt) }
+    end
+  end
+
+  [0, 200, 200.1, Rational(2001, 1)].each do |desired_time|
+    define_method("test_valid_desired_time_#{desired_time.class.name.downcase}_#{desired_time}") do
+      params = PuTTY::Key::Argon2Params.new(desired_time: desired_time)
+      assert_equal(desired_time, params.desired_time)
+    end
+  end
+
+  [nil, -1, -0.1, Rational(-1, 10), '0'].each do |desired_time|
+    define_method("test_invalid_desired_time_#{desired_time.class.name.downcase}_#{desired_time || 'nil'}") do
+      assert_raises(ArgumentError) { PuTTY::Key::Argon2Params.new(desired_time: desired_time) }
+    end
+  end
+
+  def test_complete_with_equivalent_passes_and_salt
+    params = PuTTY::Key::Argon2Params.new(passes: 10, salt: 'test_salt')
+    assert_same(params, params.complete(10, 'test_salt'.dup))
+  end
+
+  def test_complete_with_equivalent_passes_and_different_salt
+    params = PuTTY::Key::Argon2Params.new(passes: 10, salt: nil)
+    complete_params = params.complete(10, 'test_salt')
+    refute_same(params, complete_params)
+    assert_equal(10, complete_params.passes)
+    assert_equal('test_salt', complete_params.salt)
+  end
+
+  def test_complete_with_different_passes_and_equivalent_salt
+    params = PuTTY::Key::Argon2Params.new(passes: nil, salt: 'test_salt')
+    complete_params = params.complete(10, 'test_salt'.dup)
+    refute_same(params, complete_params)
+    assert_equal(10, complete_params.passes)
+    assert_equal('test_salt', complete_params.salt)
+  end
+
+  def test_complete_with_different_passes_and_salt
+    params = PuTTY::Key::Argon2Params.new(passes: nil, salt: nil)
+    complete_params = params.complete(10, 'test_salt')
+    refute_same(params, complete_params)
+    assert_equal(10, complete_params.passes)
+    assert_equal('test_salt', complete_params.salt)
+  end
+
+  def test_complete_copies_other_properties
+    params = PuTTY::Key::Argon2Params.new(type: :d, memory: 8193, parallelism: 3, passes: nil, salt: nil, desired_time: 123)
+    complete_params = params.complete(10, 'test_salt')
+    refute_same(params, complete_params)
+    assert_equal(:d, complete_params.type)
+    assert_equal(8193, complete_params.memory)
+    assert_equal(3, complete_params.parallelism)
+    assert_equal(123, complete_params.desired_time)
+  end
+
+  [nil, -1, 2**32 + 1, 1.1, '1'].each do |passes|
+    define_method("test_complete_with_invalid_passes_#{passes.class.name.downcase}_#{passes || 'nil'}") do
+      params = PuTTY::Key::Argon2Params.new(passes: nil, salt: nil)
+      assert_raises(ArgumentError) { params.complete(passes, 'test_salt') }
+    end
+  end
+
+  [nil, 0, :test_salt].each do |salt|
+    define_method("test_complete_with_invalid_salt_#{salt.class.name.downcase}_#{salt || 'nil'}") do
+      params = PuTTY::Key::Argon2Params.new(passes: nil, salt: nil)
+      assert_raises(ArgumentError) { params.complete(10, salt) }
+    end
+  end
+end

data/test/fixtures/{dss-1024-encrypted.ppk → dss-1024-encrypted-format-2.ppk}

@@ -1,17 +1,17 @@
-PuTTY-User-Key-File-2: ssh-dss
-Encryption: aes256-cbc
-Comment: 1024 bit DSS key
-Public-Lines: 10
-AAAAB3NzaC1kc3MAAACBAL+4+EeuubcbNP48XJONq1SgPngZFjDKu+MiDCMDNtzw
-bqsGDIRTolPKYs9toCRMyJBOv2p4wAKY7EweNT5ka110gaxmZ1LGsCIBOPiF6lvI
-Iqidqi6S0boZVmjb4WA5DW5qu8XMAJIxGHuqrBOSVesRp6A1MROYpR0qQsXq/HOJ
-AAAAFQDIvmNb+BUDk9eq82asXwWS9rcq5wAAAIAx6uiaV2jauJa0fisi3p8VIayo
-8EAVLIyjDg8cRzEtE5Fagdq1n1gQd0EJvYVwwsEdacLxA/VI1DqzyPb9cj8THqKi
-b36itdWrSzKYVY5TAvdKYOLcYlRbT51c9Bu+SqPOHQFAgS38YzbZfoar5oevnLyk
-nhDgnlogrMk/OkUZoQAAAIEAvBTb2ZdpeawFZ7kxY+n3whqjslqBPTZwZhoZI6+D
-JmrOFcmFqN/XtxYul2F8M05GigjRjM6onmDx73nUqoGuRINOqdKVuu4D9dB1vw70
-tg1y39Z46MsFdGKWquy1C2+nm2//jxbEc/dAxOHL20pGA8lSG7NRlUfX4vpmpLw1
-UeI=
-Private-Lines: 1
-f/XUfRLYdOG1yxjJbggfTkODkvUl1PaUrKrkgltN9n8=
-Private-MAC: a2fd21e9a1e9dd7eeebbad996ae73e4d4eff72e9
+PuTTY-User-Key-File-2: ssh-dss
+Encryption: aes256-cbc
+Comment: 1024 bit DSS key
+Public-Lines: 10
+AAAAB3NzaC1kc3MAAACBAL+4+EeuubcbNP48XJONq1SgPngZFjDKu+MiDCMDNtzw
+bqsGDIRTolPKYs9toCRMyJBOv2p4wAKY7EweNT5ka110gaxmZ1LGsCIBOPiF6lvI
+Iqidqi6S0boZVmjb4WA5DW5qu8XMAJIxGHuqrBOSVesRp6A1MROYpR0qQsXq/HOJ
+AAAAFQDIvmNb+BUDk9eq82asXwWS9rcq5wAAAIAx6uiaV2jauJa0fisi3p8VIayo
+8EAVLIyjDg8cRzEtE5Fagdq1n1gQd0EJvYVwwsEdacLxA/VI1DqzyPb9cj8THqKi
+b36itdWrSzKYVY5TAvdKYOLcYlRbT51c9Bu+SqPOHQFAgS38YzbZfoar5oevnLyk
+nhDgnlogrMk/OkUZoQAAAIEAvBTb2ZdpeawFZ7kxY+n3whqjslqBPTZwZhoZI6+D
+JmrOFcmFqN/XtxYul2F8M05GigjRjM6onmDx73nUqoGuRINOqdKVuu4D9dB1vw70
+tg1y39Z46MsFdGKWquy1C2+nm2//jxbEc/dAxOHL20pGA8lSG7NRlUfX4vpmpLw1
+UeI=
+Private-Lines: 1
+f/XUfRLYdOG1yxjJbggfTkODkvUl1PaUrKrkgltN9n8=
+Private-MAC: a2fd21e9a1e9dd7eeebbad996ae73e4d4eff72e9

data/test/fixtures/dss-1024-encrypted-format-3.ppk

@@ -0,0 +1,22 @@
+PuTTY-User-Key-File-3: ssh-dss
+Encryption: aes256-cbc
+Comment: 1024 bit DSS key
+Public-Lines: 10
+AAAAB3NzaC1kc3MAAACBAL+4+EeuubcbNP48XJONq1SgPngZFjDKu+MiDCMDNtzw
+bqsGDIRTolPKYs9toCRMyJBOv2p4wAKY7EweNT5ka110gaxmZ1LGsCIBOPiF6lvI
+Iqidqi6S0boZVmjb4WA5DW5qu8XMAJIxGHuqrBOSVesRp6A1MROYpR0qQsXq/HOJ
+AAAAFQDIvmNb+BUDk9eq82asXwWS9rcq5wAAAIAx6uiaV2jauJa0fisi3p8VIayo
+8EAVLIyjDg8cRzEtE5Fagdq1n1gQd0EJvYVwwsEdacLxA/VI1DqzyPb9cj8THqKi
+b36itdWrSzKYVY5TAvdKYOLcYlRbT51c9Bu+SqPOHQFAgS38YzbZfoar5oevnLyk
+nhDgnlogrMk/OkUZoQAAAIEAvBTb2ZdpeawFZ7kxY+n3whqjslqBPTZwZhoZI6+D
+JmrOFcmFqN/XtxYul2F8M05GigjRjM6onmDx73nUqoGuRINOqdKVuu4D9dB1vw70
+tg1y39Z46MsFdGKWquy1C2+nm2//jxbEc/dAxOHL20pGA8lSG7NRlUfX4vpmpLw1
+UeI=
+Key-Derivation: Argon2id
+Argon2-Memory: 8192
+Argon2-Passes: 13
+Argon2-Parallelism: 1
+Argon2-Salt: 1a215742bf63ed4eefed21dd07683640
+Private-Lines: 1
+D+Otg+Te1dxaORdPq2bfnEsb6W9ot5ZOkfj0ykzUcFE=
+Private-MAC: ed2b5d6a2a1c097bd8224848ee10f4aad6f8c467c80c6e9f5f58cff6ee6347ad

data/test/fixtures/{dss-1024.ppk → dss-1024-format-2.ppk}

@@ -1,17 +1,17 @@
-PuTTY-User-Key-File-2: ssh-dss
-Encryption: none
-Comment: 1024 bit DSS key
-Public-Lines: 10
-AAAAB3NzaC1kc3MAAACBAL+4+EeuubcbNP48XJONq1SgPngZFjDKu+MiDCMDNtzw
-bqsGDIRTolPKYs9toCRMyJBOv2p4wAKY7EweNT5ka110gaxmZ1LGsCIBOPiF6lvI
-Iqidqi6S0boZVmjb4WA5DW5qu8XMAJIxGHuqrBOSVesRp6A1MROYpR0qQsXq/HOJ
-AAAAFQDIvmNb+BUDk9eq82asXwWS9rcq5wAAAIAx6uiaV2jauJa0fisi3p8VIayo
-8EAVLIyjDg8cRzEtE5Fagdq1n1gQd0EJvYVwwsEdacLxA/VI1DqzyPb9cj8THqKi
-b36itdWrSzKYVY5TAvdKYOLcYlRbT51c9Bu+SqPOHQFAgS38YzbZfoar5oevnLyk
-nhDgnlogrMk/OkUZoQAAAIEAvBTb2ZdpeawFZ7kxY+n3whqjslqBPTZwZhoZI6+D
-JmrOFcmFqN/XtxYul2F8M05GigjRjM6onmDx73nUqoGuRINOqdKVuu4D9dB1vw70
-tg1y39Z46MsFdGKWquy1C2+nm2//jxbEc/dAxOHL20pGA8lSG7NRlUfX4vpmpLw1
-UeI=
-Private-Lines: 1
-AAAAFQCl3JfIKDbnArDjCLHs6372hyeAPA==
-Private-MAC: 08a095e136062f3005386f26c6aea1e00d72cad5
+PuTTY-User-Key-File-2: ssh-dss
+Encryption: none
+Comment: 1024 bit DSS key
+Public-Lines: 10
+AAAAB3NzaC1kc3MAAACBAL+4+EeuubcbNP48XJONq1SgPngZFjDKu+MiDCMDNtzw
+bqsGDIRTolPKYs9toCRMyJBOv2p4wAKY7EweNT5ka110gaxmZ1LGsCIBOPiF6lvI
+Iqidqi6S0boZVmjb4WA5DW5qu8XMAJIxGHuqrBOSVesRp6A1MROYpR0qQsXq/HOJ
+AAAAFQDIvmNb+BUDk9eq82asXwWS9rcq5wAAAIAx6uiaV2jauJa0fisi3p8VIayo
+8EAVLIyjDg8cRzEtE5Fagdq1n1gQd0EJvYVwwsEdacLxA/VI1DqzyPb9cj8THqKi
+b36itdWrSzKYVY5TAvdKYOLcYlRbT51c9Bu+SqPOHQFAgS38YzbZfoar5oevnLyk
+nhDgnlogrMk/OkUZoQAAAIEAvBTb2ZdpeawFZ7kxY+n3whqjslqBPTZwZhoZI6+D
+JmrOFcmFqN/XtxYul2F8M05GigjRjM6onmDx73nUqoGuRINOqdKVuu4D9dB1vw70
+tg1y39Z46MsFdGKWquy1C2+nm2//jxbEc/dAxOHL20pGA8lSG7NRlUfX4vpmpLw1
+UeI=
+Private-Lines: 1
+AAAAFQCl3JfIKDbnArDjCLHs6372hyeAPA==
+Private-MAC: 08a095e136062f3005386f26c6aea1e00d72cad5

data/test/fixtures/dss-1024-format-3.ppk

@@ -0,0 +1,17 @@
+PuTTY-User-Key-File-3: ssh-dss
+Encryption: none
+Comment: 1024 bit DSS key
+Public-Lines: 10
+AAAAB3NzaC1kc3MAAACBAL+4+EeuubcbNP48XJONq1SgPngZFjDKu+MiDCMDNtzw
+bqsGDIRTolPKYs9toCRMyJBOv2p4wAKY7EweNT5ka110gaxmZ1LGsCIBOPiF6lvI
+Iqidqi6S0boZVmjb4WA5DW5qu8XMAJIxGHuqrBOSVesRp6A1MROYpR0qQsXq/HOJ
+AAAAFQDIvmNb+BUDk9eq82asXwWS9rcq5wAAAIAx6uiaV2jauJa0fisi3p8VIayo
+8EAVLIyjDg8cRzEtE5Fagdq1n1gQd0EJvYVwwsEdacLxA/VI1DqzyPb9cj8THqKi
+b36itdWrSzKYVY5TAvdKYOLcYlRbT51c9Bu+SqPOHQFAgS38YzbZfoar5oevnLyk
+nhDgnlogrMk/OkUZoQAAAIEAvBTb2ZdpeawFZ7kxY+n3whqjslqBPTZwZhoZI6+D
+JmrOFcmFqN/XtxYul2F8M05GigjRjM6onmDx73nUqoGuRINOqdKVuu4D9dB1vw70
+tg1y39Z46MsFdGKWquy1C2+nm2//jxbEc/dAxOHL20pGA8lSG7NRlUfX4vpmpLw1
+UeI=
+Private-Lines: 1
+AAAAFQCl3JfIKDbnArDjCLHs6372hyeAPA==
+Private-MAC: 25f8c1ddd55ec9194ee1fe55147f78159f2e5c22bd9b309a86f54a19922af5e8

data/test/fixtures/{ecdsa-sha2-nistp256-encrypted.ppk → ecdsa-sha2-nistp256-encrypted-format-2.ppk}

@@ -1,10 +1,10 @@
-PuTTY-User-Key-File-2: ecdsa-sha2-nistp256
-Encryption: aes256-cbc
-Comment: ECDSA NIST P-256 Key
-Public-Lines: 3
-AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBCQ3DddjuXAE
-JBGEdbNJMuQ6J4ygr3Y6T6i7lSYSilJx+bpS2G2CBDywgH/tRCTEKEWDfuDMWIBD
-8CFx/Ll+GYI=
-Private-Lines: 1
-gxt0kaX6X+MtVMSrtEY2jRhqohF8BfXkGgnjPIesEfg52oI2hBWScmzPa1oeSq3S
-Private-MAC: 26ae5e506735b389f7c3d39b291e01b4183442a6
+PuTTY-User-Key-File-2: ecdsa-sha2-nistp256
+Encryption: aes256-cbc
+Comment: ECDSA NIST P-256 Key
+Public-Lines: 3
+AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBCQ3DddjuXAE
+JBGEdbNJMuQ6J4ygr3Y6T6i7lSYSilJx+bpS2G2CBDywgH/tRCTEKEWDfuDMWIBD
+8CFx/Ll+GYI=
+Private-Lines: 1
+gxt0kaX6X+MtVMSrtEY2jRhqohF8BfXkGgnjPIesEfg52oI2hBWScmzPa1oeSq3S
+Private-MAC: 26ae5e506735b389f7c3d39b291e01b4183442a6

data/test/fixtures/ecdsa-sha2-nistp256-encrypted-format-3.ppk

@@ -0,0 +1,15 @@
+PuTTY-User-Key-File-3: ecdsa-sha2-nistp256
+Encryption: aes256-cbc
+Comment: ECDSA NIST P-256 Key
+Public-Lines: 3
+AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBCQ3DddjuXAE
+JBGEdbNJMuQ6J4ygr3Y6T6i7lSYSilJx+bpS2G2CBDywgH/tRCTEKEWDfuDMWIBD
+8CFx/Ll+GYI=
+Key-Derivation: Argon2i
+Argon2-Memory: 4096
+Argon2-Passes: 12
+Argon2-Parallelism: 1
+Argon2-Salt: ba8364f0da7d8133bbd5f7396ac280f8
+Private-Lines: 1
+lZhLuHaK0KjpxVQJJZSmNYp9KtwwGkvweG+MGx5LuSW1kkN31cIgZg0Rj7D0jAkI
+Private-MAC: 9fb375da27b65d80784def1f42cef85ec2ecb26d82b0decda3294513bb6b90b6

data/test/fixtures/{ecdsa-sha2-nistp256.ppk → ecdsa-sha2-nistp256-format-2.ppk}

@@ -1,10 +1,10 @@
-PuTTY-User-Key-File-2: ecdsa-sha2-nistp256
-Encryption: none
-Comment: ECDSA NIST P-256 Key
-Public-Lines: 3
-AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBCQ3DddjuXAE
-JBGEdbNJMuQ6J4ygr3Y6T6i7lSYSilJx+bpS2G2CBDywgH/tRCTEKEWDfuDMWIBD
-8CFx/Ll+GYI=
-Private-Lines: 1
-AAAAIQDS3drCgiIvmEaupDgGw6aEy8rRVlBqL/QgdQQhJrrlQw==
-Private-MAC: fa55024b8a317064ff3502192181a8a30ae2ceb2
+PuTTY-User-Key-File-2: ecdsa-sha2-nistp256
+Encryption: none
+Comment: ECDSA NIST P-256 Key
+Public-Lines: 3
+AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBCQ3DddjuXAE
+JBGEdbNJMuQ6J4ygr3Y6T6i7lSYSilJx+bpS2G2CBDywgH/tRCTEKEWDfuDMWIBD
+8CFx/Ll+GYI=
+Private-Lines: 1
+AAAAIQDS3drCgiIvmEaupDgGw6aEy8rRVlBqL/QgdQQhJrrlQw==
+Private-MAC: fa55024b8a317064ff3502192181a8a30ae2ceb2

data/test/fixtures/ecdsa-sha2-nistp256-format-3.ppk

@@ -0,0 +1,10 @@
+PuTTY-User-Key-File-3: ecdsa-sha2-nistp256
+Encryption: none
+Comment: ECDSA NIST P-256 Key
+Public-Lines: 3
+AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBCQ3DddjuXAE
+JBGEdbNJMuQ6J4ygr3Y6T6i7lSYSilJx+bpS2G2CBDywgH/tRCTEKEWDfuDMWIBD
+8CFx/Ll+GYI=
+Private-Lines: 1
+AAAAIQDS3drCgiIvmEaupDgGw6aEy8rRVlBqL/QgdQQhJrrlQw==
+Private-MAC: cceda1593184fd6f4a395fa48ffea3ccae62bb4e91146aaf855772eeb57e5bd4

data/test/fixtures/{ecdsa-sha2-nistp384-encrypted.ppk → ecdsa-sha2-nistp384-encrypted-format-2.ppk}

@@ -1,11 +1,11 @@
-PuTTY-User-Key-File-2: ecdsa-sha2-nistp384
-Encryption: aes256-cbc
-Comment: ECDSA NIST P-384 Key
-Public-Lines: 3
-AAAAE2VjZHNhLXNoYTItbmlzdHAzODQAAAAIbmlzdHAzODQAAABhBGVcWqtNFCVp
-X/65SBYMlSuHi++wFIcl4iXp9rp6pAGfxK4Z1IZhBmKARMbIAWbWvZX5Gho/fJjJ
-WwrQOsV9hVjYsfL6icBDOc/GFxq7mPxYq7ZJfypvsa6sAXRcPX4OjQ==
-Private-Lines: 2
-DhMmJHbWO+eRtFTcVfM5thmsDO/AagTQQBAaePyPWoxdFZp8mHf5UvIxoXcz2MpA
-wBu0qnCC+XxxPkR8+t0GpA==
-Private-MAC: 3e2e02a07089bf0302e76ee43a3da89eb0571fb8
+PuTTY-User-Key-File-2: ecdsa-sha2-nistp384
+Encryption: aes256-cbc
+Comment: ECDSA NIST P-384 Key
+Public-Lines: 3
+AAAAE2VjZHNhLXNoYTItbmlzdHAzODQAAAAIbmlzdHAzODQAAABhBGVcWqtNFCVp
+X/65SBYMlSuHi++wFIcl4iXp9rp6pAGfxK4Z1IZhBmKARMbIAWbWvZX5Gho/fJjJ
+WwrQOsV9hVjYsfL6icBDOc/GFxq7mPxYq7ZJfypvsa6sAXRcPX4OjQ==
+Private-Lines: 2
+DhMmJHbWO+eRtFTcVfM5thmsDO/AagTQQBAaePyPWoxdFZp8mHf5UvIxoXcz2MpA
+wBu0qnCC+XxxPkR8+t0GpA==
+Private-MAC: 3e2e02a07089bf0302e76ee43a3da89eb0571fb8

data/test/fixtures/ecdsa-sha2-nistp384-encrypted-format-3.ppk

@@ -0,0 +1,16 @@
+PuTTY-User-Key-File-3: ecdsa-sha2-nistp384
+Encryption: aes256-cbc
+Comment: ECDSA NIST P-384 Key
+Public-Lines: 3
+AAAAE2VjZHNhLXNoYTItbmlzdHAzODQAAAAIbmlzdHAzODQAAABhBGVcWqtNFCVp
+X/65SBYMlSuHi++wFIcl4iXp9rp6pAGfxK4Z1IZhBmKARMbIAWbWvZX5Gho/fJjJ
+WwrQOsV9hVjYsfL6icBDOc/GFxq7mPxYq7ZJfypvsa6sAXRcPX4OjQ==
+Key-Derivation: Argon2i
+Argon2-Memory: 8192
+Argon2-Passes: 6
+Argon2-Parallelism: 2
+Argon2-Salt: 0ee1393b17b1c6a7792f13cb805e4956
+Private-Lines: 2
+gy8VqXnJwq7OBoWk7LdGDUAldchjlZwf0f3uoO5Xj8QcUse1s++rRWZURw5zaae7
+wBRYd9WRb3FVYc+OmD2o7A==
+Private-MAC: 546adb19cc580f2ec72ba46cd12bab512328e01f34eac38ed38c4225a4700563