sshkey 1.1.1 → 1.1.2

data/README.rdoc

@@ -4,14 +4,14 @@ Generate private/public SSH keys using Ruby without the `ssh-keygen` system comm
 
   gem install sshkey
 
-Currently requires Ruby 1.9.
-  
+Tested on Ruby 1.8.7 and 1.9.2 (MRI).
+
 == Usage
 
 Generate an SSH Keypair with foo@bar.com as the comment - providing a comment is optional
 
   k = SSHKey.generate(:comment => "foo@bar.com")
-  
+
 Return an SSHKey object from an existing RSA Private Key (provided as a string)
 
   k = SSHKey.new(File.read("~/.ssh/id_rsa"), :comment => "foo@bar.com")
@@ -22,19 +22,19 @@ Both of these will return an SSHKey object with the following methods:
   # See http://www.ruby-doc.org/stdlib/libdoc/openssl/rdoc/classes/OpenSSL/PKey/RSA.html
   k.key_object
   # => -----BEGIN RSA PRIVATE KEY-----\nMIIEowI...
-  
+
   # Returns the RSA Private Key as a string
   k.rsa_private_key
   # => "-----BEGIN RSA PRIVATE KEY-----\nMIIEowI..."
-  
+
   # Returns the RSA Public Key as a string
   k.rsa_public_key
   # => "-----BEGIN RSA PUBLIC KEY-----\nMIIBCg..."
-  
+
   # Returns the SSH Public Key as a string
   k.ssh_public_key
   # => "ssh-rsa AAAAB3NzaC1yc2EA...."
-  
+
   # Returns the comment as a string
   k.comment
   # => "foo@bar.com"

data/lib/sshkey.rb

@@ -11,12 +11,17 @@ class SSHKey
   attr_reader :key_object, :comment, :rsa_private_key, :rsa_public_key, :ssh_public_key, :fingerprint
 
   def initialize(private_key, options = {})
-    @key_object = OpenSSL::PKey::RSA.new(private_key)
-    @comment = options[:comment] || ""
-    @rsa_private_key = @key_object.to_pem
-    @rsa_public_key = @key_object.public_key.to_pem
-    @ssh_public_key = ["ssh-rsa", Base64.strict_encode64(ssh_public_key_conversion), @comment].join(" ").strip
-    @fingerprint = Digest::MD5.hexdigest(ssh_public_key_conversion).gsub(/(.{2})(?=.)/, '\1:\2')
+    @key_object        = OpenSSL::PKey::RSA.new(private_key)
+    @comment           = options[:comment] || ""
+    @rsa_private_key   = @key_object.to_pem
+    @rsa_public_key    = @key_object.public_key.to_pem
+    raw_ssh_public_key = ssh_public_key_conversion
+    @ssh_public_key    = [
+      "ssh-rsa",
+      Base64.encode64(raw_ssh_public_key).gsub("\n", ""),
+      @comment,
+    ].join(" ").strip
+    @fingerprint       = Digest::MD5.hexdigest(raw_ssh_public_key).gsub(/(.{2})(?=.)/, '\1:\2')
   end
 
   private

data/lib/sshkey/version.rb

@@ -1,3 +1,3 @@
 class SSHKey
-  VERSION = "1.1.1"
+  VERSION = "1.1.2"
 end

data/test/sshkey_test.rb

@@ -82,19 +82,19 @@ EOF
   end
 
   def test_ssh_public_key_decoded1
-    assert_equal Base64.strict_decode64(SSH_PUBLIC_KEY1), @key1.send(:ssh_public_key_conversion)
+    assert_equal Base64.decode64(SSH_PUBLIC_KEY1), @key1.send(:ssh_public_key_conversion)
   end
 
   def test_ssh_public_key_decoded2
-    assert_equal Base64.strict_decode64(SSH_PUBLIC_KEY2), @key2.send(:ssh_public_key_conversion)
+    assert_equal Base64.decode64(SSH_PUBLIC_KEY2), @key2.send(:ssh_public_key_conversion)
   end
 
   def test_ssh_public_key_encoded1
-    assert_equal SSH_PUBLIC_KEY1, Base64.strict_encode64(@key1.send(:ssh_public_key_conversion))
+    assert_equal SSH_PUBLIC_KEY1, Base64.encode64(@key1.send(:ssh_public_key_conversion)).gsub("\n", "")
   end
 
   def test_ssh_public_key_encoded2
-    assert_equal SSH_PUBLIC_KEY2, Base64.strict_encode64(@key2.send(:ssh_public_key_conversion))
+    assert_equal SSH_PUBLIC_KEY2, Base64.encode64(@key2.send(:ssh_public_key_conversion)).gsub("\n", "")
   end
 
   def test_ssh_public_key_output

metadata

@@ -1,8 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sshkey
 version: !ruby/object:Gem::Version 
+  hash: 23
   prerelease: 
-  version: 1.1.1
+  segments: 
+  - 1
+  - 1
+  - 2
+  version: 1.1.2
 platform: ruby
 authors: 
 - James Miller
@@ -10,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-12 23:00:00 -08:00
+date: 2011-04-19 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -47,17 +52,23 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: sshkey
-rubygems_version: 1.6.2
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: SSH private/public key generator in Ruby