sshkey 1.3.2 → 1.3.3

data/lib/sshkey.rb

@@ -7,8 +7,8 @@ class SSHKey
   SSH_TYPES      = {"rsa" => "ssh-rsa", "dsa" => "ssh-dss"}
   SSH_CONVERSION = {"rsa" => ["e", "n"], "dsa" => ["p", "q", "g", "pub_key"]}
 
-  attr_reader :key_object, :comment, :type
-  attr_accessor :passphrase
+  attr_reader :key_object, :type
+  attr_accessor :passphrase, :comment
 
   class << self
     # Generate a new keypair and return an SSHKey object
@@ -109,7 +109,7 @@ class SSHKey
     end
 
     def decoded_key(key)
-      Base64.decode64(key.chomp.gsub(/ssh-[dr]s[as] /, ''))
+      Base64.decode64(key.gsub(/^(ssh-[dr]s[as]\s+)|(\s+.+\@.+)|\n/, ''))
     end
 
     def fingerprint_regex
@@ -188,6 +188,11 @@ class SSHKey
     Digest::SHA1.hexdigest(ssh_public_key_conversion).gsub(/(.{2})(?=.)/, '\1:\2')
   end
 
+  # Determine the length (bits) of the key as an integer
+  def bits
+    key_object.to_text.match(/Private-Key:\s\((\d*)\sbit\)/)[1].to_i
+  end
+
   private
 
   # SSH Public Key Conversion

data/lib/sshkey/version.rb

@@ -1,3 +1,3 @@
 class SSHKey
-  VERSION = "1.3.2"
+  VERSION = "1.3.3"
 end

data/test/sshkey_test.rb

@@ -204,14 +204,14 @@ EOF
     assert_equal KEY1_SHA1_FINGERPRINT, @key1.sha1_fingerprint
     assert_equal KEY2_SHA1_FINGERPRINT, @key2.sha1_fingerprint
     assert_equal KEY3_SHA1_FINGERPRINT, @key3.sha1_fingerprint
-    
+
     assert_equal KEY1_MD5_FINGERPRINT, SSHKey.md5_fingerprint(SSH_PRIVATE_KEY1)
     assert_equal KEY1_MD5_FINGERPRINT, SSHKey.md5_fingerprint(SSH_PUBLIC_KEY1)
     assert_equal KEY2_MD5_FINGERPRINT, SSHKey.md5_fingerprint(SSH_PRIVATE_KEY2)
     assert_equal KEY2_MD5_FINGERPRINT, SSHKey.md5_fingerprint(SSH_PUBLIC_KEY2)
     assert_equal KEY3_MD5_FINGERPRINT, SSHKey.md5_fingerprint(SSH_PRIVATE_KEY3)
     assert_equal KEY3_MD5_FINGERPRINT, SSHKey.md5_fingerprint(SSH_PUBLIC_KEY3)
-    
+
     assert_equal KEY1_SHA1_FINGERPRINT, SSHKey.sha1_fingerprint(SSH_PRIVATE_KEY1)
     assert_equal KEY1_SHA1_FINGERPRINT, SSHKey.sha1_fingerprint(SSH_PUBLIC_KEY1)
     assert_equal KEY2_SHA1_FINGERPRINT, SSHKey.sha1_fingerprint(SSH_PRIVATE_KEY2)
@@ -220,6 +220,13 @@ EOF
     assert_equal KEY3_SHA1_FINGERPRINT, SSHKey.sha1_fingerprint(SSH_PUBLIC_KEY3)
   end
 
+  def test_bits
+    assert_equal 2048, @key1.bits
+    assert_equal 2048, @key2.bits
+    assert_equal 1024, @key3.bits
+    assert_equal 512, SSHKey.generate(bits: 512).bits
+  end
+
   def test_to_byte_array
     ba1 = @key1.send(:to_byte_array, 35)
     ba2 = @key1.send(:to_byte_array, 65537)

metadata

@@ -1,34 +1,32 @@
 --- !ruby/object:Gem::Specification
 name: sshkey
 version: !ruby/object:Gem::Version
-  prerelease:
-  version: 1.3.2
+  version: 1.3.3
+  prerelease: 
 platform: ruby
 authors:
 - James Miller
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-11 00:00:00.000000000 Z
+date: 2013-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
-    none: false
-  prerelease: false
-  type: :development
+        version: '0'
 description: Generate private/public SSH keypairs using pure Ruby
 email:
 - bensie@gmail.com
@@ -36,8 +34,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".travis.yml"
+- .gitignore
+- .travis.yml
 - Gemfile
 - LICENSE
 - README.md
@@ -48,28 +46,26 @@ files:
 - test/sshkey_test.rb
 homepage: https://github.com/bensie/sshkey
 licenses: []
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: !binary |-
-        MA==
-  none: false
+      version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: !binary |-
-        MA==
-  none: false
+      version: '0'
 requirements: []
 rubyforge_project: sshkey
-rubygems_version: 1.8.24
-signing_key:
+rubygems_version: 1.8.23
+signing_key: 
 specification_version: 3
 summary: SSH private/public key generator in Ruby
 test_files: