nuntius 0.1.1 → 0.1.2

data/lib/nuntius/key.rb

@@ -1,25 +1,30 @@
 module Nuntius
   class Key
+    attr_accessor :signature_key
+    attr_accessor :encryption_key
+    
     def initialize(key_data)
-      @key = OpenSSL::PKey::RSA.new(key_data)
+      case key_data
+      when Hash
+        self.signature_key = OpenSSL::PKey::RSA.new( key_data[:signature] )
+        self.encryption_key = OpenSSL::PKey::RSA.new( key_data[:encryption] )
+      when Nuntius::Key
+        self.signature_key = key_data.signature_key
+        self.encryption_key = key_data.encryption_key
+      else
+        self.signature_key = self.encryption_key = OpenSSL::PKey::RSA.new(key_data)
+      end
     end
 
     def private?
-      @key.private?
-    end
-
-    def to_str
-      @key.to_pem
-    end
-
-    def hash
-      @key.hash
+      signature_key.private? && encryption_key.private?
     end
 
     def ==(key)
       case key
       when Nuntius::Key
-        key.hash == self.hash
+        signature_key == key.signature_key &&
+          encryption_key == key.encryption_key
       else
         false
       end
@@ -28,20 +33,20 @@ module Nuntius
     def sign(string)
       digest = OpenSSL::Digest::SHA512.new.digest(string)
 
-      @key.private_encrypt(digest)
+      signature_key.private_encrypt(digest)
     end
 
     def validate(message,signature)
       digest = OpenSSL::Digest::SHA512.new.digest(message)
-      digest == @key.public_decrypt(signature)
+      digest == signature_key.public_decrypt(signature)
     end
 
     def encrypt(string)
-      @key.public_encrypt(string)
+      encryption_key.public_encrypt(string)
     end
 
     def decrypt(string)
-      @key.private_decrypt(string)
+      encryption_key.private_decrypt(string)
     end
   end
 end

data/lib/nuntius/version.rb

@@ -1,3 +1,3 @@
 module Nuntius
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/spec/nuntius/key_spec.rb

@@ -3,10 +3,20 @@ require 'spec_helper'
 
 describe Nuntius::Key do
   it "should be created using another key" do
-    @key1 = get_key('alice.pub')
+    @key1 = Nuntius::Key.new( get_key_data('alice.pub') )
     @key2 = Nuntius::Key.new(@key1)
 
-    @key2.to_str.should == @key1.to_str
+    @key2.should == @key1
+  end
+
+  it "should handle different signing/encryption keys" do
+    @signature  = get_key_data('bob.pub')
+    @encryption = get_key_data('alice.pub')
+
+    @key = Nuntius::Key.new({
+      :signature  => @signature,
+      :encryption => @encryption
+    })
   end
 
 end

data/spec/support/keys.rb

@@ -1,3 +1,6 @@
+def get_key_data(key_name)
+  File.read( File.expand_path("../../keys/"+key_name, __FILE__) )
+end
 def get_key(key_name)
-  Nuntius::Key.new File.read( File.expand_path("../../keys/"+key_name, __FILE__) )
+  Nuntius::Key.new( get_key_data(key_name) )
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nuntius
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-19 00:00:00.000000000 Z
+date: 2011-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70219398937400 !ruby/object:Gem::Requirement
+  requirement: &70165842054480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70219398937400
+  version_requirements: *70165842054480
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70219398935880 !ruby/object:Gem::Requirement
+  requirement: &70165842053500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: *70219398935880
+  version_requirements: *70165842053500
 description: Nuntius is a simple scheme to send and receive messages in a cryptographicaly
   secure and compatible way.
 email: me@sagmor.com
@@ -76,7 +76,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4207748026087643604
+      hash: 1925440983098606796
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -85,7 +85,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4207748026087643604
+      hash: 1925440983098606796
 requirements: []
 rubyforge_project: nuntius
 rubygems_version: 1.8.10