RS, IZ; Rolling back special casing of friend-request

app/models/request.rb

@@ -41,16 +41,11 @@ class Request
  
 #ENCRYPTION
     before_validation :sign_if_mine
-    validates_true_for :creator_signature, :logic => lambda {verify_exported_signature}
+    validates_true_for :creator_signature, :logic => lambda {self.verify_creator_signature}
     
     xml_accessor :creator_signature
     key :creator_signature, String
-   
-    def verify_exported_signature 
-      self.verify_signature_from_key(creator_signature,
-        OpenSSL::PKey::RSA.new(exported_key))
-    end
-
+    
     def signable_accessors
       accessors = self.class.roxml_attrs.collect{|definition| 
         definition.accessor}

lib/encryptable.rb

@@ -18,15 +18,11 @@
         return false
       end
       Rails.logger.info("Verifying sig on #{signable_string} from person #{person.real_name}")
-      verify_signature_from_key(signature, person.key) 
-    end
-   
-    def verify_signature_from_key signature, key
-      validity = key.verify "SHA", Base64.decode64(signature), signable_string
+      validity = person.key.verify "SHA", Base64.decode64(signature), signable_string
       Rails.logger.info("Validity: #{validity}")
       validity
     end
-
+    
     protected
     def sign_if_mine
       if self.person == User.owner