From 4a3f6b2986c9e114e0ae271fba97ddd66046bc3e Mon Sep 17 00:00:00 2001
From: ilya <ilya@laptop.(none)>
Date: Wed, 4 Aug 2010 21:08:25 -0700
Subject: [PATCH] need to serialize key to bson

---
 Gemfile              | 1 -
 app/models/person.rb | 6 +++---
 app/models/user.rb   | 2 +-
 lib/encryptable.rb   | 2 +-
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/Gemfile b/Gemfile
index fe8634229..8550b5d1c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -7,7 +7,6 @@ gem 'rails', '3.0.0.beta4'
 gem 'bundler', '0.9.26'
 
 #Security
-gem 'openssl'
 gem 'gpgme'
 gem 'devise', :git => 'http://github.com/BadMinus/devise.git'
 
diff --git a/app/models/person.rb b/app/models/person.rb
index 1ef0da2ec..3762d0649 100644
--- a/app/models/person.rb
+++ b/app/models/person.rb
@@ -5,7 +5,7 @@ class Person
   xml_accessor :_id
   xml_accessor :email
   xml_accessor :url
-  xml_accessor :key_fingerprint
+  #xml_accessor :key_fingerprint
   xml_accessor :profile, :as => Profile
   
   
@@ -21,7 +21,7 @@ class Person
   timestamps!
 
   before_validation :clean_url
-  validates_presence_of :email, :url, :key_fingerprint
+  validates_presence_of :email, :url, :key
   validates_format_of :url, :with =>
      /^(https?):\/\/[a-z0-9]+([\-\.]{1}[a-z0-9]+)*(\.[a-z]{2,5})?(:[0-9]{1,5})?(\/.*)?$/ix
   
@@ -38,7 +38,7 @@ class Person
   end
 
   def export_key
-    key.public_key  
+    key.public_key.to_s  
   end
 
   protected
diff --git a/app/models/user.rb b/app/models/user.rb
index fe246c553..f104c983b 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -130,7 +130,7 @@ class User < Person
   def generate_key
     puts "Generating key"
     
-    self.rsa_key = OpenSSL::PKey::RSA::generate 1024 
+    self.key = OpenSSL::PKey::RSA::generate 1024 
     
   end
 
diff --git a/lib/encryptable.rb b/lib/encryptable.rb
index ebbfc2dba..0009c85f6 100644
--- a/lib/encryptable.rb
+++ b/lib/encryptable.rb
@@ -7,7 +7,7 @@
     end
     
     def verify_signature(signature, person)
-      return false unless signature && person.key_fingerprint
+      return false unless signature && person.key
       validity = nil
       Rails.logger.info("Verifying sig on #{signable_string} from person #{person.real_name}")
       person.key.verify "SHA", signature, signable_string