rex.rb in librex-0.0.70

- old
+ new

@@ -1,10 +1,10 @@
 =begin
 
 The Metasploit Rex library is provided under the 3-clause BSD license.
 
-Copyright (c) 2005-2010, Rapid7 LLC
+Copyright (c) 2005-2010, Rapid7, Inc.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
 are permitted provided that the following conditions are met:
 
@@ -13,11 +13,11 @@
    
  * Redistributions in binary form must reproduce the above copyright notice, 
    this list of conditions and the following disclaimer in the documentation 
    and/or other materials provided with the distribution.
    
- * Neither the name of Rapid7 LLC nor the names of its contributors may be 
+ * Neither the name of Rapid7, Inc. nor the names of its contributors may be 
    used to endorse or promote products derived from this software without 
    specific prior written permission.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
@@ -31,12 +31,12 @@
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 =end
 
 module Rex
-	Root = File.join(File.expand_path(File.dirname(__FILE__)), 'rex')
-	LogSource = "rex"
+  Root = File.join(File.expand_path(File.dirname(__FILE__)), 'rex')
+  LogSource = "rex"
 end
 
 # Generic classes
 require 'rex/constants'
 require 'rex/exceptions'
@@ -86,19 +86,23 @@
 require 'rex/compat'
 
 # Platforms
 require 'rex/platforms'
 
+# SSLScan 
+require 'rex/sslscan/scanner'
+require 'rex/sslscan/result'
 
+
 # Overload the Kernel.sleep() function to be thread-safe
 Kernel.class_eval("
-	def sleep(seconds)
-		Rex::ThreadSafe.sleep(seconds)
-	end
+  def sleep(seconds=nil)
+    Rex::ThreadSafe.sleep(seconds)
+  end
 ")
 
 # Overload the Kernel.select function to be thread-safe
 Kernel.class_eval("
-	def select(rfd = nil, wfd = nil, efd = nil, to = nil)
-		Rex::ThreadSafe.select(rfd, wfd, efd, to)
-	end
+  def select(rfd = nil, wfd = nil, efd = nil, to = nil)
+    Rex::ThreadSafe.select(rfd, wfd, efd, to)
+  end
 ")