sshkeyproof 0.1 → 0.2

data/CHANGELOG

@@ -1,2 +1,3 @@
+v0.2. fixed filename incorrect, fixed double hex encode bug
 v0.1. first version
 

data/Manifest

@@ -2,5 +2,5 @@ CHANGELOG
 Manifest
 README.md
 Rakefile
-lib/sshkeyauth.rb
+lib/sshkeyproof.rb
 test/test_all.rb

data/README.md

@@ -1,17 +1,17 @@
 
-h3. gem install 'sshkeyproof'
+### gem install 'sshkeyproof'
 
 If you have a user's public key, you can verify they are who they say they are (ie. they hold the correspending private key):
     
 
-h3. Client
+### Client
 
 The client takes their private key (defaults to ~/.ssh/id_rsa) and encrypts a random string as proof of work.
 
     request = Sshkeyproof::Client.new key_file: "./id_rsa"
     
     
-h3. Server
+### Server
 
 The server takes the request string and verifies it
 

data/lib/{sshkeyauth.rb → sshkeyproof.rb}

@@ -13,14 +13,17 @@ module Sshkeyproof
     end
     
     def random
-      @random ||= OpenSSL::Random.random_bytes(10).unpack('H*').first
+      @random ||= OpenSSL::Random.random_bytes(10)
     end
     
     def request
-      ciphertext = @privkey.private_encrypt(random).unpack('H*').first
-      "#{SSHKey.sha1_fingerprint(@pubkey.to_s)}|#{random.unpack('H*').first}|#{ciphertext}"
+      ciphertext = to_hex @privkey.private_encrypt(random)
+      [SSHKey.sha1_fingerprint(@pubkey.to_s),to_hex(random),ciphertext].join('|')
+    end
+
+    def to_hex(str)
+      str.unpack('H*').first
     end
-    
   end
   
   class Server
@@ -31,7 +34,11 @@ module Sshkeyproof
     
     def correct?(key)
       openssl_key = String===key ? OpenSSL::PKey::RSA.new(key) : key
-      @fingerprint && @random && @ciphertext && openssl_key.public_key.public_decrypt([@ciphertext].pack('H*')) == [@random].pack('H*') rescue nil
+      @fingerprint && @random && @ciphertext && openssl_key.public_key.public_decrypt(from_hex(@ciphertext)) == from_hex(@random) rescue nil
+    end
+
+    def from_hex(str)
+      [str].pack('H*')
     end
   end
   

data/sshkeyproof.gemspec

@@ -2,15 +2,15 @@
 
 Gem::Specification.new do |s|
   s.name = "sshkeyproof"
-  s.version = "0.1"
+  s.version = "0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andrew Snow"]
   s.date = "2013-01-24"
   s.description = "Ruby gem to prove client has the other half of a keypair"
   s.email = "andrew@modulus.org"
-  s.extra_rdoc_files = ["CHANGELOG", "README.md", "lib/sshkeyauth.rb"]
-  s.files = ["CHANGELOG", "Manifest", "README.md", "Rakefile", "lib/sshkeyauth.rb", "test/test_all.rb", "sshkeyproof.gemspec"]
+  s.extra_rdoc_files = ["CHANGELOG", "README.md", "lib/sshkeyproof.rb"]
+  s.files = ["CHANGELOG", "Manifest", "README.md", "Rakefile", "lib/sshkeyproof.rb", "test/test_all.rb", "sshkeyproof.gemspec"]
   s.homepage = "https://github.com/andys/sshkeyproof"
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Sshkeyproof", "--main", "README.md"]
   s.require_paths = ["lib"]

metadata

@@ -2,7 +2,7 @@
 name: sshkeyproof
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: '0.1'
+  version: '0.2'
 platform: ruby
 authors:
 - Andrew Snow
@@ -34,13 +34,13 @@ extensions: []
 extra_rdoc_files:
 - CHANGELOG
 - README.md
-- lib/sshkeyauth.rb
+- lib/sshkeyproof.rb
 files:
 - CHANGELOG
 - Manifest
 - README.md
 - Rakefile
-- lib/sshkeyauth.rb
+- lib/sshkeyproof.rb
 - test/test_all.rb
 - sshkeyproof.gemspec
 homepage: https://github.com/andys/sshkeyproof