From b7288c8d8e05824a2b605271eb298681a105c126 Mon Sep 17 00:00:00 2001
From: Ilyaaaaaaaaaaaaa Zhitomirskiy <ilya@joindiaspora.com>
Date: Thu, 8 Sep 2011 14:41:08 -0700
Subject: [PATCH] removed the algo field and a commented line

---
 ...d_algorithm_fields_to_relayable_objects.rb | 56 -------------------
 lib/diaspora/encryptable.rb                   |  1 -
 2 files changed, 57 deletions(-)
 delete mode 100644 db/migrate/20110826233833_add_algorithm_fields_to_relayable_objects.rb

diff --git a/db/migrate/20110826233833_add_algorithm_fields_to_relayable_objects.rb b/db/migrate/20110826233833_add_algorithm_fields_to_relayable_objects.rb
deleted file mode 100644
index ac94e7452..000000000
--- a/db/migrate/20110826233833_add_algorithm_fields_to_relayable_objects.rb
+++ /dev/null
@@ -1,56 +0,0 @@
-class AddAlgorithmFieldsToRelayableObjects < ActiveRecord::Migration
-  def self.up
-    add_column :comments, :author_signature_algo, :string
-    add_column :comments, :parent_author_signature_algo, :string
-
-    execute <<SQL
-    UPDATE comments
-      SET comments.author_signature_algo = "SHA"
-    WHERE comments.author_signature IS NOT NULL; 
-SQL
-    execute <<SQL
-    UPDATE comments
-       SET comments.parent_author_signature_algo = "SHA"
-     WHERE comments.author_signature IS NOT NULL
-SQL
-
-    add_column :likes, :author_signature_algo, :string
-    add_column :likes, :parent_author_signature_algo, :string
-
-    execute <<SQL
-    UPDATE likes
-       SET likes.author_signature_algo = "SHA"
-     WHERE likes.author_signature IS NOT NULL
-SQL
-    execute <<SQL
-    UPDATE likes
-       SET likes.parent_author_signature_algo = "SHA"
-     WHERE likes.author_signature IS NOT NULL
-SQL
-
-    add_column :messages, :author_signature_algo, :string
-    add_column :messages, :parent_author_signature_algo, :string
-
-    execute <<SQL
-    UPDATE messages
-       SET messages.author_signature_algo = "SHA"
-     WHERE messages.author_signature IS NOT NULL
-SQL
-    execute <<SQL
-    UPDATE messages
-       SET messages.parent_author_signature_algo = "SHA"
-     WHERE messages.author_signature IS NOT NULL
-SQL
-  end
-
-  def self.down
-    remove_column :messages, :parent_author_signature_algo
-    remove_column :messages, :author_signature_algo
-
-    remove_column :likes, :parent_author_signature_algo
-    remove_column :likes, :author_signature_algo
-
-    remove_column :comments, :parent_author_signature_algo
-    remove_column :comments, :author_signature_algo
-  end
-end
diff --git a/lib/diaspora/encryptable.rb b/lib/diaspora/encryptable.rb
index 734df8461..241c15dde 100644
--- a/lib/diaspora/encryptable.rb
+++ b/lib/diaspora/encryptable.rb
@@ -23,7 +23,6 @@ module Diaspora
       if !validity && Time.now < Time.parse(LAST_FALLBACK_TIME)
         validity = person.public_key.verify "SHA", Base64.decode64(signature), signable_string
       end
-      #validity = person.public_key.verify "SHA", Base64.decode64(signature), signable_string
       log_string += " validity=#{validity}"
       Rails.logger.info(log_string)
       validity