openssl-additions 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c2919b9f7c9b0a1a2166bcb5bd1e7273f7ac23b9efc05473c2a6ef4647b4b24d
-  data.tar.gz: cf8c7640fde294f77a01643a68d4befb4511db17d6f6fa38c37100de04d59c25
+  metadata.gz: 33f17b1fdc475af2152a362ab8227cedaae47c064fb89f664ae3a55992c825b1
+  data.tar.gz: dfce75b619ac474dbdccd3b67d2ec52c45562b15cbd5bc3b12c91f265cd41fe1
 SHA512:
-  metadata.gz: 92dbce64ce5e27996a9cbe3208fba4a62e3a36da5a3cf4188942bfe7e77c4e9509f0692b226962341d7e15a7532e48072481115be3b9e502b36c41a7166eba6c
-  data.tar.gz: add7918b67e7e5e369a89a0231bb32d775434244d11e0daac325330e4adbdeca9606efec686f308c79a1d38b236775766ca7299a406a8b69a0847acd7a00c4f2
+  metadata.gz: 974ab05c0c237e47f2e4b5f06d22413425ac36eedbe5994d21bd4895240de20bc0698fadd56a7fb13edcde5e74321af0ba41c9f8c77e948136e60de5454f8d8c
+  data.tar.gz: 6dde9c594bbcca5ae3c53523deaa52aabd1c629d2a3df8749e1d9a1427153f89317e7f6c3f55f803602ec28472bb3ab0f0a182012b6c6d4934e01fa1dbea4356

data/lib/openssl/ssh_pkey.rb

@@ -59,21 +59,18 @@ module OpenSSL::PKey
     when "ssh-rsa"
       parts = ssh_key_lv_decode(rest, 6)
       OpenSSL::PKey::RSA.new.tap do |k|
-        k.n = ssh_key_mpi_decode(parts[0])
-        k.e = ssh_key_mpi_decode(parts[1])
-        k.d = ssh_key_mpi_decode(parts[2])
-        k.iqmp = ssh_key_mpi_decode(parts[3])
-        k.p = ssh_key_mpi_decode(parts[4])
-        k.q = ssh_key_mpi_decode(parts[5])
+        # n, e, d
+        k.set_key(ssh_key_mpi_decode(parts[0]), ssh_key_mpi_decode(parts[1]), ssh_key_mpi_decode(parts[2]))
+        # p, q
+        k.set_factors(ssh_key_mpi_decode(parts[4]), ssh_key_mpi_decode(parts[5]))
       end
     when "ssh-dss"
       parts = ssh_key_lv_decode(rest, 5)
       OpenSSL::PKey::DSA.new.tap do |k|
-        k.p = ssh_key_mpi_decode(parts[0])
-        k.q = ssh_key_mpi_decode(parts[1])
-        k.g = ssh_key_mpi_decode(parts[2])
-        k.pub_key = ssh_key_mpi_decode(parts[3])
-        k.priv_key = ssh_key_mpi_decode(parts[4])
+        # Self-explanatory
+        k.set_pqg(ssh_key_mpi_decode(parts[0]), ssh_key_mpi_decode(parts[1]), ssh_key_mpi_decode(parts[2]))
+        # pub_key, priv_key
+        k.set_key(ssh_key_mpi_decode(parts[3]), ssh_key_mpi_decode(parts[4]))
       end
     when /ecdsa-sha2-/
       parts = ssh_key_lv_decode(rest, 3)
@@ -197,14 +194,13 @@ module OpenSSL::PKey
     case parts.first
     when "ssh-rsa"
       OpenSSL::PKey::RSA.new.tap do |k|
-        k.e = ssh_key_mpi_decode(parts[1])
-        k.n = ssh_key_mpi_decode(parts[2])
+        # n, e
+        k.set_key(ssh_key_mpi_decode(parts[2]), ssh_key_mpi_decode(parts[1]), nil)
       end
     when "ssh-dss"
       OpenSSL::PKey::DSA.new.tap do |k|
-        k.p = ssh_key_mpi_decode(parts[1])
-        k.q = ssh_key_mpi_decode(parts[2])
-        k.g = ssh_key_mpi_decode(parts[3])
+        # Self-explanatory, one would hope
+        k.set_pqg(ssh_key_mpi_decode(parts[1]), ssh_key_mpi_decode(parts[2]), ssh_key_mpi_decode(parts[3]))
       end
     when /ecdsa-sha2-/
       begin

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openssl-additions
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Matt Palmer