Merge remote-tracking branch 'osmlab/welcome-2'

[rails.git] / lib / osm.rb

diff --git a/lib/osm.rb b/lib/osm.rb
index 4a6237b12b3dd8cd8c71fc8bf3f9ba5697dd97e7..2ed98b92dfbd6860951f8b61a9a548073cfb0489 100644 (file)
--- a/lib/osm.rb
+++ b/lib/osm.rb
@@ -5,7 +5,6 @@ module OSM
   require 'rexml/parsers/sax2parser'
   require 'rexml/text'
   require 'xml/libxml'
-  require 'digest/md5'
 
   if defined?(SystemTimer)
     Timer = SystemTimer
@@ -569,12 +568,6 @@ module OSM
     return token
   end
 
-  # Return an encrypted version of a password
-  def self.encrypt_password(password, salt)
-    return Digest::MD5.hexdigest(password) if salt.nil?
-    return Digest::MD5.hexdigest(salt + password)
-  end
-
   # Return an SQL fragment to select a given area of the globe
   def self.sql_for_area(bbox, prefix = nil)
     tilesql = QuadTile.sql_for_area(bbox, prefix)